From b53143bb331eea5f45eb75c486cf51706054b72d Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 22 Mar 2014 15:54:48 -0700 Subject: [PATCH] Revert "armjit: Skip an AND for rotate shifts." This reverts commit ab2dd54aded5f641fd09db8ca734eb95d0dff3e6. Even though the docs say it's safe but apparently not always. --- Core/MIPS/ARM/ArmCompALU.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Core/MIPS/ARM/ArmCompALU.cpp b/Core/MIPS/ARM/ArmCompALU.cpp index 18e0366ce7..50a709622c 100644 --- a/Core/MIPS/ARM/ArmCompALU.cpp +++ b/Core/MIPS/ARM/ArmCompALU.cpp @@ -488,9 +488,7 @@ namespace MIPSComp return; } gpr.MapDirtyInIn(rd, rs, rt); - // A rotate will be the same even if >= 32. - if (shiftType != ST_ROR) - AND(R0, gpr.R(rs), Operand2(0x1F)); + AND(R0, gpr.R(rs), Operand2(0x1F)); MOV(gpr.R(rd), Operand2(gpr.R(rt), shiftType, R0)); }