citra/citra-nightly
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-nightly.git synced 2024-12-26 12:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #334 from lioncash/cpsr

Browse source 
armemu: Fix retrieval of the CPSR in MRS instructions.
This commit is contained in:
bunnei 2014-12-23 09:44:04 -05:00
parent 53447da142 8c72322422
commit d31a94f06b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/arm/interpreter/armemu.cpp
View file

@ -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;
} }