spinlocks using gcc intrinsics

push_off() / pop_off()
set up per-hart plic stuff so all harts get device interrupts

1 files changed, 28 insertions, 14 deletions

diff --git a/main.c b/main.c
index 24793cd..2168b9f 100644
--- a/main.c
+++ b/main.c
@@ -4,25 +4,39 @@
 #include "riscv.h"
 #include "defs.h"
 
+volatile static int started = 0;
+
 // Bootstrap processor starts running C code here.
 // Allocate a real stack and switch to it, first
 // doing some setup required for memory allocator to work.
 void
-main(int hartid)
+main()
 {
-  w_tp(hartid);    // save hartid where cpuid() can find it
-  uartinit();      // serial port
-  consoleinit();
-  printf("entering main() on hart %d\n", hartid);
-  kinit();         // physical page allocator
-  kvminit();       // kernel page table
-  procinit();      // process table
-  trapinit();      // trap vectors
-  plicinit();      // set up interrupt controller
-  binit();         // buffer cache
-  fileinit();      // file table
-  ramdiskinit();   // disk
-  userinit();      // first user process
+  if(cpuid() == 0){
+    uartinit();      // serial port
+    consoleinit();
+    printf("hart %d starting\n", cpuid());
+    kinit();         // physical page allocator
+    kvminit();       // create kernel page table
+    kvminithart();   // turn on paging
+    procinit();      // process table
+    trapinit();      // trap vectors
+    trapinithart();  // install kernel trap vector
+    plicinit();      // set up interrupt controller
+    plicinithart();  // ask PLIC for device interrupts
+    binit();         // buffer cache
+    fileinit();      // file table
+    ramdiskinit();   // disk
+    userinit();      // first user process
+    started = 1;
+  } else {
+    while(started == 0)
+      ;
+    printf("hart %d starting\n", cpuid());
+    kvminithart();    // turn on paging
+    trapinithart();   // install kernel trap vector
+    plicinithart();   // ask PLIC for device interrupts
+  }
 
   scheduler();        
 }