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

Set bits in MSR properly

This commit is contained in:
Jeffrey Pfau 2013-04-12 02:10:09 -07:00
parent 6097890251
commit 37ce1383fc
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/isa-arm.c
View File

@ -520,16 +520,11 @@ DEFINE_INSTRUCTION_ARM(MSR, \
cpu->spsr.packed = (cpu->spsr.packed & ~mask) | (operand & mask); \
} else { \
if (mask & PSR_USER_MASK) { \
cpu->cpsr.n = operand & 0x80000000; \
cpu->cpsr.z = operand & 0x40000000; \
cpu->cpsr.c = operand & 0x20000000; \
cpu->cpsr.v = operand & 0x10000000; \
cpu->cpsr.packed = (cpu->cpsr.packed & ~PSR_USER_MASK) | (operand & PSR_USER_MASK); \
} \
if (cpu->privilegeMode != MODE_USER && (mask & PSR_PRIV_MASK)) { \
ARMSetPrivilegeMode(cpu, (enum PrivilegeMode) ((operand & 0x0000000F) | 0x00000010)); \
cpu->cpsr.priv = cpu->privilegeMode; \
cpu->cpsr.i = operand & 0x00000080; \
cpu->cpsr.f = operand & 0x00000040; \
cpu->cpsr.packed = (cpu->cpsr.packed & ~PSR_PRIV_MASK) | (operand & PSR_PRIV_MASK); \
} \
})