Changeset d5d2a3f in mainline

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.

Files:

• arch/ia64/include/context.h (modified) (2 diffs)
• include/context.h (modified) (1 diff)
• src/main/main.c (modified) (3 diffs)
• src/proc/scheduler.c (modified) (1 diff)
• src/proc/thread.c (modified) (1 diff)

arch/ia64/include/context.h

@@ -38 +38 @@
 #define SP_DELTA        0
 
+#ifdef context_set
+#undef context_set
+#endif
+
+#define context_set(c, _pc, stack, size)        \
+        (c)->pc = (__address) _pc;              \
+        (c)->bsp = (__address) stack;           \
+        (c)->sp = ((__address) stack) + (size) - SP_DELTA;
+
 struct context {
 
@@ -47 +56 @@
         __u64 ar_unat_callee;
         __u64 ar_rsc;
-        __u64 ar_bsp;
+        __u64 bsp;      /* ar_bsp */
         __u64 ar_rnat;
         __u64 ar_lc;

include/context.h

@@ -30 +30 @@
 #define __CONTEXT_H__
 
+#include <arch/types.h>
 #include <typedefs.h>
-#include "fpu_context.h"
 
+#ifndef context_set
+#define context_set(c, _pc, stack, size)        \
+        (c)->pc = (__address) (_pc);            \
+        (c)->sp = ((__address) (stack)) + (size) - SP_DELTA;
+#endif /* context_set */
 
 extern int context_save(context_t *c);

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 */

src/proc/scheduler.c

@@ -233 +233 @@
          */
         context_save(&CPU->saved_context);
-        CPU->saved_context.sp = (__address) &CPU->stack[CPU_STACK_SIZE-SP_DELTA];
-        CPU->saved_context.pc = FADDR(scheduler_separated_stack);
+        context_set(&CPU->saved_context, FADDR(scheduler_separated_stack), CPU->stack, CPU_STACK_SIZE);
         context_restore(&CPU->saved_context);
         /* not reached */

src/proc/thread.c

@@ -166 +166 @@
                 
                 context_save(&t->saved_context);
-                t->saved_context.pc = FADDR(cushion);
-                t->saved_context.sp = (__address) &t->kstack[THREAD_STACK_SIZE-SP_DELTA];
+                context_set(&t->saved_context, FADDR(cushion), t->kstack, THREAD_STACK_SIZE);
 
                 pri = cpu_priority_high();