citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #307 from lioncash/usat16 

armemu: Fix USAT16.
This commit is contained in:
bunnei 2014-12-18 17:45:25 -05:00
parent c71f8840e5 e683f654ce
commit 4959e3b2c0
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6192,18 +6192,27 @@ L_stm_s_takeabort:
//ichfly //ichfly
//USAT16 //USAT16
{ {
u8 tar = BITS(12, 15); const u8 rd_idx = BITS(12, 15);
u8 src = BITS(0, 3); const u8 rn_idx = BITS(0, 3);
u8 val = BITS(16, 19); const u8 num_bits = BITS(16, 19);
s16 a1 = (state->Reg[src]); const s16 max = 0xFFFF >> (16 - num_bits);
s16 a2 = (state->Reg[src] >> 0x10); s16 rn_lo = (state->Reg[rn_idx]);
s16 max = 0xFFFF >> (16 - val); s16 rn_hi = (state->Reg[rn_idx] >> 16);
if (max < a1) a1 = max;
if (max < a2) a2 = max; if (max < rn_lo)
u32 temp2 = ((u32)(a2)) << 0x10; rn_lo = max;
state->Reg[tar] = (a1 & 0xFFFF) | (temp2); else if (rn_lo < 0)
} rn_lo = 0;
if (max < rn_hi)
rn_hi = max;
else if (rn_hi < 0)
rn_hi = 0;
state->Reg[rd_idx] = (rn_lo & 0xFFFF) | ((rn_hi << 16) & 0xFFFF);
return 1; return 1;
}
default: default:
break; break;
} }