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

Fix MSR with immediate

This commit is contained in:
Jeffrey Pfau 2014-01-20 15:40:56 -08:00
parent 12f4ff6cbb
commit e7d4f3ae8a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -795,7 +795,7 @@ DEFINE_INSTRUCTION_ARM(MRSR, \
DEFINE_INSTRUCTION_ARM(MSRI, DEFINE_INSTRUCTION_ARM(MSRI,
int c = opcode & 0x00010000; int c = opcode & 0x00010000;
int f = opcode & 0x00080000; int f = opcode & 0x00080000;
int rotate = (opcode & 0x00000F00) >> 8; int rotate = (opcode & 0x00000F00) >> 7;
int32_t operand = ARM_ROR(opcode & 0x000000FF, rotate); int32_t operand = ARM_ROR(opcode & 0x000000FF, rotate);
int32_t mask = (c ? 0x000000FF : 0) | (f ? 0xFF000000 : 0); int32_t mask = (c ? 0x000000FF : 0) | (f ? 0xFF000000 : 0);
if (mask & PSR_USER_MASK) { if (mask & PSR_USER_MASK) {
@ -809,7 +809,7 @@ DEFINE_INSTRUCTION_ARM(MSRI,
DEFINE_INSTRUCTION_ARM(MSRRI, DEFINE_INSTRUCTION_ARM(MSRRI,
int c = opcode & 0x00010000; int c = opcode & 0x00010000;
int f = opcode & 0x00080000; int f = opcode & 0x00080000;
int rotate = (opcode & 0x00000F00) >> 8; int rotate = (opcode & 0x00000F00) >> 7;
int32_t operand = ARM_ROR(opcode & 0x000000FF, rotate); int32_t operand = ARM_ROR(opcode & 0x000000FF, rotate);
int32_t mask = (c ? 0x000000FF : 0) | (f ? 0xFF000000 : 0); int32_t mask = (c ? 0x000000FF : 0) | (f ? 0xFF000000 : 0);
mask &= PSR_USER_MASK | PSR_PRIV_MASK | PSR_STATE_MASK; mask &= PSR_USER_MASK | PSR_PRIV_MASK | PSR_STATE_MASK;