Merge pull request #1859 from FioraAeterna/fixinterpreterslw

Interpreter: fix slwx
dolphin-emu · Jan 10, 2015 · 9cada14 · 9cada14
2 parents cdf15bb + 55b509b
commit 9cada14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp
@@ -329,7 +329,7 @@ void Interpreter::orcx(UGeckoInstruction _inst)
 void Interpreter::slwx(UGeckoInstruction _inst)
 {
 	u32 amount = rGPR[_inst.RB];
-	rGPR[_inst.RA] = (amount & 0x20) ? 0 : rGPR[_inst.RS] << amount;
+	rGPR[_inst.RA] = (amount & 0x20) ? 0 : rGPR[_inst.RS] << (amount & 0x1f);
 
 	if (_inst.Rc)
 		Helper_UpdateCR0(rGPR[_inst.RA]);

diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_Integer.cpp
@@ -1680,7 +1680,7 @@ void Jit64::slwx(UGeckoInstruction inst)
 	if (gpr.R(b).IsImm() && gpr.R(s).IsImm())
 	{
 		u32 amount = (u32)gpr.R(b).offset;
-		gpr.SetImmediate32(a, (amount & 0x20) ? 0 : (u32)gpr.R(s).offset << amount);
+		gpr.SetImmediate32(a, (amount & 0x20) ? 0 : (u32)gpr.R(s).offset << (amount & 0x1f));
 		if (inst.Rc)
 			ComputeRC(gpr.R(a));
 	}