diff options
author | bunnei <bunneidev@gmail.com> | 2014-12-16 00:56:02 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-12-16 00:56:02 +0100 |
commit | 0fd731ee63bdde7030d0734beac27e393b870d7f (patch) | |
tree | f5c18834c154740ec4b7874cbac29a0eb9b23096 /src/core/arm | |
parent | Merge pull request #279 from yuriks/session (diff) | |
parent | armemu: Fix UXTB16 (diff) | |
download | yuzu-0fd731ee63bdde7030d0734beac27e393b870d7f.tar yuzu-0fd731ee63bdde7030d0734beac27e393b870d7f.tar.gz yuzu-0fd731ee63bdde7030d0734beac27e393b870d7f.tar.bz2 yuzu-0fd731ee63bdde7030d0734beac27e393b870d7f.tar.lz yuzu-0fd731ee63bdde7030d0734beac27e393b870d7f.tar.xz yuzu-0fd731ee63bdde7030d0734beac27e393b870d7f.tar.zst yuzu-0fd731ee63bdde7030d0734beac27e393b870d7f.zip |
Diffstat (limited to 'src/core/arm')
-rw-r--r-- | src/core/arm/interpreter/armemu.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index ec40881f8..33ebc7986 100644 --- a/src/core/arm/interpreter/armemu.cpp +++ b/src/core/arm/interpreter/armemu.cpp @@ -6101,18 +6101,18 @@ L_stm_s_takeabort: return 1; } - case 0x6c: - if ((instr & 0xf03f0) == 0xf0070) { //uxtb16 - u8 src1 = BITS(0, 3); - u8 tar = BITS(12, 15); - u32 base = state->Reg[src1]; - u32 shamt = BITS(9,10)* 8; - u32 in = ((base << (32 - shamt)) | (base >> shamt)); - state->Reg[tar] = in & 0x00FF00FF; - return 1; - } else - printf ("Unhandled v6 insn: uxtab16\n"); - break; + case 0x6c: + if ((instr & 0xf03f0) == 0xf0070) { //uxtb16 + u8 rm_idx = BITS(0, 3); + u8 rd_idx = BITS(12, 15); + u32 rm_val = state->Reg[rm_idx]; + u32 rotation = BITS(10, 11) * 8; + u32 in = ((rm_val << (32 - rotation)) | (rm_val >> rotation)); + state->Reg[rd_idx] = in & 0x00FF00FF; + return 1; + } else + printf ("Unhandled v6 insn: uxtab16\n"); + break; case 0x6e: { ARMword Rm; int ror = -1; |