From f66d3569389e7e8a364a654d5254a2b9cc1cf8cc Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 22 Dec 2014 23:28:41 -0500 Subject: [PATCH] armemu: Fix SEL Needs to use the updated state of the CPSR. --- src/core/arm/interpreter/armemu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index d19d3a49f3..81a4fdb928 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))