diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-12-23 03:44:03 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-12-23 03:44:03 +0100 |
| commit | 8c723224225f65557d115683f473748d43d15eac (patch) | |
| tree | f631104aac6e5d9bec485ba2b62c72aa2a8f3695 /src/core/arm | |
| parent | Merge pull request #322 from chinhodado/master (diff) | |
| download | yuzu-8c723224225f65557d115683f473748d43d15eac.tar yuzu-8c723224225f65557d115683f473748d43d15eac.tar.gz yuzu-8c723224225f65557d115683f473748d43d15eac.tar.bz2 yuzu-8c723224225f65557d115683f473748d43d15eac.tar.lz yuzu-8c723224225f65557d115683f473748d43d15eac.tar.xz yuzu-8c723224225f65557d115683f473748d43d15eac.tar.zst yuzu-8c723224225f65557d115683f473748d43d15eac.zip | |
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 610e04f10..db9d12797 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; } |