Changeset 8262010 in mainline for src

Timestamp:

2005-04-10T16:36:45Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

23c0c08

Parents:

43114c5

Message:

Switch from mm-based 'the' mechanism to macro-based 'cpu_private_data[CPU_ID_ARCH]' mechanism.
Added l_apic_id() and some other minor APIC changes.
Move gdtr to K_DATA_START section.
Move K_DATA_START section immediately behind K_TEXT_START section so that real-mode addresses work even with growing size of kernel code.

Location:

src

Files:

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

src/Makefile.config

@@ -12 +12 @@
 
 # Deadlock detection support for spinlocks.
-DEBUG_SPINLOCK=DEBUG_SPINLOCK
+#DEBUG_SPINLOCK=DEBUG_SPINLOCK
 
 # Uncomment if you want to run in the test mode

src/cpu/cpu.c

@@ -40 +40 @@
 #include <list.h>
 
-cpu_private_page_t *the = NULL;
-
+cpu_private_data_t *cpu_private_data;
 cpu_t *cpus;
 
@@ -50 +49 @@
         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)
@@ -55 +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);
     
@@ -71 +75 @@
                                 list_initialize(&cpus[i].rq[j].rq_head);
                         }
+                        
+                        cpu_private_data[i].cpu = &cpus[i];
                 }
                 
-                the = (cpu_private_page_t *) frame_alloc(FRAME_KA | FRAME_PANIC);
-                memsetb((__address) the, PAGE_SIZE, 0);
         #ifdef __SMP__
-        }
-        else {
-                __address frame;
-                
-                frame = frame_alloc(FRAME_KA | FRAME_PANIC);
-                memsetb(frame, PAGE_SIZE, 0);
-                map_page_to_frame((__address) the, frame, PAGE_CACHEABLE, 1);
         }
         #endif /* __SMP__ */
         
-        CPU = &cpus[config.cpu_active-1];       
         cpu_identify();
         cpu_arch_init();

src/main/main.c

@@ -104 +104 @@
         arch_init();
 
+
         printf("%s, %s\n", project, copyright);
 

src/proc/thread.c

@@ -100 +100 @@
         i = (t->pri < RQ_COUNT -1) ? ++t->pri : t->pri;
         
-        cpu = the->cpu;
+        cpu = CPU;
         if (t->flags & X_WIRED) {
                 cpu = t->cpu;