Merge #550

550: Fix singlepass compilation error with `imul` instruction. r=losfair a=losfair Co-authored-by: losfair <zhy20000919@hotmail.com>
wasmerio · Jul 12, 2019 · bd2a082 · bd2a082
2 parents 08111b7 + f327fec
commit bd2a082
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/lib/singlepass-backend/src/codegen_x64.rs b/lib/singlepass-backend/src/codegen_x64.rs
@@ -641,6 +641,13 @@ impl X64FunctionCode {
             BothToGPR,
         }
         let mode = match (src, dst) {
+            (Location::GPR(_), Location::GPR(_))
+                if (op as *const u8 == Assembler::emit_imul as *const u8) =>
+            {
+                RelaxMode::Direct
+            }
+            _ if (op as *const u8 == Assembler::emit_imul as *const u8) => RelaxMode::BothToGPR,
+
             (Location::Memory(_, _), Location::Memory(_, _)) => RelaxMode::SrcToGPR,
             (Location::Imm64(_), Location::Imm64(_)) | (Location::Imm64(_), Location::Imm32(_)) => {
                 RelaxMode::BothToGPR
@@ -653,7 +660,6 @@ impl X64FunctionCode {
                 RelaxMode::SrcToGPR
             }
             (_, Location::XMM(_)) => RelaxMode::SrcToGPR,
-            _ if (op as *const u8 == Assembler::emit_imul as *const u8) => RelaxMode::BothToGPR, // TODO: optimize this
             _ => RelaxMode::Direct,
         };