From baeeaca5858dfae6e63cf79994b8ff2aeb830283 Mon Sep 17 00:00:00 2001
From: neonloop
Date: Sun, 1 Aug 2021 17:39:51 +0000
Subject: Revert "Add ROM mirroring and fix mult. cycle count"

This reverts commit aafde6de7b2a28c1684c0e9fa62fee9a2a5398dd.

This was causing trimmed roms to fail to load.
---
 arm/arm_emit.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'arm/arm_emit.h')

diff --git a/arm/arm_emit.h b/arm/arm_emit.h
index 22ca763..17ec744 100644
--- a/arm/arm_emit.h
+++ b/arm/arm_emit.h
@@ -1239,10 +1239,12 @@ u32 execute_store_cpsr_body(u32 _cpsr, u32 store_mask, u32 address)
 
   #define emit_trace_instruction(pc)               \
     generate_save_flags();                         \
+    ARM_LDR_IMM(0, ARMREG_SP, reg_base, 34*4);     \
     ARM_STMDB_WB(0, ARMREG_SP, 0x500C);            \
     arm_load_imm_32bit(reg_a0, pc);                \
     generate_function_call(trace_instruction);     \
     ARM_LDMIA_WB(0, ARMREG_SP, 0x500C);            \
+    arm_load_imm_32bit(ARMREG_SP, (u32)reg);       \
     generate_restore_flags();
   #define emit_trace_thumb_instruction(pc)         \
     emit_trace_instruction(pc)
-- 
cgit v1.2.3