Merge pull request #1086 from FioraAeterna/fixsrawint

Interpreter: fix carry calculation in srawx
2014-09-18 06:41:37 -05:00 · 2014-09-18 06:41:37 -05:00 · 0294b344e2
parent 74eee70fad 9b8cfcdc29
commit 0294b344e2
1 changed files with 4 additions and 2 deletions
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp
@ -362,8 +362,10 @@ void Interpreter::srawx(UGeckoInstruction _inst)
 		}
 		else
 		{
-			m_GPR[_inst.RA] = (u32)((s32)m_GPR[_inst.RS] >> amount);
-			if (m_GPR[_inst.RS] & 0x80000000)
+			s32 rrs = m_GPR[_inst.RS];
+			m_GPR[_inst.RA] = rrs >> amount;
+
+			if ((rrs < 0) && (rrs << (32 - amount)))
 				SetCarry(1);
 			else
 				SetCarry(0);