[dut] fix bugs

Clo91eaf · May 15, 2024 · 611ce0f · 611ce0f
1 parent a852ec1
commit 611ce0f
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 65 deletions.
diff --git a/src/dut.rs b/src/dut.rs
@@ -142,7 +142,7 @@ impl Drop for Dut {
   fn drop(&mut self) {
     self.top.finish();
 
-    println!("Simulation complete");
+    tracing::info!("Simulation complete, DUT dropped.");
   }
 }
 

diff --git a/tests/riscv-tests-rv64ud.rs b/tests/riscv-tests-rv64ud.rs
@@ -1,40 +1,40 @@
-mod rv64ud_p {
+// mod rv64ud_p {
 
-  use std::fs::File;
-  use std::io::prelude::*;
-  use std::path::PathBuf;
+//   use std::fs::File;
+//   use std::io::prelude::*;
+//   use std::path::PathBuf;
 
-  use hemu::{bus::DRAM_BASE, cpu::Mode, emulator::Emulator};
-  #[macro_export]
-  macro_rules! add_test_p {
-    ($name: ident) => {
-      #[test]
-      fn $name() -> anyhow::Result<()> {
-        let mut root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        root.push("dependencies/tests/bin/riscv-tests/rv64ud");
-        root.push(("rv64ud-p-".to_owned() + stringify!($name)).replace("__", ""));
+//   use hemu::{bus::DRAM_BASE, cpu::Mode, emulator::Emulator};
+//   #[macro_export]
+//   macro_rules! add_test_p {
+//     ($name: ident) => {
+//       #[test]
+//       fn $name() -> anyhow::Result<()> {
+//         let mut root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+//         root.push("dependencies/tests/bin/riscv-tests/rv64ud");
+//         root.push(("rv64ud-p-".to_owned() + stringify!($name)).replace("__", ""));
 
-        let mut file = File::open(root.as_path())?;
-        let mut data = Vec::new();
-        file.read_to_end(&mut data)?;
+//         let mut file = File::open(root.as_path())?;
+//         let mut data = Vec::new();
+//         file.read_to_end(&mut data)?;
 
-        let mut emu = Emulator::new(false, false);
-        emu.initialize_dram(data);
-        emu.initialize_pc(DRAM_BASE);
+//         let mut emu = Emulator::new(false, false);
+//         emu.initialize_dram(data);
+//         emu.initialize_pc(DRAM_BASE);
 
-        emu.start();
+//         emu.start();
 
-        // Test result is stored at a0 (x10), a function argument and a return value.
-        // The riscv-tests set a0 to 0 when all tests pass.
-        assert_eq!(0, emu.cpu.gpr.read(10));
+//         // Test result is stored at a0 (x10), a function argument and a return value.
+//         // The riscv-tests set a0 to 0 when all tests pass.
+//         assert_eq!(0, emu.cpu.gpr.read(10));
 
-        // All tests start the user mode and finish with the instruction `ecall`, independently
-        // of it succeeds or fails.
-        assert_eq!(Mode::Machine, emu.cpu.mode);
-        Ok(())
-      }
-    };
-  }
+//         // All tests start the user mode and finish with the instruction `ecall`, independently
+//         // of it succeeds or fails.
+//         assert_eq!(Mode::Machine, emu.cpu.mode);
+//         Ok(())
+//       }
+//     };
+//   }
 
   // add_test_p!(fadd);
   // add_test_p!(fclass);
@@ -48,46 +48,46 @@ mod rv64ud_p {
   // add_test_p!(__move);
   // add_test_p!(recoding);
   // add_test_p!(structural);
-}
+// }
 
-mod rv64ud_v {
-  use std::fs::File;
-  use std::io::prelude::*;
-  use std::path::PathBuf;
+// mod rv64ud_v {
+//   use std::fs::File;
+//   use std::io::prelude::*;
+//   use std::path::PathBuf;
 
-  use hemu::{bus::DRAM_BASE, cpu::Mode, emulator::Emulator};
-  #[macro_export]
-  macro_rules! add_test_v {
-    ($name: ident) => {
-      #[test]
-      fn $name() -> anyhow::Result<()> {
-        let mut root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        root.push("dependencies/tests/bin/riscv-tests/rv64ud");
-        root.push(("rv64ud-v-".to_owned() + stringify!($name)).replace("__", ""));
+//   use hemu::{bus::DRAM_BASE, cpu::Mode, emulator::Emulator};
+//   #[macro_export]
+//   macro_rules! add_test_v {
+//     ($name: ident) => {
+//       #[test]
+//       fn $name() -> anyhow::Result<()> {
+//         let mut root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+//         root.push("dependencies/tests/bin/riscv-tests/rv64ud");
+//         root.push(("rv64ud-v-".to_owned() + stringify!($name)).replace("__", ""));
 
-        let mut file = File::open(root.as_path())?;
-        let mut data = Vec::new();
-        file.read_to_end(&mut data)?;
+//         let mut file = File::open(root.as_path())?;
+//         let mut data = Vec::new();
+//         file.read_to_end(&mut data)?;
 
-        let mut emu = Emulator::new(false, false);
-        emu.initialize_dram(data);
-        emu.initialize_pc(DRAM_BASE);
+//         let mut emu = Emulator::new(false, false);
+//         emu.initialize_dram(data);
+//         emu.initialize_pc(DRAM_BASE);
 
-        emu.start();
+//         emu.start();
 
-        // https://github.com/riscv/riscv-test-env/blob/4fabfb4e0d3eacc1dc791da70e342e4b68ea7e46/v/riscv_test.h#L45
-        // #define RVTEST_PASS li a0, 1; scall
-        // when all tests pass, a0 is set to 1
-        // #define RVTEST_FAIL sll a0, TESTNUM, 1; 1:beqz a0, 1b; or a0, a0, 1; scall;
-        // when test x fails, a0 is set to 2 * x + 1
-        // and if no test is run, the test will loo.
-        assert_eq!(1, emu.cpu.gpr.read(10));
+//         // https://github.com/riscv/riscv-test-env/blob/4fabfb4e0d3eacc1dc791da70e342e4b68ea7e46/v/riscv_test.h#L45
+//         // #define RVTEST_PASS li a0, 1; scall
+//         // when all tests pass, a0 is set to 1
+//         // #define RVTEST_FAIL sll a0, TESTNUM, 1; 1:beqz a0, 1b; or a0, a0, 1; scall;
+//         // when test x fails, a0 is set to 2 * x + 1
+//         // and if no test is run, the test will loo.
+//         assert_eq!(1, emu.cpu.gpr.read(10));
 
-        assert_eq!(Mode::Supervisor, emu.cpu.mode);
-        Ok(())
-      }
-    };
-  }
+//         assert_eq!(Mode::Supervisor, emu.cpu.mode);
+//         Ok(())
+//       }
+//     };
+//   }
   // add_test_v!(fadd);
   // add_test_v!(fclass);
   // add_test_v!(fcmp);
@@ -100,4 +100,4 @@ mod rv64ud_v {
   // add_test_v!(__move);
   // add_test_v!(recoding);
   // add_test_v!(structural);
-}
+// }