diff --git a/dependencies/xv6/fs.img b/dependencies/xv6/fs.img index bf7e615..0c88284 100644 Binary files a/dependencies/xv6/fs.img and b/dependencies/xv6/fs.img differ diff --git a/dependencies/xv6/kernel b/dependencies/xv6/kernel index 61709d2..091474a 100755 Binary files a/dependencies/xv6/kernel and b/dependencies/xv6/kernel differ diff --git a/dependencies/xv6/kernel.bin b/dependencies/xv6/kernel.bin index 255e17a..35401b9 100755 Binary files a/dependencies/xv6/kernel.bin and b/dependencies/xv6/kernel.bin differ diff --git a/src/emulator.rs b/src/emulator.rs index c0f4cc0..2384f21 100644 --- 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 index 66bc7cf..9a4c0e7 100644 --- 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 }