diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-23 09:44:04 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-23 09:44:04 -0500 |
| commit | d31a94f06b5d595e6dceafdd6a76a76455dd5ed6 (patch) | |
| tree | 5cfa9b22a9577c166b54e95a32046dff6dc5bbeb /src/core/arm | |
| parent | 53447da142e4466fc2e509d19c15423ba7595fac (diff) | |
| parent | 8c723224225f65557d115683f473748d43d15eac (diff) | |
Merge pull request #334 from lioncash/cpsr
armemu: Fix retrieval of the CPSR in MRS instructions.
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/interpreter/armemu.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index e69789142..578d71380 100644 --- 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; } |