citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #340 from lioncash/whoops 

armemu: Fix GE/Q flag setting semantics
This commit is contained in:
bunnei 2014-12-25 21:46:00 -05:00
parent 2bbbe68399 6b7808e412
commit 529640cfca
1 changed files with 56 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5863,22 +5863,21 @@ L_stm_s_takeabort:
state->Reg[rd_idx] = (lo_result & 0xFFFF) | ((hi_result & 0xFFFF) << 16); state->Reg[rd_idx] = (lo_result & 0xFFFF) | ((hi_result & 0xFFFF) << 16);
if (lo_result >= 0) { if (lo_result >= 0) {
state->Cpsr |= (1 << 16); state->GEFlag |= (1 << 16);
state->Cpsr |= (1 << 17); state->GEFlag |= (1 << 17);
} else { } else {
state->Cpsr &= ~(1 << 16); state->GEFlag &= ~(1 << 16);
state->Cpsr &= ~(1 << 17); state->GEFlag &= ~(1 << 17);
} }
if (hi_result >= 0) { if (hi_result >= 0) {
state->Cpsr |= (1 << 18); state->GEFlag |= (1 << 18);
state->Cpsr |= (1 << 19); state->GEFlag |= (1 << 19);
} else { } else {
state->Cpsr &= ~(1 << 18); state->GEFlag &= ~(1 << 18);
state->Cpsr &= ~(1 << 19); state->GEFlag &= ~(1 << 19);
} }
ARMul_CPSRAltered(state);
return 1; return 1;
} }
// SADD8/SSUB8 // SADD8/SSUB8
@ -5903,24 +5902,24 @@ L_stm_s_takeabort:
hi_val2 = (u8)(((rn_val >> 24) & 0xFF) + ((rm_val >> 24) & 0xFF)); hi_val2 = (u8)(((rn_val >> 24) & 0xFF) + ((rm_val >> 24) & 0xFF));
if (lo_val1 & 0x80) if (lo_val1 & 0x80)
state->Cpsr |= (1 << 16); state->GEFlag |= (1 << 16);
else else
state->Cpsr &= ~(1 << 16); state->GEFlag &= ~(1 << 16);
if (lo_val2 & 0x80) if (lo_val2 & 0x80)
state->Cpsr |= (1 << 17); state->GEFlag |= (1 << 17);
else else
state->Cpsr &= ~(1 << 17); state->GEFlag &= ~(1 << 17);
if (hi_val1 & 0x80) if (hi_val1 & 0x80)
state->Cpsr |= (1 << 18); state->GEFlag |= (1 << 18);
else else
state->Cpsr &= ~(1 << 18); state->GEFlag &= ~(1 << 18);
if (hi_val2 & 0x80) if (hi_val2 & 0x80)
state->Cpsr |= (1 << 19); state->GEFlag |= (1 << 19);
else else
state->Cpsr &= ~(1 << 19); state->GEFlag &= ~(1 << 19);
} }
// SSUB8 // SSUB8
else { else {
@ -5930,27 +5929,26 @@ L_stm_s_takeabort:
hi_val2 = (u8)(((rn_val >> 24) & 0xFF) - ((rm_val >> 24) & 0xFF)); hi_val2 = (u8)(((rn_val >> 24) & 0xFF) - ((rm_val >> 24) & 0xFF));
if (!(lo_val1 & 0x80)) if (!(lo_val1 & 0x80))
state->Cpsr |= (1 << 16); state->GEFlag |= (1 << 16);
else else
state->Cpsr &= ~(1 << 16); state->GEFlag &= ~(1 << 16);
if (!(lo_val2 & 0x80)) if (!(lo_val2 & 0x80))
state->Cpsr |= (1 << 17); state->GEFlag |= (1 << 17);
else else
state->Cpsr &= ~(1 << 17); state->GEFlag &= ~(1 << 17);
if (!(hi_val1 & 0x80)) if (!(hi_val1 & 0x80))
state->Cpsr |= (1 << 18); state->GEFlag |= (1 << 18);
else else
state->Cpsr &= ~(1 << 18); state->GEFlag &= ~(1 << 18);
if (!(hi_val2 & 0x80)) if (!(hi_val2 & 0x80))
state->Cpsr |= (1 << 19); state->GEFlag |= (1 << 19);
else else
state->Cpsr &= ~(1 << 19); state->GEFlag &= ~(1 << 19);
} }
ARMul_CPSRAltered(state);
state->Reg[rd_idx] = (lo_val1 | lo_val2 << 8 | hi_val1 << 16 | hi_val2 << 24); state->Reg[rd_idx] = (lo_val1 | lo_val2 << 8 | hi_val1 << 16 | hi_val2 << 24);
return 1; return 1;
} }
@ -6029,31 +6027,30 @@ L_stm_s_takeabort:
h2 = ((u16)(from >> 16) - (u16)(to >> 16)); h2 = ((u16)(from >> 16) - (u16)(to >> 16));
if (!(h1 & 0xffff0000)) if (!(h1 & 0xffff0000))
state->Cpsr |= (3 << 16); state->GEFlag |= (3 << 16);
else else
state->Cpsr &= ~(3 << 16); state->GEFlag &= ~(3 << 16);
if (!(h2 & 0xffff0000)) if (!(h2 & 0xffff0000))
state->Cpsr |= (3 << 18); state->GEFlag |= (3 << 18);
else else
state->Cpsr &= ~(3 << 18); state->GEFlag &= ~(3 << 18);
} }
else { // UADD16 else { // UADD16
h1 = ((u16)from + (u16)to); h1 = ((u16)from + (u16)to);
h2 = ((u16)(from >> 16) + (u16)(to >> 16)); h2 = ((u16)(from >> 16) + (u16)(to >> 16));
if (h1 & 0xffff0000) if (h1 & 0xffff0000)
state->Cpsr |= (3 << 16); state->GEFlag |= (3 << 16);
else else
state->Cpsr &= ~(3 << 16); state->GEFlag &= ~(3 << 16);
if (h2 & 0xffff0000) if (h2 & 0xffff0000)
state->Cpsr |= (3 << 18); state->GEFlag |= (3 << 18);
else else
state->Cpsr &= ~(3 << 18); state->GEFlag &= ~(3 << 18);
} }
ARMul_CPSRAltered(state);
state->Reg[rd] = (u32)((h1 & 0xffff) | ((h2 & 0xffff) << 16)); state->Reg[rd] = (u32)((h1 & 0xffff) | ((h2 & 0xffff) << 16));
return 1; return 1;
} }
@ -6068,24 +6065,24 @@ L_stm_s_takeabort:
b4 = ((u8)(from >> 24) - (u8)(to >> 24)); b4 = ((u8)(from >> 24) - (u8)(to >> 24));
if (!(b1 & 0xffffff00)) if (!(b1 & 0xffffff00))
state->Cpsr |= (1 << 16); state->GEFlag |= (1 << 16);
else else
state->Cpsr &= ~(1 << 16); state->GEFlag &= ~(1 << 16);
if (!(b2 & 0xffffff00)) if (!(b2 & 0xffffff00))
state->Cpsr |= (1 << 17); state->GEFlag |= (1 << 17);
else else
state->Cpsr &= ~(1 << 17); state->GEFlag &= ~(1 << 17);
if (!(b3 & 0xffffff00)) if (!(b3 & 0xffffff00))
state->Cpsr |= (1 << 18); state->GEFlag |= (1 << 18);
else else
state->Cpsr &= ~(1 << 18); state->GEFlag &= ~(1 << 18);
if (!(b4 & 0xffffff00)) if (!(b4 & 0xffffff00))
state->Cpsr |= (1 << 19); state->GEFlag |= (1 << 19);
else else
state->Cpsr &= ~(1 << 19); state->GEFlag &= ~(1 << 19);
} }
else { // UADD8 else { // UADD8
b1 = ((u8)from + (u8)to); b1 = ((u8)from + (u8)to);
@ -6094,27 +6091,26 @@ L_stm_s_takeabort:
b4 = ((u8)(from >> 24) + (u8)(to >> 24)); b4 = ((u8)(from >> 24) + (u8)(to >> 24));
if (b1 & 0xffffff00) if (b1 & 0xffffff00)
state->Cpsr |= (1 << 16); state->GEFlag |= (1 << 16);
else else
state->Cpsr &= ~(1 << 16); state->GEFlag &= ~(1 << 16);
if (b2 & 0xffffff00) if (b2 & 0xffffff00)
state->Cpsr |= (1 << 17); state->GEFlag |= (1 << 17);
else else
state->Cpsr &= ~(1 << 17); state->GEFlag &= ~(1 << 17);
if (b3 & 0xffffff00) if (b3 & 0xffffff00)
state->Cpsr |= (1 << 18); state->GEFlag |= (1 << 18);
else else
state->Cpsr &= ~(1 << 18); state->GEFlag &= ~(1 << 18);
if (b4 & 0xffffff00) if (b4 & 0xffffff00)
state->Cpsr |= (1 << 19); state->GEFlag |= (1 << 19);
else else
state->Cpsr &= ~(1 << 19); state->GEFlag &= ~(1 << 19);
} }
ARMul_CPSRAltered(state);
state->Reg[rd] = (u32)(b1 | (b2 & 0xff) << 8 | (b3 & 0xff) << 16 | (b4 & 0xff) << 24); state->Reg[rd] = (u32)(b1 | (b2 & 0xff) << 8 | (b3 & 0xff) << 16 | (b4 & 0xff) << 24);
return 1; return 1;
} }
@ -6211,21 +6207,20 @@ L_stm_s_takeabort:
if (rn_lo > max) { if (rn_lo > max) {
rn_lo = max; rn_lo = max;
state->Cpsr |= (1 << 27); SETQ;
} else if (rn_lo < min) { } else if (rn_lo < min) {
rn_lo = min; rn_lo = min;
state->Cpsr |= (1 << 27); SETQ;
} }
if (rn_hi > max) { if (rn_hi > max) {
rn_hi = max; rn_hi = max;
state->Cpsr |= (1 << 27); SETQ;
} else if (rn_hi < min) { } else if (rn_hi < min) {
rn_hi = min; rn_hi = min;
state->Cpsr |= (1 << 27); SETQ;
} }
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;
} }
@ -6359,21 +6354,20 @@ L_stm_s_takeabort:
if (max < rn_lo) { if (max < rn_lo) {
rn_lo = max; rn_lo = max;
state->Cpsr |= (1 << 27); SETQ;
} else if (rn_lo < 0) { } else if (rn_lo < 0) {
rn_lo = 0; rn_lo = 0;
state->Cpsr |= (1 << 27); SETQ;
} }
if (max < rn_hi) { if (max < rn_hi) {
rn_hi = max; rn_hi = max;
state->Cpsr |= (1 << 27); SETQ;
} else if (rn_hi < 0) { } else if (rn_hi < 0) {
rn_hi = 0; rn_hi = 0;
state->Cpsr |= (1 << 27); SETQ;
} }
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;
} }