[dependencies] update xv6 image and update exceptions

Clo91eaf · May 15, 2024 · 7779ca8 · 7779ca8
1 parent 62b5439
commit 7779ca8
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/dependencies/xv6/fs.img b/dependencies/xv6/fs.img
diff --git a/dependencies/xv6/kernel b/dependencies/xv6/kernel
diff --git a/dependencies/xv6/kernel.bin b/dependencies/xv6/kernel.bin
diff --git a/src/emulator.rs b/src/emulator.rs
@@ -200,9 +200,9 @@ impl Emulator {
   /// Start executing the emulator without difftest.
   pub fn start(&mut self) {
     loop {
-      let pc = self.cpu.pc;
+      // let pc = self.cpu.pc;
       let trap = self.execute();
-      info!("pc: {:#x}, inst: {}", pc, self.cpu.inst);
+      // info!("pc: {:#x}, inst: {}", pc, self.cpu.inst);
 
       match trap {
         Trap::Fatal => {

diff --git a/src/exception.rs b/src/exception.rs
@@ -214,8 +214,8 @@ impl Exception {
       | Exception::StoreAMOAccessFault => Trap::Fatal,
       Exception::EnvironmentCallFromUMode
       | Exception::EnvironmentCallFromSMode
-      // | Exception::EnvironmentCallFromMMode => Trap::Requested,
-      | Exception::EnvironmentCallFromMMode => Trap::Fatal,
+      | Exception::EnvironmentCallFromMMode => Trap::Requested,
+      // | Exception::EnvironmentCallFromMMode => Trap::Fatal,
       Exception::InstructionPageFault(_) | Exception::LoadPageFault(_) | Exception::StoreAMOPageFault(_) => {
         Trap::Invisible
       }