From a7f71e2e62213bd1624332d3d0439e83f7e6a30b Mon Sep 17 00:00:00 2001
From: martyall <martyall@protonmail.com>
Date: Tue, 7 Jan 2025 08:11:51 -0800
Subject: [PATCH] fix Makefile problem with jal and jalr tests

---
 Makefile                    | 2 +-
 o1vm/tests/test_mips_elf.rs | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 43f57c5021..1e6ff2f289 100644
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,7 @@ ${O1VM_MIPS_SOURCE_DIR}/%.asm: ${OPTIMISM_MIPS_SOURCE_DIR}/%.asm
 		@echo "Transforming $< to $@, making it compatible for o1vm"
 		@sed \
 				-e '/\.balign 4/d' \
-				-e '/\.set\s*noreorder/d' \
+				-e 's/^\s*\.set\s*noreorder/.set noreorder/' \
 				-e '/\.ent\s*test/d' \
 				-e '/\.end test/d' \
 				-e 's/\.section .test, "x"/.section .text/' \
diff --git a/o1vm/tests/test_mips_elf.rs b/o1vm/tests/test_mips_elf.rs
index 9d8c2fc5c5..04ec89d336 100644
--- a/o1vm/tests/test_mips_elf.rs
+++ b/o1vm/tests/test_mips_elf.rs
@@ -18,7 +18,7 @@ struct MipsTest {
 // currently excluding any oracle based tests and a select group of tests that are failing
 fn is_test_excluded(bin_file: &Path) -> bool {
     let file_name = bin_file.file_name().unwrap().to_str().unwrap();
-    let untested_programs = ["exit_group", "jal", "mul", "jalr"];
+    let untested_programs = ["exit_group", "mul"];
     file_name.starts_with("oracle") || untested_programs.contains(&file_name)
 }
 
@@ -40,6 +40,7 @@ impl MipsTest {
     }
 
     fn run(&self) -> Result<(), String> {
+        println!("Running test: {:?}", self.bin_file);
         let mut state = self.parse_state();
         let halt_address = 0xa7ef00d0_u32;
         state.registers[31] = halt_address;
@@ -47,6 +48,7 @@ impl MipsTest {
         let start = cannon::Start::create(state.step as usize);
         let configuration = VmConfiguration {
             halt_address: Some(halt_address),
+            stop_at: cannon::StepFrequency::Exactly(1000),
             ..Default::default()
         };