Changeset 89c57b6 in mainline for kernel/arch/ppc32/include/istate.h

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

88634420

Parents:

cefb126 (diff), 17279ead (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• kernel/arch/ppc32/include/istate.h (moved) (moved from kernel/arch/ppc32/include/memstr.h ) (2 diffs)

kernel/arch/ppc32/include/istate.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2005 Sergey Bondari
+ * Copyright (c) 2006 Martin Decky
  * All rights reserved.
  *
@@ -33 +33 @@
  */
 
-#ifndef KERN_ppc32_MEMSTR_H_
-#define KERN_ppc32_MEMSTR_H_
+#ifndef KERN_ppc32_EXCEPTION_H_
+#define KERN_ppc32_EXCEPTION_H_
 
-#define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
+#include <typedefs.h>
+#include <arch/cpu.h>
+#include <trace.h>
 
-extern void memsetw(void *, size_t, uint16_t);
-extern void memsetb(void *, size_t, uint8_t);
+typedef struct istate {
+        uint32_t r0;
+        uint32_t r2;
+        uint32_t r3;
+        uint32_t r4;
+        uint32_t r5;
+        uint32_t r6;
+        uint32_t r7;
+        uint32_t r8;
+        uint32_t r9;
+        uint32_t r10;
+        uint32_t r11;
+        uint32_t r13;
+        uint32_t r14;
+        uint32_t r15;
+        uint32_t r16;
+        uint32_t r17;
+        uint32_t r18;
+        uint32_t r19;
+        uint32_t r20;
+        uint32_t r21;
+        uint32_t r22;
+        uint32_t r23;
+        uint32_t r24;
+        uint32_t r25;
+        uint32_t r26;
+        uint32_t r27;
+        uint32_t r28;
+        uint32_t r29;
+        uint32_t r30;
+        uint32_t r31;
+        uint32_t cr;
+        uint32_t pc;
+        uint32_t srr1;
+        uint32_t lr;
+        uint32_t ctr;
+        uint32_t xer;
+        uint32_t dar;
+        uint32_t r12;
+        uint32_t sp;
+} istate_t;
+
+NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
+    uintptr_t retaddr)
+{
+        istate->pc = retaddr;
+}
+
+/** Return true if exception happened while in userspace
+ *
+ * The contexts of MSR register was stored in SRR1.
+ *
+ */
+NO_TRACE static inline int istate_from_uspace(istate_t *istate)
+{
+        return (istate->srr1 & MSR_PR) != 0;
+}
+
+NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
+{
+        return istate->pc;
+}
+
+NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
+{
+        return istate->sp;
+}
 
 #endif