diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-12-23 05:28:41 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-12-23 05:52:05 +0100 |
| commit | f66d3569389e7e8a364a654d5254a2b9cc1cf8cc (patch) | |
| tree | 6d4ec9eaae8738f77951d5424885a7930ce5fdf8 /src/core/arm | |
| parent | armemu: Fix construction of the CPSR (diff) | |
| download | yuzu-f66d3569389e7e8a364a654d5254a2b9cc1cf8cc.tar yuzu-f66d3569389e7e8a364a654d5254a2b9cc1cf8cc.tar.gz yuzu-f66d3569389e7e8a364a654d5254a2b9cc1cf8cc.tar.bz2 yuzu-f66d3569389e7e8a364a654d5254a2b9cc1cf8cc.tar.lz yuzu-f66d3569389e7e8a364a654d5254a2b9cc1cf8cc.tar.xz yuzu-f66d3569389e7e8a364a654d5254a2b9cc1cf8cc.tar.zst yuzu-f66d3569389e7e8a364a654d5254a2b9cc1cf8cc.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 d19d3a49f..81a4fdb92 100644 --- a/src/core/arm/interpreter/armemu.cpp +++ b/src/core/arm/interpreter/armemu.cpp @@ -6153,7 +6153,7 @@ L_stm_s_takeabort: u32 rm = (instr >> 0) & 0xF; u32 from = state->Reg[rn]; u32 to = state->Reg[rm]; - u32 cpsr = state->Cpsr; + u32 cpsr = ARMul_GetCPSR(state); if ((instr & 0xFF0) == 0xFB0) { // SEL u32 result; if (cpsr & (1 << 16)) |