Merge pull request #10031 from Pokechu22/dsp-int-less

DSPInterpreter: Fix IsLess
dolphin-emu · Aug 16, 2021 · 35c64d1 · 35c64d1
2 parents 4c179fe + 14119c8
commit 35c64d1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/Source/Core/Core/DSP/Interpreter/DSPInterpreter.cpp b/Source/Core/Core/DSP/Interpreter/DSPInterpreter.cpp
@@ -250,10 +250,7 @@ bool Interpreter::CheckCondition(u8 condition) const
   const auto IsCarry = [this] { return IsSRFlagSet(SR_CARRY); };
   const auto IsOverflow = [this] { return IsSRFlagSet(SR_OVERFLOW); };
   const auto IsOverS32 = [this] { return IsSRFlagSet(SR_OVER_S32); };
-  const auto IsLess = [this] {
-    const auto& state = m_dsp_core.DSPState();
-    return (state.r.sr & SR_OVERFLOW) != (state.r.sr & SR_SIGN);
-  };
+  const auto IsLess = [this] { return IsSRFlagSet(SR_OVERFLOW) != IsSRFlagSet(SR_SIGN); };
   const auto IsZero = [this] { return IsSRFlagSet(SR_ARITH_ZERO); };
   const auto IsLogicZero = [this] { return IsSRFlagSet(SR_LOGIC_ZERO); };
   const auto IsConditionA = [this] {

diff --git a/Source/DSPSpy/tests/less_test.ds b/Source/DSPSpy/tests/less_test.ds
@@ -0,0 +1,16 @@
+incdir "tests"
+include "dsp_base.inc"
+
+	CLR $acc0
+	CLR $acc1
+	LRI $ac0.h, #0x0050
+	LRI $ac1.h, #0x0050
+	ADD $acc0, $acc1      ; Causes acc0 to overflow, and thus also become negative
+
+	LRI $AX0.L, #0x0000
+	IFL
+	LRI $AX0.L, #0x0001
+	CALL send_back
+
+; We're done, DO NOT DELETE THIS LINE
+	JMP end_of_test