Changeset 7ce9284 in mainline for src

Timestamp:

2005-08-30T17:41:19Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b45aa23

Parents:

10caad0

Message:

Dump implementation of THREAD, TASK and CPU.
Implement preemption-safe versions of THREAD, TASK and CPU using THE.
Get rid of CPU_ID_ARCH on all architectures.
Get rid of write_dr0() and read_dr0() on IA-32.
Get rid of cpu_private_data and cpu_private_data_t.

Location:

src

Files:

• Makefile.config (modified) (2 diffs)
• cpu/cpu.c (modified) (4 diffs)
• main/main.c (modified) (3 diffs)
• proc/scheduler.c (modified) (1 diff)

src/Makefile.config

@@ -21 +21 @@
 
 # Uncomment if you want to run in the test mode
-TEST=__TEST__
+#TEST=__TEST__
 
 TEST_FILE=test.c
@@ -34 +34 @@
 #TEST_DIR=synch/semaphore2/
 #TEST_DIR=fpu/fpu1
-TEST_DIR=print/print1
+#TEST_DIR=print/print1

src/cpu/cpu.c

@@ -40 +40 @@
 #include <list.h>
 
-
-cpu_private_data_t *cpu_private_data;
 cpu_t *cpus;
-
 
 /** Initialize CPUs
@@ -56 +53 @@
         if (config.cpu_active == 1) {
         #endif /* __SMP__ */
-                cpu_private_data = (cpu_private_data_t *) malloc(sizeof(cpu_private_data_t) * config.cpu_count);
-                if (!cpu_private_data)
-                        panic("malloc/cpu_private_data");
-
                 cpus = (cpu_t *) malloc(sizeof(cpu_t) * config.cpu_count);
                 if (!cpus)
@@ -65 +58 @@
 
                 /* initialize everything */
-                memsetb((__address) cpu_private_data, sizeof(cpu_private_data_t) * config.cpu_count, 0);
                 memsetb((__address) cpus, sizeof(cpu_t) * config.cpu_count, 0);
 
                 for (i=0; i < config.cpu_count; i++) {
-                        cpus[i].stack = (__u8 *) malloc(CPU_STACK_SIZE);
+                        cpus[i].stack = (__u8 *) frame_alloc(FRAME_KA | FRAME_PANIC);
                         if (!cpus[i].stack)
                                 panic("malloc/cpus[%d].stack\n", i);
@@ -87 +79 @@
         }
         #endif /* __SMP__ */
+
+        CPU = &cpus[config.cpu_active-1];
         
         CPU->active = 1;

src/main/main.c

@@ -180 +180 @@
         t = thread_create(kinit, NULL, k, 0);
         if (!t) panic("can't create kinit thread\n");
-
         thread_ready(t);
 
@@ -211 +210 @@
         config.cpu_active++;
 
+        /*
+         * The THE structure is well defined because ctx.sp is used as stack.
+         */
+        the_initialize(THE);
+
         arch_pre_mm_init();
         frame_init();
@@ -222 +226 @@
         l_apic_debug();
 
+        the_copy(THE, (the_t *) CPU->stack);
 
         /*

src/proc/scheduler.c

@@ -364 +364 @@
         priority = THREAD->pri;
         spinlock_unlock(&THREAD->lock); 
-        
+
         relink_rq(priority);