diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-01-18 23:31:39 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-01-19 00:32:02 +0100 |
| commit | a873f157d0ff1d87c003640ec5aaa32da6642d2c (patch) | |
| tree | fe687419fbc4e05f73967892d6653f75f351b290 /src/core | |
| parent | Merge pull request #489 from lioncash/strt (diff) | |
| download | yuzu-a873f157d0ff1d87c003640ec5aaa32da6642d2c.tar yuzu-a873f157d0ff1d87c003640ec5aaa32da6642d2c.tar.gz yuzu-a873f157d0ff1d87c003640ec5aaa32da6642d2c.tar.bz2 yuzu-a873f157d0ff1d87c003640ec5aaa32da6642d2c.tar.lz yuzu-a873f157d0ff1d87c003640ec5aaa32da6642d2c.tar.xz yuzu-a873f157d0ff1d87c003640ec5aaa32da6642d2c.tar.zst yuzu-a873f157d0ff1d87c003640ec5aaa32da6642d2c.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp index d0347566c..ffe9d17f9 100644 --- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp +++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp @@ -410,10 +410,21 @@ void LnSWoUB(ScaledRegisterPreIndexed)(arm_processor *cpu, unsigned int inst, un } break; case 2: - DEBUG_MSG; + if (shift_imm == 0) { // ASR #32 + if (BIT(rm, 31) == 1) + index = 0xFFFFFFFF; + else + index = 0; + } else { + index = static_cast<int>(rm) >> shift_imm; + } break; case 3: - DEBUG_MSG; + if (shift_imm == 0) { + index = (cpu->CFlag << 31) | (rm >> 1); + } else { + index = ROTATE_RIGHT_32(rm, shift_imm); + } break; } @@ -449,10 +460,21 @@ void LnSWoUB(ScaledRegisterPostIndexed)(arm_processor *cpu, unsigned int inst, u } break; case 2: - DEBUG_MSG; + if (shift_imm == 0) { // ASR #32 + if (BIT(rm, 31) == 1) + index = 0xFFFFFFFF; + else + index = 0; + } else { + index = static_cast<int>(rm) >> shift_imm; + } break; case 3: - DEBUG_MSG; + if (shift_imm == 0) { + index = (cpu->CFlag << 31) | (rm >> 1); + } else { + index = ROTATE_RIGHT_32(rm, shift_imm); + } break; } @@ -654,8 +676,8 @@ void LnSWoUB(ScaledRegisterOffset)(arm_processor *cpu, unsigned int inst, unsign } break; case 2: - if (shift_imm == 0){ // ASR #32 - if (rm >> 31) + if (shift_imm == 0) { // ASR #32 + if (BIT(rm, 31) == 1) index = 0xFFFFFFFF; else index = 0; @@ -664,7 +686,11 @@ void LnSWoUB(ScaledRegisterOffset)(arm_processor *cpu, unsigned int inst, unsign } break; case 3: - DEBUG_MSG; + if (shift_imm == 0) { + index = (cpu->CFlag << 31) | (rm >> 1); + } else { + index = ROTATE_RIGHT_32(rm, shift_imm); + } break; } |