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

armemu: Simplify REVSH/UXTH/UXTAH

This commit is contained in:
Lioncash 2014-12-28 11:45:13 -05:00
parent 3422d81f05
commit 5e16216afb
1 changed files with 23 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6496,58 +6496,33 @@ L_stm_s_takeabort:
return 1; return 1;
} }
case 0x6f: { case 0x6f: // UXTH, UXTAH, and REVSH.
ARMword Rm; {
int ror = -1; const u8 op2 = BITS(5, 7);
switch (BITS(4, 11)) { // REVSH
case 0x07: if (op2 == 0x05) {
ror = 0; DEST = ((RHS & 0xFF) << 8) | ((RHS & 0xFF00) >> 8);
break; if (DEST & 0x8000)
case 0x47: DEST |= 0xffff0000;
ror = 8; return 1;
break; }
case 0x87: // UXTH and UXTAH
ror = 16; else if (op2 == 0x03) {
break; const u8 rotate = BITS(10, 11) * 8;
case 0xc7: const ARMword rm = ((state->Reg[BITS(0, 3)] >> rotate) & 0xFFFF) | (((state->Reg[BITS(0, 3)] << (32 - rotate)) & 0xFFFF) & 0xFFFF);
ror = 24;
break;
case 0xfb: // REVSH // UXTH
{ if (BITS(16, 19) == 0xf) {
DEST = ((RHS & 0xFF) << 8) | ((RHS & 0xFF00) >> 8); state->Reg[BITS(12, 15)] = rm;
if (DEST & 0x8000)
DEST |= 0xffff0000;
return 1;
} }
default: // UXTAH
break; else {
state->Reg[BITS(12, 15)] = state->Reg[BITS(16, 19)] + rm;
}
return 1;
} }
if (ror == -1)
break;
Rm = ((state->Reg[BITS(0, 3)] >> ror) & 0xFFFF) | (((state->Reg[BITS(0, 3)] << (32 - ror)) & 0xFFFF) & 0xFFFF);
/* UXT */
/* state->Reg[BITS (12, 15)] = Rm; */
/* dyf add */
if (BITS(16, 19) == 0xf) {
state->Reg[BITS(12, 15)] = Rm;
}
else {
/* UXTAH */
/* state->Reg[BITS (12, 15)] = state->Reg [BITS (16, 19)] + Rm; */
// printf("rd is %x rn is %x rm is %x rotate is %x\n", state->Reg[BITS (12, 15)], state->Reg[BITS (16, 19)]
// , Rm, BITS(10, 11));
// printf("icounter is %lld\n", state->NumInstrs);
state->Reg[BITS(12, 15)] = state->Reg[BITS(16, 19)] + Rm;
// printf("rd is %x\n", state->Reg[BITS (12, 15)]);
// exit(-1);
}
return 1;
} }
case 0x70: case 0x70:
// ichfly // ichfly