diff options
author | bunnei <bunneidev@gmail.com> | 2014-12-18 23:45:25 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-12-18 23:45:25 +0100 |
commit | 4959e3b2c064e3b26d2c90c130937b87465cb8cb (patch) | |
tree | f1a1c5ab8c08bcc498615610f75b4508cc93d92b /src/core/arm/interpreter/armemu.cpp | |
parent | Merge pull request #301 from Subv/more_savedata (diff) | |
parent | armemu: Fix lower-bounds clamping for USAT16 (diff) | |
download | yuzu-4959e3b2c064e3b26d2c90c130937b87465cb8cb.tar yuzu-4959e3b2c064e3b26d2c90c130937b87465cb8cb.tar.gz yuzu-4959e3b2c064e3b26d2c90c130937b87465cb8cb.tar.bz2 yuzu-4959e3b2c064e3b26d2c90c130937b87465cb8cb.tar.lz yuzu-4959e3b2c064e3b26d2c90c130937b87465cb8cb.tar.xz yuzu-4959e3b2c064e3b26d2c90c130937b87465cb8cb.tar.zst yuzu-4959e3b2c064e3b26d2c90c130937b87465cb8cb.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/interpreter/armemu.cpp | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index b9ac8b9ad..99fc6c45d 100644 --- a/src/core/arm/interpreter/armemu.cpp +++ b/src/core/arm/interpreter/armemu.cpp @@ -6192,18 +6192,27 @@ L_stm_s_takeabort: //ichfly //USAT16 { - u8 tar = BITS(12, 15); - u8 src = BITS(0, 3); - u8 val = BITS(16, 19); - s16 a1 = (state->Reg[src]); - s16 a2 = (state->Reg[src] >> 0x10); - s16 max = 0xFFFF >> (16 - val); - if (max < a1) a1 = max; - if (max < a2) a2 = max; - u32 temp2 = ((u32)(a2)) << 0x10; - state->Reg[tar] = (a1 & 0xFFFF) | (temp2); + const u8 rd_idx = BITS(12, 15); + const u8 rn_idx = BITS(0, 3); + const u8 num_bits = BITS(16, 19); + const s16 max = 0xFFFF >> (16 - num_bits); + s16 rn_lo = (state->Reg[rn_idx]); + s16 rn_hi = (state->Reg[rn_idx] >> 16); + + if (max < rn_lo) + rn_lo = max; + else if (rn_lo < 0) + rn_lo = 0; + + if (max < rn_hi) + rn_hi = max; + else if (rn_hi < 0) + rn_hi = 0; + + state->Reg[rd_idx] = (rn_lo & 0xFFFF) | ((rn_hi << 16) & 0xFFFF); + return 1; } - return 1; + default: break; } |