diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-12-19 15:38:10 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-12-19 15:53:54 +0100 |
| commit | 0f3a6a161c05c4e4f96450bb0443cfa90813d7ca (patch) | |
| tree | 3006c4528fe95018d5a1c45a796f2ce4b4d5c410 /src | |
| parent | Merge pull request #302 from purpasmart96/flushshutup (diff) | |
| download | yuzu-0f3a6a161c05c4e4f96450bb0443cfa90813d7ca.tar yuzu-0f3a6a161c05c4e4f96450bb0443cfa90813d7ca.tar.gz yuzu-0f3a6a161c05c4e4f96450bb0443cfa90813d7ca.tar.bz2 yuzu-0f3a6a161c05c4e4f96450bb0443cfa90813d7ca.tar.lz yuzu-0f3a6a161c05c4e4f96450bb0443cfa90813d7ca.tar.xz yuzu-0f3a6a161c05c4e4f96450bb0443cfa90813d7ca.tar.zst yuzu-0f3a6a161c05c4e4f96450bb0443cfa90813d7ca.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/arm/interpreter/armemu.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index 07d205755..4e11e068f 100644 --- a/src/core/arm/interpreter/armemu.cpp +++ b/src/core/arm/interpreter/armemu.cpp @@ -6317,11 +6317,14 @@ L_stm_s_takeabort: } case 0x70: // ichfly - // SMUAD, SMUSD, SMLAD - if ((instr & 0xf0d0) == 0xf010 || (instr & 0xf0d0) == 0xf050 || (instr & 0xd0) == 0x10) { + // SMUAD, SMUSD, SMLAD, and SMLSD + if ((instr & 0xf0d0) == 0xf010 || (instr & 0xf0d0) == 0xf050 || + (instr & 0xd0) == 0x10 || (instr & 0xd0) == 0x50) + { const u8 rd_idx = BITS(16, 19); const u8 rn_idx = BITS(0, 3); const u8 rm_idx = BITS(8, 11); + const u8 ra_idx = BITS(12, 15); const bool do_swap = (BIT(5) == 1); u32 rm_val = state->Reg[rm_idx]; @@ -6344,13 +6347,14 @@ L_stm_s_takeabort: state->Reg[rd_idx] = (rn_lo * rm_lo) - (rn_hi * rm_hi); } // SMLAD - else { - const u8 ra_idx = BITS(12, 15); + else if ((instr & 0xd0) == 0x10) { state->Reg[rd_idx] = (rn_lo * rm_lo) + (rn_hi * rm_hi) + (s32)state->Reg[ra_idx]; } + // SMLSD + else { + state->Reg[rd_idx] = ((rn_lo * rm_lo) - (rn_hi * rm_hi)) + (s32)state->Reg[ra_idx]; + } return 1; - } else { - printf ("Unhandled v6 insn: smlsd\n"); } break; case 0x74: |