diff options
| author |  Lioncash | 2014-12-22 21:44:03 -0500 |
|---|---|---|
| committer | Lioncash | 2014-12-22 21:44:03 -0500 |
| commit | 8c723224225f65557d115683f473748d43d15eac (patch) | |
| tree | f631104aac6e5d9bec485ba2b62c72aa2a8f3695 | |
| parent | Merge pull request #322 from chinhodado/master (diff) | |
| download | yuzu-8c723224225f65557d115683f473748d43d15eac.tar.gz yuzu-8c723224225f65557d115683f473748d43d15eac.tar.xz yuzu-8c723224225f65557d115683f473748d43d15eac.zip | |
armemu: Fix retrieval of the CPSR in MRS instructions.
| -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: | |||
| 1724 | TAKEABORT; | 1724 | TAKEABORT; |
| 1725 | } else if ((BITS (0, 11) == 0) && (LHSReg == 15)) { /* MRS CPSR */ | 1725 | } else if ((BITS (0, 11) == 0) && (LHSReg == 15)) { /* MRS CPSR */ |
| 1726 | UNDEF_MRSPC; | 1726 | UNDEF_MRSPC; |
| 1727 | DEST = ECC | EINT | EMODE; | 1727 | DEST = ARMul_GetCPSR(state); |
| 1728 | } else { | 1728 | } else { |
| 1729 | UNDEF_Test; | 1729 | UNDEF_Test; |
| 1730 | } | 1730 | } |