summaryrefslogtreecommitdiffstats
path: root/src/core/arm
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-12-23 15:44:04 +0100
committerbunnei <bunneidev@gmail.com>2014-12-23 15:44:04 +0100
commitd31a94f06b5d595e6dceafdd6a76a76455dd5ed6 (patch)
tree5cfa9b22a9577c166b54e95a32046dff6dc5bbeb /src/core/arm
parentMerge pull request #335 from lioncash/cpsrcreate (diff)
parentarmemu: Fix retrieval of the CPSR in MRS instructions. (diff)
downloadyuzu-d31a94f06b5d595e6dceafdd6a76a76455dd5ed6.tar
yuzu-d31a94f06b5d595e6dceafdd6a76a76455dd5ed6.tar.gz
yuzu-d31a94f06b5d595e6dceafdd6a76a76455dd5ed6.tar.bz2
yuzu-d31a94f06b5d595e6dceafdd6a76a76455dd5ed6.tar.lz
yuzu-d31a94f06b5d595e6dceafdd6a76a76455dd5ed6.tar.xz
yuzu-d31a94f06b5d595e6dceafdd6a76a76455dd5ed6.tar.zst
yuzu-d31a94f06b5d595e6dceafdd6a76a76455dd5ed6.zip
Diffstat (limited to 'src/core/arm')
-rw-r--r--src/core/arm/interpreter/armemu.cpp2
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;
}