sh4: test fix

flyinghead · Nov 8, 2024 · 1cadeb2 · 1cadeb2
1 parent 2b28e81
commit 1cadeb2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/core/reios/gdrom_hle.cpp b/core/reios/gdrom_hle.cpp
@@ -9,7 +9,6 @@
 #include "hw/sh4/sh4_mem.h"
 #include "hw/sh4/sh4_sched.h"
 #include "hw/sh4/sh4_core.h"
-#undef r
 
 #include "gdrom_hle.h"
 #include "hw/gdrom/gdromv3.h"

diff --git a/tests/src/Sh4InterpreterTest.cpp b/tests/src/Sh4InterpreterTest.cpp
@@ -31,6 +31,7 @@ class Sh4InterpreterTest : public Sh4OpTest {
 		emu.dc_reset(true);
 		ctx = &p_sh4rcb->cntx;
 		sh4 = Get_Sh4Interpreter();
+		sh4->Init();
 	}
 	void PrepareOp(u16 op, u16 op2 = 0, u16 op3 = 0) override
 	{

diff --git a/tests/src/sh4_ops.h b/tests/src/sh4_ops.h
@@ -23,14 +23,6 @@
 #include "types.h"
 #include "hw/sh4/sh4_if.h"
 #include "hw/mem/addrspace.h"
-#include "hw/sh4/sh4_core.h"
-#undef r
-#undef fr
-#undef sr
-#undef mac
-#undef gbr
-#undef fpscr
-#undef fpul
 
 constexpr u32 REG_MAGIC = 0xbaadf00d;