OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-27 00:10:06 +00:00
Code Issues Projects Releases Wiki Activity

armemu: Fix SEL

Browse Source 
Needs to use the updated state of the CPSR.
This commit is contained in:
Lioncash 2014-12-22 23:28:41 -05:00
parent 8e2accd974
commit f66d356938
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/arm/interpreter/armemu.cpp
View File

@ -6153,7 +6153,7 @@ L_stm_s_takeabort:
u32 rm = (instr >> 0) & 0xF; u32 rm = (instr >> 0) & 0xF;
u32 from = state->Reg[rn]; u32 from = state->Reg[rn];
u32 to = state->Reg[rm]; u32 to = state->Reg[rm];
u32 cpsr = state->Cpsr; u32 cpsr = ARMul_GetCPSR(state);
if ((instr & 0xFF0) == 0xFB0) { // SEL if ((instr & 0xFF0) == 0xFB0) { // SEL
u32 result; u32 result;
if (cpsr & (1 << 16)) if (cpsr & (1 << 16))