--- a/js/src/asmjs/WasmIonCompile.cpp
+++ b/js/src/asmjs/WasmIonCompile.cpp
@@ -3496,17 +3496,17 @@ EmitExpr(FunctionCompiler& f)
return EmitBinaryMathBuiltinCall(f, SymbolicAddress::PowD, ValType::F64);
case Expr::F64Atan2:
return EmitBinaryMathBuiltinCall(f, SymbolicAddress::ATan2D, ValType::F64);
case Expr::F64PromoteF32:
return EmitConversion<MToDouble>(f, ValType::F32, ValType::F64);
case Expr::F64ConvertSI32:
return EmitConversion<MToDouble>(f, ValType::I32, ValType::F64);
case Expr::F64ConvertUI32:
- return EmitConversion<MAsmJSUnsignedToDouble>(f, ValType::I32, ValType::F64);
+ return EmitConversion<MWasmUnsignedToDouble>(f, ValType::I32, ValType::F64);
case Expr::F64ConvertSI64:
case Expr::F64ConvertUI64:
return EmitConvertI64ToFloatingPoint(f, ValType::F64, MIRType::Double,
expr == Expr::F64ConvertUI64);
case Expr::F64Load:
return EmitLoad(f, ValType::F64, Scalar::Float64);
case Expr::F64Store:
return EmitStore(f, ValType::F64, Scalar::Float64);
--- a/js/src/jit/MIR.cpp
+++ b/js/src/jit/MIR.cpp
@@ -5592,17 +5592,17 @@ bool
MGetPropertyCache::updateForReplacement(MDefinition* ins)
{
MGetPropertyCache* other = ins->toGetPropertyCache();
location_.append(&other->location_);
return true;
}
MDefinition*
-MAsmJSUnsignedToDouble::foldsTo(TempAllocator& alloc)
+MWasmUnsignedToDouble::foldsTo(TempAllocator& alloc)
{
if (input()->isConstant() && input()->type() == MIRType::Int32)
return MConstant::New(alloc, DoubleValue(uint32_t(input()->toConstant()->toInt32())));
return this;
}
MDefinition*
--- a/js/src/jit/MIR.h
+++ b/js/src/jit/MIR.h
@@ -5300,31 +5300,31 @@ class MToFloat32
bool canRecoverOnBailout() const override {
return true;
}
ALLOW_CLONE(MToFloat32)
};
// Converts a uint32 to a double (coming from asm.js).
-class MAsmJSUnsignedToDouble
+class MWasmUnsignedToDouble
: public MUnaryInstruction,
public NoTypePolicy::Data
{
- explicit MAsmJSUnsignedToDouble(MDefinition* def)
+ explicit MWasmUnsignedToDouble(MDefinition* def)
: MUnaryInstruction(def)
{
setResultType(MIRType::Double);
setMovable();
}
public:
- INSTRUCTION_HEADER(AsmJSUnsignedToDouble)
- static MAsmJSUnsignedToDouble* NewAsmJS(TempAllocator& alloc, MDefinition* def) {
- return new(alloc) MAsmJSUnsignedToDouble(def);
+ INSTRUCTION_HEADER(WasmUnsignedToDouble)
+ static MWasmUnsignedToDouble* NewAsmJS(TempAllocator& alloc, MDefinition* def) {
+ return new(alloc) MWasmUnsignedToDouble(def);
}
MDefinition* foldsTo(TempAllocator& alloc) override;
bool congruentTo(const MDefinition* ins) const override {
return congruentIfOperandsEqual(ins);
}
AliasSet getAliasSet() const override {
return AliasSet::None();
--- a/js/src/jit/MOpcodes.h
+++ b/js/src/jit/MOpcodes.h
@@ -274,17 +274,17 @@ namespace jit {
_(CopySign) \
_(WasmBoundsCheck) \
_(WasmAddOffset) \
_(WasmLoad) \
_(WasmStore) \
_(WasmTrap) \
_(WasmTruncateToInt32) \
_(AsmJSNeg) \
- _(AsmJSUnsignedToDouble) \
+ _(WasmUnsignedToDouble) \
_(AsmJSUnsignedToFloat32) \
_(AsmJSLoadHeap) \
_(AsmJSStoreHeap) \
_(WasmLoadGlobalVar) \
_(WasmStoreGlobalVar) \
_(AsmJSReturn) \
_(AsmJSParameter) \
_(AsmJSVoidReturn) \
--- a/js/src/jit/arm/CodeGenerator-arm.cpp
+++ b/js/src/jit/arm/CodeGenerator-arm.cpp
@@ -1628,17 +1628,17 @@ CodeGeneratorARM::visitBitAndAndBranch(L
if (baab->right()->isConstant())
masm.ma_tst(ToRegister(baab->left()), Imm32(ToInt32(baab->right())), scratch);
else
masm.ma_tst(ToRegister(baab->left()), ToRegister(baab->right()));
emitBranch(Assembler::NonZero, baab->ifTrue(), baab->ifFalse());
}
void
-CodeGeneratorARM::visitAsmJSUInt32ToDouble(LAsmJSUInt32ToDouble* lir)
+CodeGeneratorARM::visitWasmUint32ToDouble(LWasmUint32ToDouble* lir)
{
masm.convertUInt32ToDouble(ToRegister(lir->input()), ToFloatRegister(lir->output()));
}
void
CodeGeneratorARM::visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir)
{
masm.convertUInt32ToFloat32(ToRegister(lir->input()), ToFloatRegister(lir->output()));
--- a/js/src/jit/arm/CodeGenerator-arm.h
+++ b/js/src/jit/arm/CodeGenerator-arm.h
@@ -145,17 +145,17 @@ class CodeGeneratorARM : public CodeGene
virtual void visitCompareF(LCompareF* comp);
virtual void visitCompareDAndBranch(LCompareDAndBranch* comp);
virtual void visitCompareFAndBranch(LCompareFAndBranch* comp);
virtual void visitCompareB(LCompareB* lir);
virtual void visitCompareBAndBranch(LCompareBAndBranch* lir);
virtual void visitCompareBitwise(LCompareBitwise* lir);
virtual void visitCompareBitwiseAndBranch(LCompareBitwiseAndBranch* lir);
virtual void visitBitAndAndBranch(LBitAndAndBranch* baab);
- virtual void visitAsmJSUInt32ToDouble(LAsmJSUInt32ToDouble* lir);
+ virtual void visitWasmUint32ToDouble(LWasmUint32ToDouble* lir);
virtual void visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir);
virtual void visitNotI(LNotI* ins);
virtual void visitNotD(LNotD* ins);
virtual void visitNotF(LNotF* ins);
virtual void visitMathD(LMathD* math);
virtual void visitMathF(LMathF* math);
virtual void visitFloor(LFloor* lir);
--- a/js/src/jit/arm/LIR-arm.h
+++ b/js/src/jit/arm/LIR-arm.h
@@ -74,22 +74,22 @@ class LUnboxFloatingPoint : public LInst
return type_;
}
const char* extraName() const {
return StringFromMIRType(type_);
}
};
// Convert a 32-bit unsigned integer to a double.
-class LAsmJSUInt32ToDouble : public LInstructionHelper<1, 1, 0>
+class LWasmUint32ToDouble : public LInstructionHelper<1, 1, 0>
{
public:
- LIR_HEADER(AsmJSUInt32ToDouble)
+ LIR_HEADER(WasmUint32ToDouble)
- LAsmJSUInt32ToDouble(const LAllocation& input) {
+ LWasmUint32ToDouble(const LAllocation& input) {
setOperand(0, input);
}
};
// Convert a 32-bit unsigned integer to a float32.
class LAsmJSUInt32ToFloat32 : public LInstructionHelper<1, 1, 0>
{
public:
--- a/js/src/jit/arm/Lowering-arm.cpp
+++ b/js/src/jit/arm/Lowering-arm.cpp
@@ -585,20 +585,20 @@ LIRGeneratorARM::lowerUMod(MMod* mod)
tempFixed(r0), tempFixed(r2), tempFixed(r3));
if (mod->fallible())
assignSnapshot(lir, Bailout_DoubleOutput);
defineFixed(lir, mod, LAllocation(AnyRegister(r1)));
}
}
void
-LIRGeneratorARM::visitAsmJSUnsignedToDouble(MAsmJSUnsignedToDouble* ins)
+LIRGeneratorARM::visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins)
{
MOZ_ASSERT(ins->input()->type() == MIRType::Int32);
- LAsmJSUInt32ToDouble* lir = new(alloc()) LAsmJSUInt32ToDouble(useRegisterAtStart(ins->input()));
+ LWasmUint32ToDouble* lir = new(alloc()) LWasmUint32ToDouble(useRegisterAtStart(ins->input()));
define(lir, ins);
}
void
LIRGeneratorARM::visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins)
{
MOZ_ASSERT(ins->input()->type() == MIRType::Int32);
LAsmJSUInt32ToFloat32* lir = new(alloc()) LAsmJSUInt32ToFloat32(useRegisterAtStart(ins->input()));
--- a/js/src/jit/arm/Lowering-arm.h
+++ b/js/src/jit/arm/Lowering-arm.h
@@ -98,17 +98,17 @@ class LIRGeneratorARM : public LIRGenera
public:
void visitBox(MBox* box);
void visitUnbox(MUnbox* unbox);
void visitReturn(MReturn* ret);
void lowerPhi(MPhi* phi);
void visitGuardShape(MGuardShape* ins);
void visitGuardObjectGroup(MGuardObjectGroup* ins);
void visitWasmSelect(MWasmSelect* ins);
- void visitAsmJSUnsignedToDouble(MAsmJSUnsignedToDouble* ins);
+ void visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins);
void visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins);
void visitWasmLoad(MWasmLoad* ins);
void visitWasmStore(MWasmStore* ins);
void visitAsmJSLoadHeap(MAsmJSLoadHeap* ins);
void visitAsmJSStoreHeap(MAsmJSStoreHeap* ins);
void visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap* ins);
void visitAsmJSAtomicExchangeHeap(MAsmJSAtomicExchangeHeap* ins);
void visitAsmJSAtomicBinopHeap(MAsmJSAtomicBinopHeap* ins);
--- a/js/src/jit/arm64/CodeGenerator-arm64.cpp
+++ b/js/src/jit/arm64/CodeGenerator-arm64.cpp
@@ -513,19 +513,19 @@ CodeGeneratorARM64::visitCompareBitwiseA
void
CodeGeneratorARM64::visitBitAndAndBranch(LBitAndAndBranch* baab)
{
MOZ_CRASH("visitBitAndAndBranch");
}
void
-CodeGeneratorARM64::visitAsmJSUInt32ToDouble(LAsmJSUInt32ToDouble* lir)
+CodeGeneratorARM64::visitWasmUint32ToDouble(LWasmUint32ToDouble* lir)
{
- MOZ_CRASH("visitAsmJSUInt32ToDouble");
+ MOZ_CRASH("visitWasmUint32ToDouble");
}
void
CodeGeneratorARM64::visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir)
{
MOZ_CRASH("visitAsmJSUInt32ToFloat32");
}
--- a/js/src/jit/arm64/CodeGenerator-arm64.h
+++ b/js/src/jit/arm64/CodeGenerator-arm64.h
@@ -128,17 +128,17 @@ class CodeGeneratorARM64 : public CodeGe
virtual void visitCompareF(LCompareF* comp);
virtual void visitCompareDAndBranch(LCompareDAndBranch* comp);
virtual void visitCompareFAndBranch(LCompareFAndBranch* comp);
virtual void visitCompareB(LCompareB* lir);
virtual void visitCompareBAndBranch(LCompareBAndBranch* lir);
virtual void visitCompareBitwise(LCompareBitwise* lir);
virtual void visitCompareBitwiseAndBranch(LCompareBitwiseAndBranch* lir);
virtual void visitBitAndAndBranch(LBitAndAndBranch* baab);
- virtual void visitAsmJSUInt32ToDouble(LAsmJSUInt32ToDouble* lir);
+ virtual void visitWasmUint32ToDouble(LWasmUint32ToDouble* lir);
virtual void visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir);
virtual void visitNotI(LNotI* ins);
virtual void visitNotD(LNotD* ins);
virtual void visitNotF(LNotF* ins);
virtual void visitMathD(LMathD* math);
virtual void visitMathF(LMathF* math);
virtual void visitFloor(LFloor* lir);
--- a/js/src/jit/arm64/LIR-arm64.h
+++ b/js/src/jit/arm64/LIR-arm64.h
@@ -54,22 +54,22 @@ class LUnboxFloatingPoint : public LUnbo
return type_;
}
const char* extraName() const {
return StringFromMIRType(type_);
}
};
// Convert a 32-bit unsigned integer to a double.
-class LAsmJSUInt32ToDouble : public LInstructionHelper<1, 1, 0>
+class LWasmUint32ToDouble : public LInstructionHelper<1, 1, 0>
{
public:
- LIR_HEADER(AsmJSUInt32ToDouble)
+ LIR_HEADER(WasmUint32ToDouble)
- LAsmJSUInt32ToDouble(const LAllocation& input) {
+ LWasmUint32ToDouble(const LAllocation& input) {
setOperand(0, input);
}
};
// Convert a 32-bit unsigned integer to a float32.
class LAsmJSUInt32ToFloat32 : public LInstructionHelper<1, 1, 0>
{
public:
--- a/js/src/jit/arm64/Lowering-arm64.cpp
+++ b/js/src/jit/arm64/Lowering-arm64.cpp
@@ -235,19 +235,19 @@ LIRGeneratorARM64::lowerUDiv(MDiv* div)
void
LIRGeneratorARM64::lowerUMod(MMod* mod)
{
MOZ_CRASH("lowerUMod");
}
void
-LIRGeneratorARM64::visitAsmJSUnsignedToDouble(MAsmJSUnsignedToDouble* ins)
+LIRGeneratorARM64::visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins)
{
- MOZ_CRASH("visitAsmJSUnsignedToDouble");
+ MOZ_CRASH("visitWasmUnsignedToDouble");
}
void
LIRGeneratorARM64::visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins)
{
MOZ_CRASH("visitAsmJSUnsignedToFloat32");
}
--- a/js/src/jit/arm64/Lowering-arm64.h
+++ b/js/src/jit/arm64/Lowering-arm64.h
@@ -98,17 +98,17 @@ class LIRGeneratorARM64 : public LIRGene
public:
void visitBox(MBox* box);
void visitUnbox(MUnbox* unbox);
void visitReturn(MReturn* ret);
void lowerPhi(MPhi* phi);
void visitGuardShape(MGuardShape* ins);
void visitGuardObjectGroup(MGuardObjectGroup* ins);
- void visitAsmJSUnsignedToDouble(MAsmJSUnsignedToDouble* ins);
+ void visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins);
void visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins);
void visitAsmJSLoadHeap(MAsmJSLoadHeap* ins);
void visitAsmJSStoreHeap(MAsmJSStoreHeap* ins);
void visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap* ins);
void visitAsmJSAtomicExchangeHeap(MAsmJSAtomicExchangeHeap* ins);
void visitAsmJSAtomicBinopHeap(MAsmJSAtomicBinopHeap* ins);
void visitStoreTypedArrayElementStatic(MStoreTypedArrayElementStatic* ins);
void visitCompareExchangeTypedArrayElement(MCompareExchangeTypedArrayElement* ins);
--- a/js/src/jit/mips-shared/CodeGenerator-mips-shared.cpp
+++ b/js/src/jit/mips-shared/CodeGenerator-mips-shared.cpp
@@ -1736,17 +1736,17 @@ CodeGeneratorMIPSShared::visitBitAndAndB
masm.ma_and(ScratchRegister, ToRegister(lir->left()), Imm32(ToInt32(lir->right())));
else
masm.as_and(ScratchRegister, ToRegister(lir->left()), ToRegister(lir->right()));
emitBranch(ScratchRegister, ScratchRegister, Assembler::NonZero, lir->ifTrue(),
lir->ifFalse());
}
void
-CodeGeneratorMIPSShared::visitAsmJSUInt32ToDouble(LAsmJSUInt32ToDouble* lir)
+CodeGeneratorMIPSShared::visitWasmUint32ToDouble(LWasmUint32ToDouble* lir)
{
masm.convertUInt32ToDouble(ToRegister(lir->input()), ToFloatRegister(lir->output()));
}
void
CodeGeneratorMIPSShared::visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir)
{
masm.convertUInt32ToFloat32(ToRegister(lir->input()), ToFloatRegister(lir->output()));
--- a/js/src/jit/mips-shared/CodeGenerator-mips-shared.h
+++ b/js/src/jit/mips-shared/CodeGenerator-mips-shared.h
@@ -164,17 +164,17 @@ class CodeGeneratorMIPSShared : public C
virtual void visitCompareAndBranch(LCompareAndBranch* comp);
virtual void visitTestDAndBranch(LTestDAndBranch* test);
virtual void visitTestFAndBranch(LTestFAndBranch* test);
virtual void visitCompareD(LCompareD* comp);
virtual void visitCompareF(LCompareF* comp);
virtual void visitCompareDAndBranch(LCompareDAndBranch* comp);
virtual void visitCompareFAndBranch(LCompareFAndBranch* comp);
virtual void visitBitAndAndBranch(LBitAndAndBranch* lir);
- virtual void visitAsmJSUInt32ToDouble(LAsmJSUInt32ToDouble* lir);
+ virtual void visitWasmUint32ToDouble(LWasmUint32ToDouble* lir);
virtual void visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir);
virtual void visitNotI(LNotI* ins);
virtual void visitNotD(LNotD* ins);
virtual void visitNotF(LNotF* ins);
virtual void visitMathD(LMathD* math);
virtual void visitMathF(LMathF* math);
virtual void visitFloor(LFloor* lir);
--- a/js/src/jit/mips-shared/LIR-mips-shared.h
+++ b/js/src/jit/mips-shared/LIR-mips-shared.h
@@ -6,22 +6,22 @@
#ifndef jit_mips_shared_LIR_mips_shared_h
#define jit_mips_shared_LIR_mips_shared_h
namespace js {
namespace jit {
// Convert a 32-bit unsigned integer to a double.
-class LAsmJSUInt32ToDouble : public LInstructionHelper<1, 1, 0>
+class LWasmUint32ToDouble : public LInstructionHelper<1, 1, 0>
{
public:
- LIR_HEADER(AsmJSUInt32ToDouble)
+ LIR_HEADER(WasmUint32ToDouble)
- LAsmJSUInt32ToDouble(const LAllocation& input) {
+ LWasmUint32ToDouble(const LAllocation& input) {
setOperand(0, input);
}
};
// Convert a 32-bit unsigned integer to a float32.
class LAsmJSUInt32ToFloat32 : public LInstructionHelper<1, 1, 0>
{
public:
--- a/js/src/jit/mips-shared/Lowering-mips-shared.cpp
+++ b/js/src/jit/mips-shared/Lowering-mips-shared.cpp
@@ -450,20 +450,20 @@ LIRGeneratorMIPSShared::lowerUMod(MMod*
lir->setOperand(1, useRegister(rhs));
if (mod->fallible())
assignSnapshot(lir, Bailout_DoubleOutput);
define(lir, mod);
}
void
-LIRGeneratorMIPSShared::visitAsmJSUnsignedToDouble(MAsmJSUnsignedToDouble* ins)
+LIRGeneratorMIPSShared::visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins)
{
MOZ_ASSERT(ins->input()->type() == MIRType::Int32);
- LAsmJSUInt32ToDouble* lir = new(alloc()) LAsmJSUInt32ToDouble(useRegisterAtStart(ins->input()));
+ LWasmUint32ToDouble* lir = new(alloc()) LWasmUint32ToDouble(useRegisterAtStart(ins->input()));
define(lir, ins);
}
void
LIRGeneratorMIPSShared::visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins)
{
MOZ_ASSERT(ins->input()->type() == MIRType::Int32);
LAsmJSUInt32ToFloat32* lir = new(alloc()) LAsmJSUInt32ToFloat32(useRegisterAtStart(ins->input()));
--- a/js/src/jit/mips-shared/Lowering-mips-shared.h
+++ b/js/src/jit/mips-shared/Lowering-mips-shared.h
@@ -78,17 +78,17 @@ class LIRGeneratorMIPSShared : public LI
LTableSwitch* newLTableSwitch(const LAllocation& in, const LDefinition& inputCopy,
MTableSwitch* ins);
LTableSwitchV* newLTableSwitchV(MTableSwitch* ins);
public:
void lowerPhi(MPhi* phi);
void visitGuardShape(MGuardShape* ins);
void visitGuardObjectGroup(MGuardObjectGroup* ins);
- void visitAsmJSUnsignedToDouble(MAsmJSUnsignedToDouble* ins);
+ void visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins);
void visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins);
void visitAsmJSLoadHeap(MAsmJSLoadHeap* ins);
void visitAsmJSStoreHeap(MAsmJSStoreHeap* ins);
void visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap* ins);
void visitAsmJSAtomicExchangeHeap(MAsmJSAtomicExchangeHeap* ins);
void visitAsmJSAtomicBinopHeap(MAsmJSAtomicBinopHeap* ins);
void visitStoreTypedArrayElementStatic(MStoreTypedArrayElementStatic* ins);
void visitCompareExchangeTypedArrayElement(MCompareExchangeTypedArrayElement* ins);
--- a/js/src/jit/none/LIR-none.h
+++ b/js/src/jit/none/LIR-none.h
@@ -82,20 +82,20 @@ class LModI : public LBinaryMath<1>
const LDefinition&)
{
MOZ_CRASH();
}
const LDefinition* callTemp() { MOZ_CRASH(); }
MMod* mir() const { MOZ_CRASH(); }
};
-class LAsmJSUInt32ToDouble : public LInstructionHelper<1, 1, 0>
+class LWasmUint32ToDouble : public LInstructionHelper<1, 1, 0>
{
public:
- LAsmJSUInt32ToDouble(const LAllocation&) { MOZ_CRASH(); }
+ LWasmUint32ToDouble(const LAllocation&) { MOZ_CRASH(); }
};
class LModPowTwoI : public LInstructionHelper<1, 1, 0>
{
public:
int32_t shift() { MOZ_CRASH(); }
LModPowTwoI(const LAllocation& lhs, int32_t shift) { MOZ_CRASH(); }
MMod* mir() const { MOZ_CRASH(); }
--- a/js/src/jit/none/Lowering-none.h
+++ b/js/src/jit/none/Lowering-none.h
@@ -72,17 +72,17 @@ class LIRGeneratorNone : public LIRGener
void lowerUMod(MMod*) { MOZ_CRASH(); }
void visitBox(MBox* box) { MOZ_CRASH(); }
void visitUnbox(MUnbox* unbox) { MOZ_CRASH(); }
void visitReturn(MReturn* ret) { MOZ_CRASH(); }
void visitPowHalf(MPowHalf*) { MOZ_CRASH(); }
void visitAsmJSNeg(MAsmJSNeg*) { MOZ_CRASH(); }
void visitGuardShape(MGuardShape* ins) { MOZ_CRASH(); }
void visitGuardObjectGroup(MGuardObjectGroup* ins) { MOZ_CRASH(); }
- void visitAsmJSUnsignedToDouble(MAsmJSUnsignedToDouble* ins) { MOZ_CRASH(); }
+ void visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins) { MOZ_CRASH(); }
void visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins) { MOZ_CRASH(); }
void visitAsmJSLoadHeap(MAsmJSLoadHeap* ins) { MOZ_CRASH(); }
void visitAsmJSStoreHeap(MAsmJSStoreHeap* ins) { MOZ_CRASH(); }
void visitStoreTypedArrayElementStatic(MStoreTypedArrayElementStatic* ins) { MOZ_CRASH(); }
void visitAtomicTypedArrayElementBinop(MAtomicTypedArrayElementBinop* ins) { MOZ_CRASH(); }
void visitCompareExchangeTypedArrayElement(MCompareExchangeTypedArrayElement* ins) { MOZ_CRASH(); }
void visitAtomicExchangeTypedArrayElement(MAtomicExchangeTypedArrayElement* ins) { MOZ_CRASH(); }
void visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap* ins) { MOZ_CRASH(); }
--- a/js/src/jit/shared/LOpcodes-shared.h
+++ b/js/src/jit/shared/LOpcodes-shared.h
@@ -411,17 +411,17 @@
_(AsmJSPassStackArg) \
_(AsmJSPassStackArgI64) \
_(WasmCall) \
_(WasmCallI64) \
_(AsmJSCompareExchangeHeap) \
_(AsmJSAtomicExchangeHeap) \
_(AsmJSAtomicBinopHeap) \
_(AsmJSAtomicBinopHeapForEffect)\
- _(AsmJSUInt32ToDouble) \
+ _(WasmUint32ToDouble) \
_(AsmJSUInt32ToFloat32) \
_(RecompileCheck) \
_(MemoryBarrier) \
_(AssertRangeI) \
_(AssertRangeD) \
_(AssertRangeF) \
_(AssertRangeV) \
_(AssertResultV) \
--- a/js/src/jit/x64/CodeGenerator-x64.cpp
+++ b/js/src/jit/x64/CodeGenerator-x64.cpp
@@ -366,17 +366,17 @@ void
CodeGeneratorX64::visitWasmReinterpretToI64(LWasmReinterpretToI64* lir)
{
MOZ_ASSERT(lir->mir()->type() == MIRType::Int64);
MOZ_ASSERT(lir->mir()->input()->type() == MIRType::Double);
masm.vmovq(ToFloatRegister(lir->input()), ToRegister(lir->output()));
}
void
-CodeGeneratorX64::visitAsmJSUInt32ToDouble(LAsmJSUInt32ToDouble* lir)
+CodeGeneratorX64::visitWasmUint32ToDouble(LWasmUint32ToDouble* lir)
{
masm.convertUInt32ToDouble(ToRegister(lir->input()), ToFloatRegister(lir->output()));
}
void
CodeGeneratorX64::visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir)
{
masm.convertUInt32ToFloat32(ToRegister(lir->input()), ToFloatRegister(lir->output()));
--- a/js/src/jit/x64/CodeGenerator-x64.h
+++ b/js/src/jit/x64/CodeGenerator-x64.h
@@ -69,17 +69,17 @@ class CodeGeneratorX64 : public CodeGene
void visitWasmCall(LWasmCall* ins);
void visitWasmCallI64(LWasmCallI64* ins);
void visitAsmJSLoadHeap(LAsmJSLoadHeap* ins);
void visitAsmJSStoreHeap(LAsmJSStoreHeap* ins);
void visitAsmJSCompareExchangeHeap(LAsmJSCompareExchangeHeap* ins);
void visitAsmJSAtomicExchangeHeap(LAsmJSAtomicExchangeHeap* ins);
void visitAsmJSAtomicBinopHeap(LAsmJSAtomicBinopHeap* ins);
void visitAsmJSAtomicBinopHeapForEffect(LAsmJSAtomicBinopHeapForEffect* ins);
- void visitAsmJSUInt32ToDouble(LAsmJSUInt32ToDouble* lir);
+ void visitWasmUint32ToDouble(LWasmUint32ToDouble* lir);
void visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir);
void visitWasmReinterpretFromI64(LWasmReinterpretFromI64* lir);
void visitWasmReinterpretToI64(LWasmReinterpretToI64* lir);
void visitTestI64AndBranch(LTestI64AndBranch* lir);
};
typedef CodeGeneratorX64 CodeGeneratorSpecific;
--- a/js/src/jit/x64/LIR-x64.h
+++ b/js/src/jit/x64/LIR-x64.h
@@ -54,22 +54,22 @@ class LUnboxFloatingPoint : public LUnbo
return type_;
}
const char* extraName() const {
return StringFromMIRType(type_);
}
};
// Convert a 32-bit unsigned integer to a double.
-class LAsmJSUInt32ToDouble : public LInstructionHelper<1, 1, 0>
+class LWasmUint32ToDouble : public LInstructionHelper<1, 1, 0>
{
public:
- LIR_HEADER(AsmJSUInt32ToDouble)
+ LIR_HEADER(WasmUint32ToDouble)
- explicit LAsmJSUInt32ToDouble(const LAllocation& input) {
+ explicit LWasmUint32ToDouble(const LAllocation& input) {
setOperand(0, input);
}
};
// Convert a 32-bit unsigned integer to a float32.
class LAsmJSUInt32ToFloat32 : public LInstructionHelper<1, 1, 0>
{
public:
--- a/js/src/jit/x64/Lowering-x64.cpp
+++ b/js/src/jit/x64/Lowering-x64.cpp
@@ -173,20 +173,20 @@ LIRGeneratorX64::visitAtomicExchangeType
void
LIRGeneratorX64::visitAtomicTypedArrayElementBinop(MAtomicTypedArrayElementBinop* ins)
{
lowerAtomicTypedArrayElementBinop(ins, /* useI386ByteRegisters = */ false);
}
void
-LIRGeneratorX64::visitAsmJSUnsignedToDouble(MAsmJSUnsignedToDouble* ins)
+LIRGeneratorX64::visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins)
{
MOZ_ASSERT(ins->input()->type() == MIRType::Int32);
- LAsmJSUInt32ToDouble* lir = new(alloc()) LAsmJSUInt32ToDouble(useRegisterAtStart(ins->input()));
+ LWasmUint32ToDouble* lir = new(alloc()) LWasmUint32ToDouble(useRegisterAtStart(ins->input()));
define(lir, ins);
}
void
LIRGeneratorX64::visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins)
{
MOZ_ASSERT(ins->input()->type() == MIRType::Int32);
LAsmJSUInt32ToFloat32* lir = new(alloc()) LAsmJSUInt32ToFloat32(useRegisterAtStart(ins->input()));
--- a/js/src/jit/x64/Lowering-x64.h
+++ b/js/src/jit/x64/Lowering-x64.h
@@ -50,17 +50,17 @@ class LIRGeneratorX64 : public LIRGenera
public:
void visitBox(MBox* box);
void visitUnbox(MUnbox* unbox);
void visitReturn(MReturn* ret);
void visitCompareExchangeTypedArrayElement(MCompareExchangeTypedArrayElement* ins);
void visitAtomicExchangeTypedArrayElement(MAtomicExchangeTypedArrayElement* ins);
void visitAtomicTypedArrayElementBinop(MAtomicTypedArrayElementBinop* ins);
- void visitAsmJSUnsignedToDouble(MAsmJSUnsignedToDouble* ins);
+ void visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins);
void visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins);
void visitAsmJSLoadHeap(MAsmJSLoadHeap* ins);
void visitAsmJSStoreHeap(MAsmJSStoreHeap* ins);
void visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap* ins);
void visitAsmJSAtomicExchangeHeap(MAsmJSAtomicExchangeHeap* ins);
void visitAsmJSAtomicBinopHeap(MAsmJSAtomicBinopHeap* ins);
void visitWasmLoad(MWasmLoad* ins);
void visitWasmStore(MWasmStore* ins);
--- a/js/src/jit/x86/CodeGenerator-x86.cpp
+++ b/js/src/jit/x86/CodeGenerator-x86.cpp
@@ -225,17 +225,17 @@ CodeGeneratorX86::visitCompareBitwiseAnd
masm.cmp32(lhs.typeReg(), rhs.typeReg());
jumpToBlock(notEqual, Assembler::NotEqual);
masm.cmp32(lhs.payloadReg(), rhs.payloadReg());
emitBranch(cond, lir->ifTrue(), lir->ifFalse());
}
void
-CodeGeneratorX86::visitAsmJSUInt32ToDouble(LAsmJSUInt32ToDouble* lir)
+CodeGeneratorX86::visitWasmUint32ToDouble(LWasmUint32ToDouble* lir)
{
Register input = ToRegister(lir->input());
Register temp = ToRegister(lir->temp());
if (input != temp)
masm.mov(input, temp);
// Beware: convertUInt32ToDouble clobbers input.
--- a/js/src/jit/x86/CodeGenerator-x86.h
+++ b/js/src/jit/x86/CodeGenerator-x86.h
@@ -38,17 +38,17 @@ class CodeGeneratorX86 : public CodeGene
void visitBox(LBox* box);
void visitBoxFloatingPoint(LBoxFloatingPoint* box);
void visitUnbox(LUnbox* unbox);
void visitValue(LValue* value);
void visitCompareB(LCompareB* lir);
void visitCompareBAndBranch(LCompareBAndBranch* lir);
void visitCompareBitwise(LCompareBitwise* lir);
void visitCompareBitwiseAndBranch(LCompareBitwiseAndBranch* lir);
- void visitAsmJSUInt32ToDouble(LAsmJSUInt32ToDouble* lir);
+ void visitWasmUint32ToDouble(LWasmUint32ToDouble* lir);
void visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir);
void visitTruncateDToInt32(LTruncateDToInt32* ins);
void visitTruncateFToInt32(LTruncateFToInt32* ins);
void visitLoadTypedArrayElementStatic(LLoadTypedArrayElementStatic* ins);
void visitStoreTypedArrayElementStatic(LStoreTypedArrayElementStatic* ins);
void emitWasmCall(LWasmCallBase* ins);
void visitWasmCall(LWasmCall* ins);
void visitWasmCallI64(LWasmCallI64* ins);
--- a/js/src/jit/x86/LIR-x86.h
+++ b/js/src/jit/x86/LIR-x86.h
@@ -75,22 +75,22 @@ class LUnboxFloatingPoint : public LInst
return type_;
}
const char* extraName() const {
return StringFromMIRType(type_);
}
};
// Convert a 32-bit unsigned integer to a double.
-class LAsmJSUInt32ToDouble : public LInstructionHelper<1, 1, 1>
+class LWasmUint32ToDouble : public LInstructionHelper<1, 1, 1>
{
public:
- LIR_HEADER(AsmJSUInt32ToDouble)
+ LIR_HEADER(WasmUint32ToDouble)
- LAsmJSUInt32ToDouble(const LAllocation& input, const LDefinition& temp) {
+ LWasmUint32ToDouble(const LAllocation& input, const LDefinition& temp) {
setOperand(0, input);
setTemp(0, temp);
}
const LDefinition* temp() {
return getTemp(0);
}
};
--- a/js/src/jit/x86/Lowering-x86.cpp
+++ b/js/src/jit/x86/Lowering-x86.cpp
@@ -252,20 +252,20 @@ LIRGeneratorX86::visitAtomicExchangeType
void
LIRGeneratorX86::visitAtomicTypedArrayElementBinop(MAtomicTypedArrayElementBinop* ins)
{
lowerAtomicTypedArrayElementBinop(ins, /* useI386ByteRegisters = */ true);
}
void
-LIRGeneratorX86::visitAsmJSUnsignedToDouble(MAsmJSUnsignedToDouble* ins)
+LIRGeneratorX86::visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins)
{
MOZ_ASSERT(ins->input()->type() == MIRType::Int32);
- LAsmJSUInt32ToDouble* lir = new(alloc()) LAsmJSUInt32ToDouble(useRegisterAtStart(ins->input()), temp());
+ LWasmUint32ToDouble* lir = new(alloc()) LWasmUint32ToDouble(useRegisterAtStart(ins->input()), temp());
define(lir, ins);
}
void
LIRGeneratorX86::visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins)
{
MOZ_ASSERT(ins->input()->type() == MIRType::Int32);
LAsmJSUInt32ToFloat32* lir = new(alloc()) LAsmJSUInt32ToFloat32(useRegisterAtStart(ins->input()), temp());
--- a/js/src/jit/x86/Lowering-x86.h
+++ b/js/src/jit/x86/Lowering-x86.h
@@ -57,17 +57,17 @@ class LIRGeneratorX86 : public LIRGenera
public:
void visitBox(MBox* box);
void visitUnbox(MUnbox* unbox);
void visitReturn(MReturn* ret);
void visitCompareExchangeTypedArrayElement(MCompareExchangeTypedArrayElement* ins);
void visitAtomicExchangeTypedArrayElement(MAtomicExchangeTypedArrayElement* ins);
void visitAtomicTypedArrayElementBinop(MAtomicTypedArrayElementBinop* ins);
- void visitAsmJSUnsignedToDouble(MAsmJSUnsignedToDouble* ins);
+ void visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins);
void visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins);
void visitAsmJSLoadHeap(MAsmJSLoadHeap* ins);
void visitAsmJSStoreHeap(MAsmJSStoreHeap* ins);
void visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap* ins);
void visitAsmJSAtomicExchangeHeap(MAsmJSAtomicExchangeHeap* ins);
void visitAsmJSAtomicBinopHeap(MAsmJSAtomicBinopHeap* ins);
void visitWasmLoad(MWasmLoad* ins);
void visitWasmStore(MWasmStore* ins);