From ea98a44e1e92b0f7622b28d36a1ba6c8d4679a1f Mon Sep 17 00:00:00 2001 From: RSDuck Date: Tue, 25 Jun 2019 18:28:01 +0200 Subject: [PATCH] jit: correct cycle counting for thumb shift by reg --- src/ARMJIT_x64/ARMJIT_ALU.cpp | 7 +++++-- src/ARMJIT_x64/ARMJIT_LoadStore.cpp | 0 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 src/ARMJIT_x64/ARMJIT_LoadStore.cpp diff --git a/src/ARMJIT_x64/ARMJIT_ALU.cpp b/src/ARMJIT_x64/ARMJIT_ALU.cpp index d06c99c4..dc82af7b 100644 --- a/src/ARMJIT_x64/ARMJIT_ALU.cpp +++ b/src/ARMJIT_x64/ARMJIT_ALU.cpp @@ -456,7 +456,10 @@ void Compiler::T_Comp_ALU() u32 op = (CurrentInstr.Instr >> 6) & 0xF; - Comp_AddCycles_C(); + if ((op >= 0x2 && op < 0x4) || op == 0x7) + Comp_AddCycles_CI(1); + else + Comp_AddCycles_C(); switch (op) { @@ -471,7 +474,7 @@ void Compiler::T_Comp_ALU() case 0x4: case 0x7: { - int shiftOp = op == 7 ? 3 : op - 0x2; + int shiftOp = op == 0x7 ? 3 : op - 0x2; bool carryUsed; OpArg shifted = Comp_RegShiftReg(shiftOp, rs, rd, true, carryUsed); TEST(32, shifted, shifted); diff --git a/src/ARMJIT_x64/ARMJIT_LoadStore.cpp b/src/ARMJIT_x64/ARMJIT_LoadStore.cpp new file mode 100644 index 00000000..e69de29b