From abf847a083888bbed4260ecacf849ea19f23e810 Mon Sep 17 00:00:00 2001
From: Frans Kaashoek <kaashoek@mit.edu>
Date: Tue, 31 Jan 2017 17:47:16 -0500
Subject: Start of an experiment to remove the use of gs for cpu local
 variables.

---
 main.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'main.c')

diff --git a/main.c b/main.c
index 731e429..d7e59cf 100644
--- a/main.c
+++ b/main.c
@@ -22,7 +22,6 @@ main(void)
   mpinit();        // detect other processors
   lapicinit();     // interrupt controller
   seginit();       // segment descriptors
-  cprintf("\ncpu%d: starting xv6\n\n", cpunum());
   picinit();       // another interrupt controller
   ioapicinit();    // another interrupt controller
   consoleinit();   // console hardware
@@ -31,7 +30,7 @@ main(void)
   tvinit();        // trap vectors
   binit();         // buffer cache
   fileinit();      // file table
-  ideinit();       // disk
+  ideinit();       // disk 
   if(!ismp)
     timerinit();   // uniprocessor timer
   startothers();   // start other processors
@@ -54,9 +53,9 @@ mpenter(void)
 static void
 mpmain(void)
 {
-  cprintf("cpu%d: starting\n", cpunum());
+  cprintf("cpu%d: starting %d\n", cpuid(), lapiccpunum());
   idtinit();       // load idt register
-  xchg(&cpu->started, 1); // tell startothers() we're up
+  xchg(&(mycpu()->started), 1); // tell startothers() we're up
   scheduler();     // start running processes
 }
 
@@ -78,7 +77,7 @@ startothers(void)
   memmove(code, _binary_entryother_start, (uint)_binary_entryother_size);
 
   for(c = cpus; c < cpus+ncpu; c++){
-    if(c == cpus+cpunum())  // We've started already.
+    if(c == mycpu())  // We've started already.
       continue;
 
     // Tell entryother.S what stack to use, where to enter, and what
-- 
cgit v1.2.3


From ed396c068b881877330f7d40bfce02db9b1199b3 Mon Sep 17 00:00:00 2001
From: Frans Kaashoek <kaashoek@mit.edu>
Date: Wed, 1 Feb 2017 18:04:13 -0500
Subject: Eliminate code for gs trick to track per-cpu state.  We rely on
 lapiccpunum() to find a per-cpu id with which we locate a cpu's cpu struct.

---
 main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'main.c')

diff --git a/main.c b/main.c
index d7e59cf..e5b7d64 100644
--- a/main.c
+++ b/main.c
@@ -53,7 +53,7 @@ mpenter(void)
 static void
 mpmain(void)
 {
-  cprintf("cpu%d: starting %d\n", cpuid(), lapiccpunum());
+  cprintf("cpu%d: starting %d\n", cpuid(), cpuid());
   idtinit();       // load idt register
   xchg(&(mycpu()->started), 1); // tell startothers() we're up
   scheduler();     // start running processes
-- 
cgit v1.2.3