Changeset 4b2c872d in mainline for src

Timestamp:

2005-10-18T09:33:02Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8005218

Parents:

22f7769

Message:

Create generic context_save() and context_restore().
These two functions are defined inline and only call context_save_arch() and context_restore_arch(), respectively.
The main purpose of this is to enable centralized commenting of these important and tricky functions.

Location:

src

Files:

• main/main.c (modified) (1 diff)
• proc/scheduler.c (modified) (1 diff)
• proc/thread.c (modified) (1 diff)
• synch/waitq.c (modified) (1 diff)

src/main/main.c

@@ -247 +247 @@
          * switch to this cpu's private stack prior to waking kmp up.
          */
-        context_set(&CPU->saved_context, FADDR(main_ap_separated_stack), CPU->stack, CPU_STACK_SIZE);
+        context_set(&CPU->saved_context, FADDR(main_ap_separated_stack), (__address) CPU->stack, CPU_STACK_SIZE);
         context_restore(&CPU->saved_context);
         /* not reached */

src/proc/scheduler.c

@@ -314 +314 @@
          */
         context_save(&CPU->saved_context);
-        context_set(&CPU->saved_context, FADDR(scheduler_separated_stack), CPU->stack, CPU_STACK_SIZE);
+        context_set(&CPU->saved_context, FADDR(scheduler_separated_stack), (__address) CPU->stack, CPU_STACK_SIZE);
         context_restore(&CPU->saved_context);
         /* not reached */

src/proc/thread.c

@@ -196 +196 @@
                 
                 context_save(&t->saved_context);
-                context_set(&t->saved_context, FADDR(cushion), t->kstack, THREAD_STACK_SIZE);
+                context_set(&t->saved_context, FADDR(cushion), (__address) t->kstack, THREAD_STACK_SIZE);
                 
                 the_initialize((the_t *) t->kstack);

src/synch/waitq.c

@@ -31 +31 @@
 #include <synch/spinlock.h>
 #include <proc/thread.h>
+#include <proc/scheduler.h>
 #include <arch/asm.h>
 #include <arch/types.h>