Bug 1301400: Baseline Wasm Compiler: Part 10: Implement BitopI64, r=lth

js/src/asmjs/WasmBaselineCompile.cpp

@@ -2490,27 +2490,15 @@ class BaseCompiler
     }
 
     void orI64(RegI64 rhs, RegI64 srcDest) {
-#if defined(JS_CODEGEN_X64)
-        masm.orq(rhs.reg.reg, srcDest.reg.reg);
-#else
-        MOZ_CRASH("BaseCompiler platform hook: orI64");
-#endif
+        masm.or64(rhs.reg, srcDest.reg);
     }
 
     void andI64(RegI64 rhs, RegI64 srcDest) {
-#if defined(JS_CODEGEN_X64)
-        masm.andq(rhs.reg.reg, srcDest.reg.reg);
-#else
-        MOZ_CRASH("BaseCompiler platform hook: andI64");
-#endif
+        masm.and64(rhs.reg, srcDest.reg);
     }
 
     void xorI64(RegI64 rhs, RegI64 srcDest) {
-#if defined(JS_CODEGEN_X64)
-        masm.xorq(rhs.reg.reg, srcDest.reg.reg);
-#else
-        MOZ_CRASH("BaseCompiler platform hook: xorI64");
-#endif
+        masm.xor64(rhs.reg, srcDest.reg);
     }
 
     void lshiftI64(RegI64 rhs, RegI64 srcDest) {

js/src/jit/MacroAssembler.h

@@ -728,7 +728,7 @@ class MacroAssembler : public MacroAssemblerSpecific
     inline void orPtr(Register src, Register dest) PER_ARCH;
     inline void orPtr(Imm32 imm, Register dest) PER_ARCH;
 
-    inline void and64(Register64 src, Register64 dest) DEFINED_ON(x86, arm);
+    inline void and64(Register64 src, Register64 dest) DEFINED_ON(x86, x64, arm);
     inline void or64(Register64 src, Register64 dest) PER_ARCH;
     inline void xor64(Register64 src, Register64 dest) PER_ARCH;
 

js/src/jit/x64/MacroAssembler-x64-inl.h

@@ -89,6 +89,12 @@ MacroAssembler::orPtr(Imm32 imm, Register dest)
     orq(imm, dest);
 }
 
+void
+MacroAssembler::and64(Register64 src, Register64 dest)
+{
+    andq(src.reg, dest.reg);
+}
+
 void
 MacroAssembler::or64(Register64 src, Register64 dest)
 {