Changeset bcdd9aa in mainline

Timestamp:

2005-08-30T09:44:07Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

dfbc229

Parents:

a6f8899

Message:

Add lib/the.c.
Add and deploy the_initialize() and the_copy().

Make IA-32's before_thread_runs() use SP_DELTA macro.

Files:

• arch/ia32/src/proc/scheduler.c (modified) (1 diff)
• include/arch.h (modified) (1 diff)
• src/Makefile (modified) (1 diff)
• src/lib/the.c (added)
• src/main/main.c (modified) (1 diff)
• src/proc/scheduler.c (modified) (2 diffs)
• src/proc/thread.c (modified) (1 diff)

arch/ia32/src/proc/scheduler.c

@@ -31 +31 @@
 #include <proc/thread.h>
 #include <arch.h>
+#include <arch/context.h>       /* SP_DELTA */
 
 void before_thread_runs_arch(void)
 {
-        CPU->arch.tss->esp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-8];
+        CPU->arch.tss->esp0 = (__address) &THREAD->kstack[THREAD_STACK_SIZE-SP_DELTA];
         CPU->arch.tss->ss0 = selector(KDATA_DES);
 }

include/arch.h

@@ -65 +65 @@
 #define THE             ((the_t *)(get_stack_base()))   
 
+extern void the_initialize(the_t *the);
+extern void the_copy(the_t *src, the_t *dst);
+
 extern void arch_pre_mm_init(void);
 extern void arch_post_mm_init(void);

src/Makefile

@@ -17 +17 @@
         lib/list.c \
         lib/memstr.c \
+        lib/the.c \
         debug/print.c \
         time/clock.c \

src/main/main.c

@@ -135 +135 @@
         thread_t *t;
 
-        THE->preemption_disabled = 0;
-        THE->cpu = NULL;
-        THE->thread = NULL;
-        THE->task = NULL;
+        the_initialize(THE);
 
         arch_pre_mm_init();

src/proc/scheduler.c

@@ -253 +253 @@
 
         /*
+         * Through the 'THE' structure, we keep track of THREAD, TASK, CPU
+         * and preemption counter. At this point THE could be coming either
+         * from THREAD's or CPU's stack.
+         */
+        the_copy(THE, (the_t *) CPU->stack);
+
+        /*
          * We may not keep the old stack.
          * Reason: If we kept the old stack and got blocked, for instance, in
@@ -398 +405 @@
         #endif  
 
+        the_copy(THE, (the_t *) THREAD->kstack);
+        
         context_restore(&THREAD->saved_context);
         /* not reached */

src/proc/thread.c

@@ -197 +197 @@
                 context_save(&t->saved_context);
                 context_set(&t->saved_context, FADDR(cushion), t->kstack, THREAD_STACK_SIZE);
+                
+                the_initialize((the_t *) t->kstack);
 
                 pri = cpu_priority_high();