Bug 1944011 - Part 32: Generate boilerplate for LWasmAtomicLoadI64. r=jandem

Differential Revision: https://phabricator.services.mozilla.com/D235805

Author: anba

js/src/jit/LIROps.yaml

@@ -4956,7 +4956,12 @@
   mir_op: true
 
 - name: WasmAtomicLoadI64
-  gen_boilerplate: false
+  result_type: Int64
+  operands:
+    memoryBase: WordSized
+    ptr: WordSized
+  num_temps64: 1
+  mir_op: WasmLoad
 
 - name: WasmAtomicStoreI64
   gen_boilerplate: false
@@ -5066,7 +5071,11 @@
   mir_op: WasmBuiltinTruncateToInt64
 
 - name: WasmAtomicLoadI64
-  gen_boilerplate: false
+  result_type: Int64
+  operands:
+    ptr: WordSized
+    memoryBase: WordSized
+  mir_op: WasmLoad
 
 - name: WasmAtomicStoreI64
   gen_boilerplate: false
@@ -5178,7 +5187,10 @@
   gen_boilerplate: false
 
 - name: WasmAtomicLoadI64
-  gen_boilerplate: false
+  result_type: Int64
+  operands:
+    ptr: WordSized
+  mir_op: WasmLoad
 
 - name: WasmAtomicStoreI64
   gen_boilerplate: false

js/src/jit/arm/LIR-arm.h

@@ -267,22 +267,6 @@ class LSoftUDivOrMod : public LBinaryCallInstructionHelper<1, 0> {
   MInstruction* mir() { return mir_->toInstruction(); }
 };
 
-class LWasmAtomicLoadI64 : public LInstructionHelper<INT64_PIECES, 2, 0> {
- public:
-  LIR_HEADER(WasmAtomicLoadI64);
-
-  explicit LWasmAtomicLoadI64(const LAllocation& ptr,
-                              const LAllocation& memoryBase)
-      : LInstructionHelper(classOpcode) {
-    setOperand(0, ptr);
-    setOperand(1, memoryBase);
-  }
-
-  MWasmLoad* mir() const { return mir_->toWasmLoad(); }
-  const LAllocation* ptr() { return getOperand(0); }
-  const LAllocation* memoryBase() { return getOperand(1); }
-};
-
 class LWasmAtomicStoreI64 : public LInstructionHelper<0, 2 + INT64_PIECES, 2> {
  public:
   LIR_HEADER(WasmAtomicStoreI64);

js/src/jit/mips32/LIR-mips32.h

@@ -139,18 +139,6 @@ class LUDivOrModI64
   }
 };
 
-class LWasmAtomicLoadI64 : public LInstructionHelper<INT64_PIECES, 1, 0> {
- public:
-  LIR_HEADER(WasmAtomicLoadI64);
-
-  LWasmAtomicLoadI64(const LAllocation& ptr) : LInstructionHelper(classOpcode) {
-    setOperand(0, ptr);
-  }
-
-  const LAllocation* ptr() { return getOperand(0); }
-  const MWasmLoad* mir() const { return mir_->toWasmLoad(); }
-};
-
 class LWasmAtomicStoreI64 : public LInstructionHelper<0, 1 + INT64_PIECES, 1> {
  public:
   LIR_HEADER(WasmAtomicStoreI64);

js/src/jit/x86/CodeGenerator-x86.cpp

@@ -438,10 +438,8 @@ void CodeGenerator::visitWasmAtomicLoadI64(LWasmAtomicLoadI64* ins) {
   const LAllocation* ptr = ins->ptr();
   BaseIndex srcAddr(ToRegister(memoryBase), ToRegister(ptr), TimesOne, offset);
 
-  MOZ_ASSERT(ToRegister(ins->t1()) == ecx);
-  MOZ_ASSERT(ToRegister(ins->t2()) == ebx);
-  MOZ_ASSERT(ToOutRegister64(ins).high == edx);
-  MOZ_ASSERT(ToOutRegister64(ins).low == eax);
+  MOZ_ASSERT(ToRegister64(ins->temp0()) == Register64(ecx, ebx));
+  MOZ_ASSERT(ToOutRegister64(ins) == Register64(edx, eax));
 
   masm.wasmAtomicLoad64(ins->mir()->access(), srcAddr, Register64(ecx, ebx),
                         Register64(edx, eax));

js/src/jit/x86/LIR-x86.h

@@ -149,26 +149,6 @@ class LUDivOrModI64
   }
 };
 
-class LWasmAtomicLoadI64 : public LInstructionHelper<INT64_PIECES, 2, 2> {
- public:
-  LIR_HEADER(WasmAtomicLoadI64);
-
-  LWasmAtomicLoadI64(const LAllocation& memoryBase, const LAllocation& ptr,
-                     const LDefinition& t1, const LDefinition& t2)
-      : LInstructionHelper(classOpcode) {
-    setOperand(0, memoryBase);
-    setOperand(1, ptr);
-    setTemp(0, t1);
-    setTemp(1, t2);
-  }
-
-  MWasmLoad* mir() const { return mir_->toWasmLoad(); }
-  const LAllocation* memoryBase() { return getOperand(0); }
-  const LAllocation* ptr() { return getOperand(1); }
-  const LDefinition* t1() { return getTemp(0); }
-  const LDefinition* t2() { return getTemp(1); }
-};
-
 class LWasmAtomicStoreI64 : public LInstructionHelper<0, 2 + INT64_PIECES, 2> {
  public:
   LIR_HEADER(WasmAtomicStoreI64);

js/src/jit/x86/Lowering-x86.cpp

@@ -381,7 +381,7 @@ void LIRGenerator::visitWasmLoad(MWasmLoad* ins) {
   if (ins->access().type() == Scalar::Int64 && ins->access().isAtomic()) {
     auto* lir = new (alloc())
         LWasmAtomicLoadI64(useRegister(memoryBase), useRegister(base),
-                           tempFixed(ecx), tempFixed(ebx));
+                           tempInt64Fixed(Register64(ecx, ebx)));
     defineInt64Fixed(lir, ins,
                      LInt64Allocation(LAllocation(AnyRegister(edx)),
                                       LAllocation(AnyRegister(eax))));