Changeset 04803bf in mainline for kernel/arch/ia32/include/context.h

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• kernel/arch/ia32/include/context.h (modified) (3 diffs)

kernel/arch/ia32/include/context.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -37 +37 @@
 
 #ifdef KERNEL
-#include <arch/types.h>
 
-#define STACK_ITEM_SIZE 4
+#include <typedefs.h>
+
+#define STACK_ITEM_SIZE  4
 
 /*
@@ -47 +48 @@
  * One item is put onto stack to support get_stack_base().
  */
-#define SP_DELTA        (8 + STACK_ITEM_SIZE)
+#define SP_DELTA  (8 + STACK_ITEM_SIZE)
+
+#define context_set(c, _pc, stack, size) \
+        do { \
+                (c)->pc = (uintptr_t) (_pc); \
+                (c)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA; \
+                (c)->ebp = 0; \
+        } while (0)
 
 #endif /* KERNEL */