ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM7: Fix STRT/STRBT

This commit is contained in:
Jeffrey Pfau 2015-11-20 19:10:17 -08:00
parent 2fa87cb8f0
commit fad1daf3e9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -34,6 +34,7 @@ Bugfixes:
- Qt: Fix race condition with setting sample rate - Qt: Fix race condition with setting sample rate
- GBA Memory: Fix timing of DMAs - GBA Memory: Fix timing of DMAs
- GBA Memory: Fix DMAs triggering two cycles early - GBA Memory: Fix DMAs triggering two cycles early
- ARM7: Fix STRT/STRBT
Misc: Misc:
- Qt: Window size command line options are now supported - Qt: Window size command line options are now supported
- Qt: Increase usability of key mapper - Qt: Increase usability of key mapper

4
src/arm/isa-arm.c
View File

@ -538,14 +538,14 @@ DEFINE_LOAD_STORE_T_INSTRUCTION_ARM(LDRT,
DEFINE_LOAD_STORE_T_INSTRUCTION_ARM(STRBT, DEFINE_LOAD_STORE_T_INSTRUCTION_ARM(STRBT,
enum PrivilegeMode priv = cpu->privilegeMode; enum PrivilegeMode priv = cpu->privilegeMode;
ARMSetPrivilegeMode(cpu, MODE_USER); 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); ARMSetPrivilegeMode(cpu, priv);
ARM_STORE_POST_BODY;) ARM_STORE_POST_BODY;)
DEFINE_LOAD_STORE_T_INSTRUCTION_ARM(STRT, DEFINE_LOAD_STORE_T_INSTRUCTION_ARM(STRT,
enum PrivilegeMode priv = cpu->privilegeMode; enum PrivilegeMode priv = cpu->privilegeMode;
ARMSetPrivilegeMode(cpu, MODE_USER); 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); ARMSetPrivilegeMode(cpu, priv);
ARM_STORE_POST_BODY;) ARM_STORE_POST_BODY;)