Changeset 65737d4 in mainline for kernel/arch/arm32/include

Timestamp:

2010-01-13T20:39:42Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

711e1f32

Parents:

9245413 (diff), fd608dc (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.

Location:

kernel/arch/arm32/include

Files:

• context.h (modified) (2 diffs)
• exception.h (modified) (3 diffs)

kernel/arch/arm32/include/context.h

@@ -43 +43 @@
 #define SP_DELTA  (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT))
 
+#define context_set(c, _pc, stack, size) \
+        do { \
+                (c)->pc = (uintptr_t) (_pc); \
+                (c)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA; \
+                (c)->fp = 0; \
+        } while (0)
+
 #ifndef __ASM__
 
@@ -62 +69 @@
         uint32_t r9;
         uint32_t r10;
-        uint32_t r11;
+        uint32_t fp;    /* r11 */
         
         ipl_t ipl;

kernel/arch/arm32/include/exception.h

@@ -86 +86 @@
 
 /** Struct representing CPU state saved when an exception occurs. */
-typedef struct {
+typedef struct istate {
         uint32_t spsr;
         uint32_t sp;
@@ -102 +102 @@
         uint32_t r9;
         uint32_t r10;
-        uint32_t r11;
+        uint32_t fp;
         uint32_t r12;
 
@@ -133 +133 @@
 }
 
+static inline unative_t istate_get_fp(istate_t *istate)
+{
+        return istate->fp;
+}
+
 
 extern void install_exception_handlers(void);