diff options
| author | bunnei <bunneidev@gmail.com> | 2015-01-03 02:39:36 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-01-03 02:39:36 +0100 |
| commit | 6ae381ac9e20b18ee5e90036326df4b8e5837c04 (patch) | |
| tree | 65ff10f61d7615edeb9cb29fe460db442928541a /src/core/arm/interpreter/armemu.cpp | |
| parent | Merge pull request #389 from lioncash/fmt (diff) | |
| parent | armemu: Fix missing Q flag check for SMLSD. (diff) | |
| download | yuzu-6ae381ac9e20b18ee5e90036326df4b8e5837c04.tar yuzu-6ae381ac9e20b18ee5e90036326df4b8e5837c04.tar.gz yuzu-6ae381ac9e20b18ee5e90036326df4b8e5837c04.tar.bz2 yuzu-6ae381ac9e20b18ee5e90036326df4b8e5837c04.tar.lz yuzu-6ae381ac9e20b18ee5e90036326df4b8e5837c04.tar.xz yuzu-6ae381ac9e20b18ee5e90036326df4b8e5837c04.tar.zst yuzu-6ae381ac9e20b18ee5e90036326df4b8e5837c04.zip | |
Diffstat (limited to 'src/core/arm/interpreter/armemu.cpp')
| -rw-r--r-- | src/core/arm/interpreter/armemu.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index 43b1ba40e..12166bf79 100644 --- a/src/core/arm/interpreter/armemu.cpp +++ b/src/core/arm/interpreter/armemu.cpp @@ -6470,17 +6470,23 @@ L_stm_s_takeabort: if (BITS(12, 15) != 15) { state->Reg[rd_idx] += state->Reg[ra_idx]; - ARMul_AddOverflowQ(state, product1 + product2, state->Reg[ra_idx]); + if (ARMul_AddOverflowQ(product1 + product2, state->Reg[ra_idx])) + SETQ; } - ARMul_AddOverflowQ(state, product1, product2); + if (ARMul_AddOverflowQ(product1, product2)) + SETQ; } // SMUSD and SMLSD else { state->Reg[rd_idx] = product1 - product2; - - if (BITS(12, 15) != 15) + + if (BITS(12, 15) != 15) { state->Reg[rd_idx] += state->Reg[ra_idx]; + + if (ARMul_AddOverflowQ(product1 - product2, state->Reg[ra_idx])) + SETQ; + } } return 1; |