CPU/NewRec/ARM32: Shifts need to be explicitly masked

12 months ago · d2d06adeeb
parent 5c03e1d940
commit d2d06adeeb
1 changed files with 3 additions and 2 deletions
--- a/src/core/cpu_newrec_compiler_aarch32.cpp
+++ b/src/core/cpu_newrec_compiler_aarch32.cpp
@ -997,13 +997,14 @@ void CPU::NewRec::AArch32Compiler::Compile_variable_shift(CompileFlags cf,
  if (cf.const_s)
  {
    if (const u32 shift = GetConstantRegU32(cf.MipsS()); shift != 0)
-      (armAsm->*op)(rd, rt, shift);
+      (armAsm->*op)(rd, rt, shift & 0x1Fu);
    else if (rd.GetCode() != rt.GetCode())
      armAsm->mov(rd, rt);
  }
  else
  {
-    (armAsm->*op)(rd, rt, CFGetRegS(cf));
+    armAsm->and_(RSCRATCH, CFGetRegS(cf), 0x1Fu);
+    (armAsm->*op)(rd, rt, RSCRATCH);
  }
 }