lab6 over

freheit889 · Aug 15, 2020 · 29908ed · 29908ed
1 parent dc82f5c
commit 29908ed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/os/src/interrupt/handler.rs b/os/src/interrupt/handler.rs
@@ -4,6 +4,7 @@ use riscv::register::stvec;
 use riscv::register::scause::Scause;
 use riscv::register::scause::{Exception, Trap, Interrupt};
 use crate::process::PROCESSOR;
+use crate::kernel::syscall_handler;
 
 global_asm!(include_str!("./interrupt.asm"));
 
@@ -39,7 +40,9 @@ pub fn handle_interrupt(context: &mut Context, scause: Scause, stval: usize)->*m
         // 时钟中断
         Trap::Interrupt(Interrupt::SupervisorTimer) => supervisor_timer(context),
         //Trap::Interrupt(Interrupt::SupervisorSoft) => supervisor_timer(context),
-        // 其他情况，终止当前线程
+        // 其他情况，终止当前线
+        Trap::Exception(Exception::UserEnvCall) => syscall_handler(context),
+
         _ => fault("unimplemented interrupt type", scause, stval),
     }
 }

diff --git a/os/src/main.rs b/os/src/main.rs
@@ -41,7 +41,7 @@ pub extern "C" fn rust_main(hartid: usize, sp: usize) -> ! {
     }
     println!("kernel_end = {:#x}", kernel_end as usize);
     println!("_kernel_end = {:#x}", (kernel_end as usize) / 4096);
-
+    /* 
     {
         let mut processor=PROCESSOR.lock();
         let kernel_process=Process::new_kernel().unwrap();
@@ -53,9 +53,11 @@ pub extern "C" fn rust_main(hartid: usize, sp: usize) -> ! {
                     );
            processor.add_thread(thread);
         }
-    }
-
-    //PROCESSOR.lock().add_thread(create_user_process("hello_world"));
+    }*/
+    unsafe{
+         llvm_asm!("fence.i" :::: "volatile");
+    };
+    PROCESSOR.lock().add_thread(create_user_process("hello_world"));
 
 
     extern "C" {