Merge pull request #334 from lioncash/cpsr

armemu: Fix retrieval of the CPSR in MRS instructions.
2014-12-23 09:44:04 -05:00 · 2014-12-23 09:44:04 -05:00 · d31a94f06b
commit d31a94f06b
parent 53447da142 8c72322422
1 changed files with 1 additions and 1 deletions
--- a/src/core/arm/interpreter/armemu.cpp
+++ b/src/core/arm/interpreter/armemu.cpp
@ -1724,7 +1724,7 @@ mainswitch:
                            TAKEABORT;
                    } else if ((BITS (0, 11) == 0) && (LHSReg == 15)) {	/* MRS CPSR */
                        UNDEF_MRSPC;
-                        DEST = ECC | EINT | EMODE;
+                        DEST = ARMul_GetCPSR(state);
                    } else {
                        UNDEF_Test;
                    }