Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-31 13:50:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix SADD8/SSUB8 in the armemu

Browse source
This commit is contained in:
Lioncash 2015-01-01 09:44:32 -05:00
parent 4e2cb06b81
commit 481a6c9652
1 changed files with 31 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/core/arm/interpreter/armemu.cpp
View file

@ -5881,67 +5881,45 @@ L_stm_s_takeabort:
const u32 rm_val = state->Reg[rm_idx]; const u32 rm_val = state->Reg[rm_idx];
const u32 rn_val = state->Reg[rn_idx]; const u32 rn_val = state->Reg[rn_idx];
u8 lo_val1; s32 lo_val1, lo_val2;
u8 lo_val2; s32 hi_val1, hi_val2;
u8 hi_val1;
u8 hi_val2;
// SADD8 // SADD8
if ((instr & 0xFF0) == 0xf90) { if ((instr & 0xFF0) == 0xf90) {
lo_val1 = (u8)((rn_val & 0xFF) + (rm_val & 0xFF)); lo_val1 = (s32)(s8)(rn_val & 0xFF) + (s32)(s8)(rm_val & 0xFF);
lo_val2 = (u8)(((rn_val >> 8) & 0xFF) + ((rm_val >> 8) & 0xFF)); lo_val2 = (s32)(s8)((rn_val >> 8) & 0xFF) + (s32)(s8)((rm_val >> 8) & 0xFF);
hi_val1 = (u8)(((rn_val >> 16) & 0xFF) + ((rm_val >> 16) & 0xFF)); hi_val1 = (s32)(s8)((rn_val >> 16) & 0xFF) + (s32)(s8)((rm_val >> 16) & 0xFF);
hi_val2 = (u8)(((rn_val >> 24) & 0xFF) + ((rm_val >> 24) & 0xFF)); hi_val2 = (s32)(s8)((rn_val >> 24) & 0xFF) + (s32)(s8)((rm_val >> 24) & 0xFF);
if (lo_val1 & 0x80)
state->GEFlag |= (1 << 16);
else
state->GEFlag &= ~(1 << 16);
if (lo_val2 & 0x80)
state->GEFlag |= (1 << 17);
else
state->GEFlag &= ~(1 << 17);
if (hi_val1 & 0x80)
state->GEFlag |= (1 << 18);
else
state->GEFlag &= ~(1 << 18);
if (hi_val2 & 0x80)
state->GEFlag |= (1 << 19);
else
state->GEFlag &= ~(1 << 19);
} }
// SSUB8 // SSUB8
else { else {
lo_val1 = (u8)((rn_val & 0xFF) - (rm_val & 0xFF)); lo_val1 = (s32)(s8)(rn_val & 0xFF) - (s32)(s8)(rm_val & 0xFF);
lo_val2 = (u8)(((rn_val >> 8) & 0xFF) - ((rm_val >> 8) & 0xFF)); lo_val2 = (s32)(s8)((rn_val >> 8) & 0xFF) - (s32)(s8)((rm_val >> 8) & 0xFF);
hi_val1 = (u8)(((rn_val >> 16) & 0xFF) - ((rm_val >> 16) & 0xFF)); hi_val1 = (s32)(s8)((rn_val >> 16) & 0xFF) - (s32)(s8)((rm_val >> 16) & 0xFF);
hi_val2 = (u8)(((rn_val >> 24) & 0xFF) - ((rm_val >> 24) & 0xFF)); hi_val2 = (s32)(s8)((rn_val >> 24) & 0xFF) - (s32)(s8)((rm_val >> 24) & 0xFF);
}
if (!(lo_val1 & 0x80)) if (lo_val1 >= 0)
state->GEFlag |= (1 << 16); state->GEFlag |= (1 << 16);
else else
state->GEFlag &= ~(1 << 16); state->GEFlag &= ~(1 << 16);
if (!(lo_val2 & 0x80)) if (lo_val2 >= 0)
state->GEFlag |= (1 << 17); state->GEFlag |= (1 << 17);
else else
state->GEFlag &= ~(1 << 17); state->GEFlag &= ~(1 << 17);
if (!(hi_val1 & 0x80)) if (hi_val1 >= 0)
state->GEFlag |= (1 << 18); state->GEFlag |= (1 << 18);
else else
state->GEFlag &= ~(1 << 18); state->GEFlag &= ~(1 << 18);
if (!(hi_val2 & 0x80)) if (hi_val2 >= 0)
state->GEFlag |= (1 << 19); state->GEFlag |= (1 << 19);
else else
state->GEFlag &= ~(1 << 19); state->GEFlag &= ~(1 << 19);
}
state->Reg[rd_idx] = (lo_val1 | lo_val2 << 8 | hi_val1 << 16 | hi_val2 << 24); state->Reg[rd_idx] = ((lo_val1 & 0xFF) | ((lo_val2 & 0xFF) << 8) | ((hi_val1 & 0xFF) << 16) | ((hi_val2 & 0xFF) << 24));
return 1; return 1;
} }
else { else {