Changeset 61c0402 in mainline for kernel/arch/arm32/include/context.h

Timestamp:

2010-01-15T19:36:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

92bee46

Parents:

50f9c3a (diff), 963462af (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/context.h (modified) (2 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;