From 9f3f5d2c0e8f7b9cb0e6f465eb3510c271a5dd2a Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Sat, 25 May 2013 01:56:42 -0700
Subject: [PATCH] mullw.

---
 src/xenia/cpu/x64/x64_emit_alu.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/xenia/cpu/x64/x64_emit_alu.cc b/src/xenia/cpu/x64/x64_emit_alu.cc
index 3f65c8d34..7f3a5cfa1 100644
--- a/src/xenia/cpu/x64/x64_emit_alu.cc
+++ b/src/xenia/cpu/x64/x64_emit_alu.cc
@@ -309,7 +309,6 @@ XEEMITTER(mulli,        0x1C000000, D  )(X64Emitter& e, X86Compiler& c, InstrDat
   return 0;
 }
 
-#if 0
 XEEMITTER(mullwx,       0x7C0001D6, XO )(X64Emitter& e, X86Compiler& c, InstrData& i) {
   // RT <- (RA)[32:63] × (RB)[32:63]
 
@@ -319,19 +318,20 @@ XEEMITTER(mullwx,       0x7C0001D6, XO )(X64Emitter& e, X86Compiler& c, InstrDat
     return 1;
   }
 
-  jit_value_t v = jit_insn_mul(
-      f, e.sign_extend(e.gpr_value(i.XO.RA), jit_type_nint),
-      e.sign_extend(e.gpr_value(i.XO.RB), jit_type_nint));
-  e.update_gpr_value(i.XO.RT, v);
+  GpVar v_0(c.newGpVar());
+  GpVar v_1(c.newGpVar());
+  c.mov(v_0.r32(), e.gpr_value(i.XO.RA).r32());
+  c.mov(v_1.r32(), e.gpr_value(i.XO.RB).r32());
+  c.imul(v_0.r64(), v_1.r64());
+  e.update_gpr_value(i.XO.RT, v_0);
 
   if (i.XO.Rc) {
     // With cr0 update.
-    e.update_cr_with_cond(0, v);
+    e.update_cr_with_cond(0, v_0);
   }
 
   return 0;
 }
-#endif
 
 XEEMITTER(negx,         0x7C0000D0, XO )(X64Emitter& e, X86Compiler& c, InstrData& i) {
   // RT <- ¬(RA) + 1
@@ -1083,7 +1083,7 @@ void X64RegisterEmitCategoryALU() {
   XEREGISTERINSTR(mulhwux,      0x7C000016);
   XEREGISTERINSTR(mulldx,       0x7C0001D2);
   XEREGISTERINSTR(mulli,        0x1C000000);
-  // XEREGISTERINSTR(mullwx,       0x7C0001D6);
+  XEREGISTERINSTR(mullwx,       0x7C0001D6);
   XEREGISTERINSTR(negx,         0x7C0000D0);
   XEREGISTERINSTR(subfx,        0x7C000050);
   XEREGISTERINSTR(subfcx,       0x7C000010);