Bug 1944011 - Part 43: Generate boilerplate for LBoxFloatingPoint. r=…

…iain Differential Revision: https://phabricator.services.mozilla.com/D235856
mozilla · Jan 31, 2025 · eb91f70 · eb91f70
1 parent e938cad
commit eb91f70
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 59 deletions.
diff --git a/js/src/jit/LIROps.yaml b/js/src/jit/LIROps.yaml
@@ -4927,7 +4927,13 @@
 
 #ifdef JS_CODEGEN_X86
 - name: BoxFloatingPoint
-  gen_boilerplate: false
+  result_type: BoxedValue
+  operands:
+    input: WordSized
+  arguments:
+    type: MIRType
+  num_temps: 2
+  extra_name: true
 
 - name: DivOrModI64
   gen_boilerplate: false
@@ -5036,7 +5042,13 @@
 
 #ifdef JS_CODEGEN_ARM
 - name: BoxFloatingPoint
-  gen_boilerplate: false
+  result_type: BoxedValue
+  operands:
+    input: WordSized
+  arguments:
+    type: MIRType
+  num_temps: 1
+  extra_name: true
 
 - name: DivOrModI64
   gen_boilerplate: false
@@ -5206,7 +5218,13 @@
 
 #ifdef JS_CODEGEN_MIPS32
 - name: BoxFloatingPoint
-  gen_boilerplate: false
+  result_type: BoxedValue
+  operands:
+    input: WordSized
+  arguments:
+    type: MIRType
+  num_temps: 1
+  extra_name: true
 
 - name: DivOrModI64
   gen_boilerplate: false

diff --git a/js/src/jit/arm/LIR-arm.h b/js/src/jit/arm/LIR-arm.h
@@ -10,23 +10,6 @@
 namespace js {
 namespace jit {
 
-class LBoxFloatingPoint : public LInstructionHelper<2, 1, 1> {
-  MIRType type_;
-
- public:
-  LIR_HEADER(BoxFloatingPoint);
-
-  LBoxFloatingPoint(const LAllocation& in, const LDefinition& temp,
-                    MIRType type)
-      : LInstructionHelper(classOpcode), type_(type) {
-    setOperand(0, in);
-    setTemp(0, temp);
-  }
-
-  MIRType type() const { return type_; }
-  const char* extraName() const { return StringFromMIRType(type_); }
-};
-
 class LUnbox : public LInstructionHelper<1, 2, 0> {
  public:
   LIR_HEADER(Unbox);
@@ -202,6 +185,14 @@ class LSoftUDivOrMod : public LBinaryCallInstructionHelper<1, 0> {
   MInstruction* mir() { return mir_->toInstruction(); }
 };
 
+// Definitions for `extraName` methods of generated LIR instructions.
+
+#ifdef JS_JITSPEW
+const char* LBoxFloatingPoint::extraName() const {
+  return StringFromMIRType(type_);
+}
+#endif
+
 }  // namespace jit
 }  // namespace js
 

diff --git a/js/src/jit/mips32/LIR-mips32.h b/js/src/jit/mips32/LIR-mips32.h
@@ -10,23 +10,6 @@
 namespace js {
 namespace jit {
 
-class LBoxFloatingPoint : public LInstructionHelper<2, 1, 1> {
-  MIRType type_;
-
- public:
-  LIR_HEADER(BoxFloatingPoint);
-
-  LBoxFloatingPoint(const LAllocation& in, const LDefinition& temp,
-                    MIRType type)
-      : LInstructionHelper(classOpcode), type_(type) {
-    setOperand(0, in);
-    setTemp(0, temp);
-  }
-
-  MIRType type() const { return type_; }
-  const char* extraName() const { return StringFromMIRType(type_); }
-};
-
 class LUnbox : public LInstructionHelper<1, 2, 0> {
  public:
   LIR_HEADER(Unbox);
@@ -125,6 +108,14 @@ class LUDivOrModI64
   }
 };
 
+// Definitions for `extraName` methods of generated LIR instructions.
+
+#ifdef JS_JITSPEW
+const char* LBoxFloatingPoint::extraName() const {
+  return StringFromMIRType(type_);
+}
+#endif
+
 }  // namespace jit
 }  // namespace js
 

diff --git a/js/src/jit/x86/CodeGenerator-x86.cpp b/js/src/jit/x86/CodeGenerator-x86.cpp
@@ -57,7 +57,7 @@ void CodeGenerator::visitBoxFloatingPoint(LBoxFloatingPoint* box) {
   masm.moveValue(TypedOrValueRegister(box->type(), in), out);
 
   if (JitOptions.spectreValueMasking) {
-    Register scratch = ToRegister(box->spectreTemp());
+    Register scratch = ToRegister(box->temp1());
     masm.move32(Imm32(JSVAL_TAG_CLEAR), scratch);
     masm.cmp32Move32(Assembler::Below, scratch, out.typeReg(), scratch,
                      out.typeReg());

diff --git a/js/src/jit/x86/LIR-x86.h b/js/src/jit/x86/LIR-x86.h
@@ -10,27 +10,6 @@
 namespace js {
 namespace jit {
 
-class LBoxFloatingPoint : public LInstructionHelper<2, 1, 2> {
-  MIRType type_;
-
- public:
-  LIR_HEADER(BoxFloatingPoint);
-
-  LBoxFloatingPoint(const LAllocation& in, const LDefinition& temp,
-                    const LDefinition& spectreTemp, MIRType type)
-      : LInstructionHelper(classOpcode), type_(type) {
-    MOZ_ASSERT(IsFloatingPointType(type));
-    setOperand(0, in);
-    setTemp(0, temp);
-    setTemp(1, spectreTemp);
-  }
-
-  const LDefinition* spectreTemp() { return getTemp(1); }
-
-  MIRType type() const { return type_; }
-  const char* extraName() const { return StringFromMIRType(type_); }
-};
-
 class LUnbox : public LInstructionHelper<1, 2, 0> {
  public:
   LIR_HEADER(Unbox);
@@ -135,6 +114,14 @@ class LUDivOrModI64
   }
 };
 
+// Definitions for `extraName` methods of generated LIR instructions.
+
+#ifdef JS_JITSPEW
+const char* LBoxFloatingPoint::extraName() const {
+  return StringFromMIRType(type_);
+}
+#endif
+
 }  // namespace jit
 }  // namespace js