Changeset 89c57b6 in mainline for kernel/arch/arm32/include/exception.h

Timestamp:

2011-04-13T14:45:41Z (15 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/arm32/include/exception.h (modified) (5 diffs)

kernel/arch/arm32/include/exception.h

@@ -39 +39 @@
 
 #include <typedefs.h>
-#include <arch/regutils.h>
+#include <arch/istate.h>
 
 /** If defined, forces using of high exception vectors. */
@@ -45 +45 @@
 
 #ifdef HIGH_EXCEPTION_VECTORS
-        #define EXC_BASE_ADDRESS        0xffff0000
+        #define EXC_BASE_ADDRESS  0xffff0000
 #else
-        #define EXC_BASE_ADDRESS        0x0
+        #define EXC_BASE_ADDRESS  0x0
 #endif
 
 /* Exception Vectors */
-#define EXC_RESET_VEC          (EXC_BASE_ADDRESS + 0x0)
-#define EXC_UNDEF_INSTR_VEC    (EXC_BASE_ADDRESS + 0x4)
-#define EXC_SWI_VEC            (EXC_BASE_ADDRESS + 0x8)
-#define EXC_PREFETCH_ABORT_VEC (EXC_BASE_ADDRESS + 0xc)
-#define EXC_DATA_ABORT_VEC     (EXC_BASE_ADDRESS + 0x10)
-#define EXC_IRQ_VEC            (EXC_BASE_ADDRESS + 0x18)
-#define EXC_FIQ_VEC            (EXC_BASE_ADDRESS + 0x1c)
+#define EXC_RESET_VEC           (EXC_BASE_ADDRESS + 0x0)
+#define EXC_UNDEF_INSTR_VEC     (EXC_BASE_ADDRESS + 0x4)
+#define EXC_SWI_VEC             (EXC_BASE_ADDRESS + 0x8)
+#define EXC_PREFETCH_ABORT_VEC  (EXC_BASE_ADDRESS + 0xc)
+#define EXC_DATA_ABORT_VEC      (EXC_BASE_ADDRESS + 0x10)
+#define EXC_IRQ_VEC             (EXC_BASE_ADDRESS + 0x18)
+#define EXC_FIQ_VEC             (EXC_BASE_ADDRESS + 0x1c)
 
 /* Exception numbers */
@@ -68 +68 @@
 #define EXC_FIQ             6
 
-
 /** Kernel stack pointer.
  *
  * It is set when thread switches to user mode,
  * and then used for exception handling.
+ *
  */
 extern uintptr_t supervisor_sp;
-
 
 /** Temporary exception stack pointer.
@@ -81 +80 @@
  * Temporary stack is used in exceptions handling routines
  * before switching to thread's kernel stack.
+ *
  */
 extern uintptr_t exc_stack;
-
-
-/** Struct representing CPU state saved when an exception occurs. */
-typedef struct istate {
-        uint32_t spsr;
-        uint32_t sp;
-        uint32_t lr;
-
-        uint32_t r0;
-        uint32_t r1;
-        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 fp;
-        uint32_t r12;
-
-        uint32_t pc;
-} istate_t;
-
-
-/** Sets Program Counter member of given istate structure.
- *
- * @param istate istate structure
- * @param retaddr new value of istate's PC member
- */
-static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
-{
-        istate->pc = retaddr;
-}
-
-
-/** Returns true if exception happened while in userspace. */
-static inline int istate_from_uspace(istate_t *istate)
-{
-        return (istate->spsr & STATUS_REG_MODE_MASK) == USER_MODE;
-}
-
-
-/** Returns Program Counter member of given istate structure. */
-static inline unative_t istate_get_pc(istate_t *istate)
-{
-        return istate->pc;
-}
-
-static inline unative_t istate_get_fp(istate_t *istate)
-{
-        return istate->fp;
-}
-
 
 extern void install_exception_handlers(void);
@@ -149 +94 @@
 extern void swi_exception_entry(void);
 
-
 #endif