From 53ebbcfbd9faab2659840bd8e22536cc7a2a6720 Mon Sep 17 00:00:00 2001
From: riperiperi <rhy3756547@hotmail.com>
Date: Wed, 20 Jun 2018 14:45:20 +0100
Subject: [PATCH] Rework signed multiplication. Fixed an edge case and passes
 all tests. (#174)

---
 ChocolArm64/Instruction/ASoftFallback.cs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/ChocolArm64/Instruction/ASoftFallback.cs b/ChocolArm64/Instruction/ASoftFallback.cs
index 3f8ab5e3e..6a407baf0 100644
--- a/ChocolArm64/Instruction/ASoftFallback.cs
+++ b/ChocolArm64/Instruction/ASoftFallback.cs
@@ -153,13 +153,9 @@ namespace ChocolArm64.Instruction
 
         public static long SMulHi128(long LHS, long RHS)
         {
-            bool LSign = (LHS < 0);
-            bool RSign = (RHS < 0);
-
-            long Result = (long)UMulHi128((ulong)(LSign ? -LHS : LHS), (ulong)(RSign ? -RHS : RHS));
-
-            if (LSign != RSign && LHS != 0 && RHS != 0)
-                return ~Result; //for negative results, hi 64-bits start at 0xFFF... and count back
+            long Result = (long)UMulHi128((ulong)(LHS), (ulong)(RHS));
+            if (LHS < 0) Result -= RHS;
+            if (RHS < 0) Result -= LHS;
             return Result;
         }