Get riscof running (not working, but running)

b-paul · Nov 26, 2024 · 3bcbd4a · 3bcbd4a
1 parent ed1e323
commit 3bcbd4a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/riscof/config.ini b/riscof/config.ini
@@ -9,7 +9,8 @@ pluginpath=test_dut
 ispec=test_dut/test_dut_isa.yaml
 pspec=test_dut/test_dut_platform.yaml
 target_run=1
-PATH=../target/debug/riscv
+; SURELY THERE'S A BETTER WAY TO DO THIS :((((((((((((((
+PATH=../../../../../../../../target/release
 
 [sail_cSim]
 pluginpath=sail_cSim
diff --git a/riscof/test_dut/riscof_test_dut.py b/riscof/test_dut/riscof_test_dut.py
@@ -160,7 +160,7 @@ def runTests(self, testList):
             # set up the simulation command. Template is for spike. Please change.
             # TODO
             #simcmd = self.dut_exe + ' --isa={0} +signature={1} +signature-granularity=4 {2}'.format(self.isa, sig_file, elf)
-            simcmd = self.dut_exe + ' --signature {1} {2}'.format(sig_file, elf)
+            simcmd = self.dut_exe + ' --signature {0} {1}'.format(sig_file, elf)
           else:
             simcmd = 'echo "NO RUN"'
 

diff --git a/riscof/test_dut/test_dut_isa.yaml b/riscof/test_dut/test_dut_isa.yaml
@@ -1,12 +1,12 @@
 hart_ids: [0]
 hart0:
-  ISA: RV32IMCZicsr_Zifencei
+  ISA: RV64IMCZicsr_Zifencei
   physical_addr_sz: 32
   User_Spec_Version: '2.3'
-  supported_xlen: [32]
+  supported_xlen: [64]
   misa:
    reset-val: 0x40001104
-   rv32:
+   rv64:
      accessible: true
      mxl:
        implemented: true

diff --git a/src/main.rs b/src/main.rs
@@ -27,9 +27,6 @@ fn main() {
     let tester_addr = elf.get_symbol("tohost").unwrap().value;
     let signature_start = elf.get_symbol("begin_signature").unwrap().value;
     let signature_end = elf.get_symbol("end_signature").unwrap().value;
-    println!("tester_addr: {:x}", tester_addr);
-    println!("signature_start: {:x}", signature_start);
-    println!("signature_end: {:x}", signature_end);
 
     let tester = Rc::new(RefCell::new(Tester::new(tester_addr)));