all repos — mgba @ 17b99e2b90ccebc0a3993b78871d8fff01d295e0

mGBA Game Boy Advance Emulator

ARM7: Fix STRT/STRBT
Jeffrey Pfau jeffrey@endrift.com
Fri, 20 Nov 2015 19:10:17 -0800
commit

17b99e2b90ccebc0a3993b78871d8fff01d295e0

parent

1ca65ba36b963752c763a7715e2d758658ae9906

2 files changed, 3 insertions(+), 2 deletions(-)

jump to
M CHANGES → CHANGES 
@@ -21,6 +21,7 @@ - GBA BIOS: Fix Sqrt sign
  - GBA BIOS: Fix misaligned RLUnCompReadNormalWrite*
  - Qt: Fix race condition with setting sample rate
  - GBA Memory: Fix timing of DMAs
+ - ARM7: Fix STRT/STRBT
 Misc:
  - GBA Audio: Implement missing flags on SOUNDCNT_X register
M src/arm/isa-arm.c → src/arm/isa-arm.c 
@@ -554,14 +554,14 @@
 DEFINE_LOAD_STORE_T_INSTRUCTION_ARM(STRBT,
 	enum PrivilegeMode priv = cpu->privilegeMode;
 	ARMSetPrivilegeMode(cpu, MODE_USER);
-	cpu->memory.store32(cpu, address, cpu->gprs[rd], &currentCycles);
+	cpu->memory.store8(cpu, address, cpu->gprs[rd], &currentCycles);
 	ARMSetPrivilegeMode(cpu, priv);
 	ARM_STORE_POST_BODY;)
 
 DEFINE_LOAD_STORE_T_INSTRUCTION_ARM(STRT,
 	enum PrivilegeMode priv = cpu->privilegeMode;
 	ARMSetPrivilegeMode(cpu, MODE_USER);
-	cpu->memory.store8(cpu, address, cpu->gprs[rd], &currentCycles);
+	cpu->memory.store32(cpu, address, cpu->gprs[rd], &currentCycles);
 	ARMSetPrivilegeMode(cpu, priv);
 	ARM_STORE_POST_BODY;)