emu-mirror/citra-canary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

armemu: Properly set the Q flag for SSAT16/USAT16 upon saturation.

Browse Source
This commit is contained in:
Lioncash 2014-12-22 23:43:14 -05:00
parent f66d356938
commit 6446331938
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6209,16 +6209,23 @@ L_stm_s_takeabort:
s16 rn_lo = (state->Reg[rn_idx]); s16 rn_lo = (state->Reg[rn_idx]);
s16 rn_hi = (state->Reg[rn_idx] >> 16); s16 rn_hi = (state->Reg[rn_idx] >> 16);
if (rn_lo > max) if (rn_lo > max) {
rn_lo = max; rn_lo = max;
else if (rn_lo < min) state->Cpsr |= (1 << 27);
} else if (rn_lo < min) {
rn_lo = min; rn_lo = min;
state->Cpsr |= (1 << 27);
}
if (rn_hi > max) if (rn_hi > max) {
rn_hi = max; rn_hi = max;
else if (rn_hi < min) state->Cpsr |= (1 << 27);
} else if (rn_hi < min) {
rn_hi = min; rn_hi = min;
state->Cpsr |= (1 << 27);
}
ARMul_CPSRAltered(state);
state->Reg[rd_idx] = (rn_lo & 0xFFFF) | ((rn_hi & 0xFFFF) << 16); state->Reg[rd_idx] = (rn_lo & 0xFFFF) | ((rn_hi & 0xFFFF) << 16);
return 1; return 1;
} }
@ -6350,16 +6357,23 @@ L_stm_s_takeabort:
s16 rn_lo = (state->Reg[rn_idx]); s16 rn_lo = (state->Reg[rn_idx]);
s16 rn_hi = (state->Reg[rn_idx] >> 16); s16 rn_hi = (state->Reg[rn_idx] >> 16);
if (max < rn_lo) if (max < rn_lo) {
rn_lo = max; rn_lo = max;
else if (rn_lo < 0) state->Cpsr |= (1 << 27);
} else if (rn_lo < 0) {
rn_lo = 0; rn_lo = 0;
state->Cpsr |= (1 << 27);
}
if (max < rn_hi) if (max < rn_hi) {
rn_hi = max; rn_hi = max;
else if (rn_hi < 0) state->Cpsr |= (1 << 27);
} else if (rn_hi < 0) {
rn_hi = 0; rn_hi = 0;
state->Cpsr |= (1 << 27);
}
ARMul_CPSRAltered(state);
state->Reg[rd_idx] = (rn_lo & 0xFFFF) | ((rn_hi << 16) & 0xFFFF); state->Reg[rd_idx] = (rn_lo & 0xFFFF) | ((rn_hi << 16) & 0xFFFF);
return 1; return 1;
} }