mirror of
https://github.com/PabloMK7/citra.git
synced 2024-12-16 01:31:19 +01:00
Merge pull request #334 from lioncash/cpsr
armemu: Fix retrieval of the CPSR in MRS instructions.
This commit is contained in:
commit
d31a94f06b
@ -1724,7 +1724,7 @@ mainswitch:
|
|||||||
TAKEABORT;
|
TAKEABORT;
|
||||||
} else if ((BITS (0, 11) == 0) && (LHSReg == 15)) { /* MRS CPSR */
|
} else if ((BITS (0, 11) == 0) && (LHSReg == 15)) { /* MRS CPSR */
|
||||||
UNDEF_MRSPC;
|
UNDEF_MRSPC;
|
||||||
DEST = ECC | EINT | EMODE;
|
DEST = ARMul_GetCPSR(state);
|
||||||
} else {
|
} else {
|
||||||
UNDEF_Test;
|
UNDEF_Test;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user