Changeset d5d2a3f in mainline for src/main/main.c

Timestamp:

2005-05-25T12:29:18Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2998046

Parents:

c23fd6b1

Message:

Add context_set() macro to support extended behaviour for architectures with more than one stack (e.g. IA-64).
Now there is one generic context_set() defined in include/context.h and one IA-64 specific defined in arch/ia64/include/context.h.

File:

• src/main/main.c (modified) (3 diffs)

src/main/main.c

@@ -28 +28 @@
 
 #include <arch/asm.h>
-#include <arch/context.h>
+#include <context.h>
 #include <print.h>
 #include <panic.h>
@@ -95 +95 @@
 
         context_save(&ctx);
-        ctx.sp = config.base + config.kernel_size - SP_DELTA;
-        ctx.pc = FADDR(main_bsp_separated_stack);
+        context_set(&ctx, FADDR(main_bsp_separated_stack), config.base + hardcoded_ktext_size + hardcoded_kdata_size + CONFIG_HEAP_SIZE, CONFIG_STACK_SIZE);
         context_restore(&ctx);
         /* not reached */
@@ -193 +192 @@
          * switch to this cpu's private stack prior to waking kmp up.
          */
-        CPU->saved_context.sp = (__address) &CPU->stack[CPU_STACK_SIZE-SP_DELTA];
-        CPU->saved_context.pc = FADDR(main_ap_separated_stack);
+        context_set(&CPU->saved_context, FADDR(main_ap_separated_stack), CPU->stack, CPU_STACK_SIZE);
         context_restore(&CPU->saved_context);
         /* not reached */