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

Have board re-read CPSR when it is modified by MSR

This commit is contained in:
Jeffrey Pfau 2014-01-27 00:21:14 -08:00
parent ef66e4a8c7
commit 8e5b806cdd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -659,7 +659,8 @@ DEFINE_INSTRUCTION_ARM(MSR,
if (cpu->privilegeMode != MODE_USER && (mask & PSR_PRIV_MASK)) { if (cpu->privilegeMode != MODE_USER && (mask & PSR_PRIV_MASK)) {
ARMSetPrivilegeMode(cpu, (enum PrivilegeMode) ((operand & 0x0000000F) | 0x00000010)); ARMSetPrivilegeMode(cpu, (enum PrivilegeMode) ((operand & 0x0000000F) | 0x00000010));
cpu->cpsr.packed = (cpu->cpsr.packed & ~PSR_PRIV_MASK) | (operand & PSR_PRIV_MASK); cpu->cpsr.packed = (cpu->cpsr.packed & ~PSR_PRIV_MASK) | (operand & PSR_PRIV_MASK);
}) }
_ARMReadCPSR(cpu);)
DEFINE_INSTRUCTION_ARM(MSRR, DEFINE_INSTRUCTION_ARM(MSRR,
int c = opcode & 0x00010000; int c = opcode & 0x00010000;
@ -689,7 +690,8 @@ DEFINE_INSTRUCTION_ARM(MSRI,
if (cpu->privilegeMode != MODE_USER && (mask & PSR_PRIV_MASK)) { if (cpu->privilegeMode != MODE_USER && (mask & PSR_PRIV_MASK)) {
ARMSetPrivilegeMode(cpu, (enum PrivilegeMode) ((operand & 0x0000000F) | 0x00000010)); ARMSetPrivilegeMode(cpu, (enum PrivilegeMode) ((operand & 0x0000000F) | 0x00000010));
cpu->cpsr.packed = (cpu->cpsr.packed & ~PSR_PRIV_MASK) | (operand & PSR_PRIV_MASK); cpu->cpsr.packed = (cpu->cpsr.packed & ~PSR_PRIV_MASK) | (operand & PSR_PRIV_MASK);
}) }
_ARMReadCPSR(cpu);)
DEFINE_INSTRUCTION_ARM(MSRRI, DEFINE_INSTRUCTION_ARM(MSRRI,
int c = opcode & 0x00010000; int c = opcode & 0x00010000;