mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-22 20:33:37 +02:00
armemu: Fix UXTAB/UXTAH
This commit is contained in:
parent
b5dbd6f2a2
commit
bc81cc9490
@ -6176,7 +6176,7 @@ L_stm_s_takeabort:
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
Rm = ((state->Reg[BITS(0, 3)] >> ror) & 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 */
|
||||||
@ -6216,13 +6216,13 @@ L_stm_s_takeabort:
|
|||||||
if (ror == -1)
|
if (ror == -1)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
Rm = ((state->Reg[BITS(0, 3)] >> ror) & 0xFFFF);
|
Rm = ((state->Reg[BITS(0, 3)] >> ror) & 0xFFFF) | ((state->Reg[BITS(0, 3)] << (32 - ror)) & 0xFFFF) & 0xFFFF;
|
||||||
|
|
||||||
/* UXT */
|
/* UXT */
|
||||||
/* state->Reg[BITS (12, 15)] = Rm; */
|
/* state->Reg[BITS (12, 15)] = Rm; */
|
||||||
/* dyf add */
|
/* dyf add */
|
||||||
if (BITS(16, 19) == 0xf) {
|
if (BITS(16, 19) == 0xf) {
|
||||||
state->Reg[BITS(12, 15)] = (Rm >> (8 * BITS(10, 11))) & 0x0000FFFF;
|
state->Reg[BITS(12, 15)] = Rm;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* UXTAH */
|
/* UXTAH */
|
||||||
@ -6230,7 +6230,7 @@ L_stm_s_takeabort:
|
|||||||
// printf("rd is %x rn is %x rm is %x rotate is %x\n", state->Reg[BITS (12, 15)], state->Reg[BITS (16, 19)]
|
// 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));
|
// , Rm, BITS(10, 11));
|
||||||
// printf("icounter is %lld\n", state->NumInstrs);
|
// printf("icounter is %lld\n", state->NumInstrs);
|
||||||
state->Reg[BITS(12, 15)] = (state->Reg[BITS(16, 19)] >> (8 * (BITS(10, 11)))) + Rm;
|
state->Reg[BITS(12, 15)] = state->Reg[BITS(16, 19)] + Rm;
|
||||||
// printf("rd is %x\n", state->Reg[BITS (12, 15)]);
|
// printf("rd is %x\n", state->Reg[BITS (12, 15)]);
|
||||||
// exit(-1);
|
// exit(-1);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user