yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

armemu: Simplify USAT16/UXTB/UXTAB

This commit is contained in:
Lioncash 2014-12-28 11:56:16 -05:00
parent 5e16216afb
commit 914ecfe04f
1 changed files with 42 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6422,79 +6422,56 @@ L_stm_s_takeabort:
return 1; return 1;
} }
break; break;
case 0x6e: { case 0x6e: // USAT, USAT16, UXTB, and UXTAB
ARMword Rm; {
int ror = -1; const u8 op2 = BITS(5, 7);
switch (BITS(4, 11)) { // USAT16
case 0x07: if (op2 == 0x01) {
ror = 0; const u8 rd_idx = BITS(12, 15);
break; const u8 rn_idx = BITS(0, 3);
case 0x47: const u8 num_bits = BITS(16, 19);
ror = 8; const s16 max = 0xFFFF >> (16 - num_bits);
break; s16 rn_lo = (state->Reg[rn_idx]);
case 0x87: s16 rn_hi = (state->Reg[rn_idx] >> 16);
ror = 16;
break;
case 0xc7:
ror = 24;
break;
case 0x01: if (max < rn_lo) {
case 0xf3: rn_lo = max;
//ichfly SETQ;
//USAT16 } else if (rn_lo < 0) {
{ rn_lo = 0;
const u8 rd_idx = BITS(12, 15); SETQ;
const u8 rn_idx = BITS(0, 3);
const u8 num_bits = BITS(16, 19);
const s16 max = 0xFFFF >> (16 - num_bits);
s16 rn_lo = (state->Reg[rn_idx]);
s16 rn_hi = (state->Reg[rn_idx] >> 16);
if (max < rn_lo) {
rn_lo = max;
SETQ;
} else if (rn_lo < 0) {
rn_lo = 0;
SETQ;
}
if (max < rn_hi) {
rn_hi = max;
SETQ;
} else if (rn_hi < 0) {
rn_hi = 0;
SETQ;
}
state->Reg[rd_idx] = (rn_lo & 0xFFFF) | ((rn_hi << 16) & 0xFFFF);
return 1;
} }
default: if (max < rn_hi) {
break; rn_hi = max;
} SETQ;
} else if (rn_hi < 0) {
if (ror == -1) { rn_hi = 0;
if (BITS(4, 6) == 0x7) { SETQ;
printf("Unhandled v6 insn: usat\n");
return 0;
} }
break;
state->Reg[rd_idx] = (rn_lo & 0xFFFF) | ((rn_hi << 16) & 0xFFFF);
return 1;
} }
else if (op2 == 0x03) {
const u8 rotate = BITS(10, 11) * 8;
const u32 rm = ((state->Reg[BITS(0, 3)] >> rotate) & 0xFF) | (((state->Reg[BITS(0, 3)] << (32 - rotate)) & 0xFF) & 0xFF);
Rm = ((state->Reg[BITS(0, 3)] >> ror) & 0xFF) | (((state->Reg[BITS(0, 3)] << (32 - ror)) & 0xFF) & 0xFF); if (BITS(16, 19) == 0xf)
if (BITS(16, 19) == 0xf)
/* UXTB */ /* UXTB */
state->Reg[BITS(12, 15)] = Rm; state->Reg[BITS(12, 15)] = rm;
else else
/* UXTAB */ /* UXTAB */
state->Reg[BITS(12, 15)] = state->Reg[BITS(16, 19)] + Rm; state->Reg[BITS(12, 15)] = state->Reg[BITS(16, 19)] + rm;
return 1; return 1;
}
else {
printf("Unimplemented op: USAT");
}
} }
break;
case 0x6f: // UXTH, UXTAH, and REVSH. case 0x6f: // UXTH, UXTAH, and REVSH.
{ {