Bug 1304672: Rename AsmJSUnsignedToFloat32 to WasmUnsignedToFloat32; r=luke

And LAsmJSUInt32ToFloat32 to LWasmUint32ToFloat32;

MozReview-Commit-ID: EVbZZH8n0nP

--HG--
extra : rebase_source : 4d64a7b7d65b64836e0b87b3d12a31aea8bf48b5
extra : histedit_source : 37ca26445655f62c1b7eafbabd186d52b7f4d9a4
This commit is contained in:
Benjamin Bouvier 2016-11-02 10:37:48 +01:00
Родитель a4ef9c21e7
Коммит 72e5f8ec1a
32 изменённых файлов: 53 добавлений и 53 удалений

Просмотреть файл

@ -3421,7 +3421,7 @@ EmitExpr(FunctionCompiler& f)
case Expr::F32ConvertSI32:
return EmitConversion<MToFloat32>(f, ValType::I32, ValType::F32);
case Expr::F32ConvertUI32:
return EmitConversion<MAsmJSUnsignedToFloat32>(f, ValType::I32, ValType::F32);
return EmitConversion<MWasmUnsignedToFloat32>(f, ValType::I32, ValType::F32);
case Expr::F32ConvertSI64:
case Expr::F32ConvertUI64:
return EmitConvertI64ToFloatingPoint(f, ValType::F32, MIRType::Float32,

Просмотреть файл

@ -5667,7 +5667,7 @@ MWasmUnsignedToDouble::foldsTo(TempAllocator& alloc)
}
MDefinition*
MAsmJSUnsignedToFloat32::foldsTo(TempAllocator& alloc)
MWasmUnsignedToFloat32::foldsTo(TempAllocator& alloc)
{
if (input()->isConstant() && input()->type() == MIRType::Int32) {
double dval = double(uint32_t(input()->toConstant()->toInt32()));

Просмотреть файл

@ -5332,11 +5332,11 @@ class MWasmUnsignedToDouble
};
// Converts a uint32 to a float32 (coming from asm.js).
class MAsmJSUnsignedToFloat32
class MWasmUnsignedToFloat32
: public MUnaryInstruction,
public NoTypePolicy::Data
{
explicit MAsmJSUnsignedToFloat32(MDefinition* def)
explicit MWasmUnsignedToFloat32(MDefinition* def)
: MUnaryInstruction(def)
{
setResultType(MIRType::Float32);
@ -5344,9 +5344,9 @@ class MAsmJSUnsignedToFloat32
}
public:
INSTRUCTION_HEADER(AsmJSUnsignedToFloat32)
static MAsmJSUnsignedToFloat32* NewAsmJS(TempAllocator& alloc, MDefinition* def) {
return new(alloc) MAsmJSUnsignedToFloat32(def);
INSTRUCTION_HEADER(WasmUnsignedToFloat32)
static MWasmUnsignedToFloat32* NewAsmJS(TempAllocator& alloc, MDefinition* def) {
return new(alloc) MWasmUnsignedToFloat32(def);
}
MDefinition* foldsTo(TempAllocator& alloc) override;

Просмотреть файл

@ -280,7 +280,7 @@ namespace jit {
_(WasmTruncateToInt32) \
_(AsmJSNeg) \
_(WasmUnsignedToDouble) \
_(AsmJSUnsignedToFloat32) \
_(WasmUnsignedToFloat32) \
_(AsmJSLoadHeap) \
_(AsmJSStoreHeap) \
_(WasmLoadGlobalVar) \

Просмотреть файл

@ -1639,7 +1639,7 @@ CodeGeneratorARM::visitWasmUint32ToDouble(LWasmUint32ToDouble* lir)
}
void
CodeGeneratorARM::visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir)
CodeGeneratorARM::visitWasmUint32ToFloat32(LWasmUint32ToFloat32* lir)
{
masm.convertUInt32ToFloat32(ToRegister(lir->input()), ToFloatRegister(lir->output()));
}

Просмотреть файл

@ -151,7 +151,7 @@ class CodeGeneratorARM : public CodeGeneratorShared
virtual void visitCompareBitwiseAndBranch(LCompareBitwiseAndBranch* lir);
virtual void visitBitAndAndBranch(LBitAndAndBranch* baab);
virtual void visitWasmUint32ToDouble(LWasmUint32ToDouble* lir);
virtual void visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir);
virtual void visitWasmUint32ToFloat32(LWasmUint32ToFloat32* lir);
virtual void visitNotI(LNotI* ins);
virtual void visitNotD(LNotD* ins);
virtual void visitNotF(LNotF* ins);

Просмотреть файл

@ -90,12 +90,12 @@ class LWasmUint32ToDouble : public LInstructionHelper<1, 1, 0>
};
// Convert a 32-bit unsigned integer to a float32.
class LAsmJSUInt32ToFloat32 : public LInstructionHelper<1, 1, 0>
class LWasmUint32ToFloat32 : public LInstructionHelper<1, 1, 0>
{
public:
LIR_HEADER(AsmJSUInt32ToFloat32)
LIR_HEADER(WasmUint32ToFloat32)
LAsmJSUInt32ToFloat32(const LAllocation& input) {
LWasmUint32ToFloat32(const LAllocation& input) {
setOperand(0, input);
}
};

Просмотреть файл

@ -598,10 +598,10 @@ LIRGeneratorARM::visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins)
}
void
LIRGeneratorARM::visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins)
LIRGeneratorARM::visitWasmUnsignedToFloat32(MWasmUnsignedToFloat32* ins)
{
MOZ_ASSERT(ins->input()->type() == MIRType::Int32);
LAsmJSUInt32ToFloat32* lir = new(alloc()) LAsmJSUInt32ToFloat32(useRegisterAtStart(ins->input()));
LWasmUint32ToFloat32* lir = new(alloc()) LWasmUint32ToFloat32(useRegisterAtStart(ins->input()));
define(lir, ins);
}

Просмотреть файл

@ -104,7 +104,7 @@ class LIRGeneratorARM : public LIRGeneratorShared
void visitGuardObjectGroup(MGuardObjectGroup* ins);
void visitWasmSelect(MWasmSelect* ins);
void visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins);
void visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins);
void visitWasmUnsignedToFloat32(MWasmUnsignedToFloat32* ins);
void visitWasmLoad(MWasmLoad* ins);
void visitWasmStore(MWasmStore* ins);
void visitAsmJSLoadHeap(MAsmJSLoadHeap* ins);

Просмотреть файл

@ -524,9 +524,9 @@ CodeGeneratorARM64::visitWasmUint32ToDouble(LWasmUint32ToDouble* lir)
}
void
CodeGeneratorARM64::visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir)
CodeGeneratorARM64::visitWasmUint32ToFloat32(LWasmUint32ToFloat32* lir)
{
MOZ_CRASH("visitAsmJSUInt32ToFloat32");
MOZ_CRASH("visitWasmUint32ToFloat32");
}
void

Просмотреть файл

@ -134,7 +134,7 @@ class CodeGeneratorARM64 : public CodeGeneratorShared
virtual void visitCompareBitwiseAndBranch(LCompareBitwiseAndBranch* lir);
virtual void visitBitAndAndBranch(LBitAndAndBranch* baab);
virtual void visitWasmUint32ToDouble(LWasmUint32ToDouble* lir);
virtual void visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir);
virtual void visitWasmUint32ToFloat32(LWasmUint32ToFloat32* lir);
virtual void visitNotI(LNotI* ins);
virtual void visitNotD(LNotD* ins);
virtual void visitNotF(LNotF* ins);

Просмотреть файл

@ -70,12 +70,12 @@ class LWasmUint32ToDouble : public LInstructionHelper<1, 1, 0>
};
// Convert a 32-bit unsigned integer to a float32.
class LAsmJSUInt32ToFloat32 : public LInstructionHelper<1, 1, 0>
class LWasmUint32ToFloat32 : public LInstructionHelper<1, 1, 0>
{
public:
LIR_HEADER(AsmJSUInt32ToFloat32)
LIR_HEADER(WasmUint32ToFloat32)
LAsmJSUInt32ToFloat32(const LAllocation& input) {
LWasmUint32ToFloat32(const LAllocation& input) {
setOperand(0, input);
}
};

Просмотреть файл

@ -246,9 +246,9 @@ LIRGeneratorARM64::visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins)
}
void
LIRGeneratorARM64::visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins)
LIRGeneratorARM64::visitWasmUnsignedToFloat32(MWasmUnsignedToFloat32* ins)
{
MOZ_CRASH("visitAsmJSUnsignedToFloat32");
MOZ_CRASH("visitWasmUnsignedToFloat32");
}
void

Просмотреть файл

@ -104,7 +104,7 @@ class LIRGeneratorARM64 : public LIRGeneratorShared
void visitGuardShape(MGuardShape* ins);
void visitGuardObjectGroup(MGuardObjectGroup* ins);
void visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins);
void visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins);
void visitWasmUnsignedToFloat32(MWasmUnsignedToFloat32* ins);
void visitAsmJSLoadHeap(MAsmJSLoadHeap* ins);
void visitAsmJSStoreHeap(MAsmJSStoreHeap* ins);
void visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap* ins);

Просмотреть файл

@ -1747,7 +1747,7 @@ CodeGeneratorMIPSShared::visitWasmUint32ToDouble(LWasmUint32ToDouble* lir)
}
void
CodeGeneratorMIPSShared::visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir)
CodeGeneratorMIPSShared::visitWasmUint32ToFloat32(LWasmUint32ToFloat32* lir)
{
masm.convertUInt32ToFloat32(ToRegister(lir->input()), ToFloatRegister(lir->output()));
}

Просмотреть файл

@ -170,7 +170,7 @@ class CodeGeneratorMIPSShared : public CodeGeneratorShared
virtual void visitCompareFAndBranch(LCompareFAndBranch* comp);
virtual void visitBitAndAndBranch(LBitAndAndBranch* lir);
virtual void visitWasmUint32ToDouble(LWasmUint32ToDouble* lir);
virtual void visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir);
virtual void visitWasmUint32ToFloat32(LWasmUint32ToFloat32* lir);
virtual void visitNotI(LNotI* ins);
virtual void visitNotD(LNotD* ins);
virtual void visitNotF(LNotF* ins);

Просмотреть файл

@ -22,12 +22,12 @@ class LWasmUint32ToDouble : public LInstructionHelper<1, 1, 0>
};
// Convert a 32-bit unsigned integer to a float32.
class LAsmJSUInt32ToFloat32 : public LInstructionHelper<1, 1, 0>
class LWasmUint32ToFloat32 : public LInstructionHelper<1, 1, 0>
{
public:
LIR_HEADER(AsmJSUInt32ToFloat32)
LIR_HEADER(WasmUint32ToFloat32)
LAsmJSUInt32ToFloat32(const LAllocation& input) {
LWasmUint32ToFloat32(const LAllocation& input) {
setOperand(0, input);
}
};

Просмотреть файл

@ -463,10 +463,10 @@ LIRGeneratorMIPSShared::visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins)
}
void
LIRGeneratorMIPSShared::visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins)
LIRGeneratorMIPSShared::visitWasmUnsignedToFloat32(MWasmUnsignedToFloat32* ins)
{
MOZ_ASSERT(ins->input()->type() == MIRType::Int32);
LAsmJSUInt32ToFloat32* lir = new(alloc()) LAsmJSUInt32ToFloat32(useRegisterAtStart(ins->input()));
LWasmUint32ToFloat32* lir = new(alloc()) LWasmUint32ToFloat32(useRegisterAtStart(ins->input()));
define(lir, ins);
}

Просмотреть файл

@ -84,7 +84,7 @@ class LIRGeneratorMIPSShared : public LIRGeneratorShared
void visitGuardShape(MGuardShape* ins);
void visitGuardObjectGroup(MGuardObjectGroup* ins);
void visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins);
void visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins);
void visitWasmUnsignedToFloat32(MWasmUnsignedToFloat32* ins);
void visitAsmJSLoadHeap(MAsmJSLoadHeap* ins);
void visitAsmJSStoreHeap(MAsmJSStoreHeap* ins);
void visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap* ins);

Просмотреть файл

@ -43,10 +43,10 @@ class LTableSwitchV : public LInstruction
static const size_t InputValue = 0;
};
class LAsmJSUInt32ToFloat32 : public LInstruction
class LWasmUint32ToFloat32 : public LInstruction
{
public:
LAsmJSUInt32ToFloat32(const LAllocation& ) { MOZ_CRASH(); }
LWasmUint32ToFloat32(const LAllocation& ) { MOZ_CRASH(); }
};
class LUnbox : public LInstructionHelper<1, 2, 0>

Просмотреть файл

@ -78,7 +78,7 @@ class LIRGeneratorNone : public LIRGeneratorShared
void visitGuardShape(MGuardShape* ins) { MOZ_CRASH(); }
void visitGuardObjectGroup(MGuardObjectGroup* ins) { MOZ_CRASH(); }
void visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins) { MOZ_CRASH(); }
void visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins) { MOZ_CRASH(); }
void visitWasmUnsignedToFloat32(MWasmUnsignedToFloat32* ins) { MOZ_CRASH(); }
void visitAsmJSLoadHeap(MAsmJSLoadHeap* ins) { MOZ_CRASH(); }
void visitAsmJSStoreHeap(MAsmJSStoreHeap* ins) { MOZ_CRASH(); }
void visitStoreTypedArrayElementStatic(MStoreTypedArrayElementStatic* ins) { MOZ_CRASH(); }

Просмотреть файл

@ -417,7 +417,7 @@
_(AsmJSAtomicBinopHeap) \
_(AsmJSAtomicBinopHeapForEffect)\
_(WasmUint32ToDouble) \
_(AsmJSUInt32ToFloat32) \
_(WasmUint32ToFloat32) \
_(RecompileCheck) \
_(MemoryBarrier) \
_(AssertRangeI) \

Просмотреть файл

@ -377,7 +377,7 @@ CodeGeneratorX64::visitWasmUint32ToDouble(LWasmUint32ToDouble* lir)
}
void
CodeGeneratorX64::visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir)
CodeGeneratorX64::visitWasmUint32ToFloat32(LWasmUint32ToFloat32* lir)
{
masm.convertUInt32ToFloat32(ToRegister(lir->input()), ToFloatRegister(lir->output()));
}

Просмотреть файл

@ -75,7 +75,7 @@ class CodeGeneratorX64 : public CodeGeneratorX86Shared
void visitAsmJSAtomicBinopHeap(LAsmJSAtomicBinopHeap* ins);
void visitAsmJSAtomicBinopHeapForEffect(LAsmJSAtomicBinopHeapForEffect* ins);
void visitWasmUint32ToDouble(LWasmUint32ToDouble* lir);
void visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir);
void visitWasmUint32ToFloat32(LWasmUint32ToFloat32* lir);
void visitWasmReinterpretFromI64(LWasmReinterpretFromI64* lir);
void visitWasmReinterpretToI64(LWasmReinterpretToI64* lir);
void visitTestI64AndBranch(LTestI64AndBranch* lir);

Просмотреть файл

@ -70,12 +70,12 @@ class LWasmUint32ToDouble : public LInstructionHelper<1, 1, 0>
};
// Convert a 32-bit unsigned integer to a float32.
class LAsmJSUInt32ToFloat32 : public LInstructionHelper<1, 1, 0>
class LWasmUint32ToFloat32 : public LInstructionHelper<1, 1, 0>
{
public:
LIR_HEADER(AsmJSUInt32ToFloat32)
LIR_HEADER(WasmUint32ToFloat32)
explicit LAsmJSUInt32ToFloat32(const LAllocation& input) {
explicit LWasmUint32ToFloat32(const LAllocation& input) {
setOperand(0, input);
}
};

Просмотреть файл

@ -186,10 +186,10 @@ LIRGeneratorX64::visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins)
}
void
LIRGeneratorX64::visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins)
LIRGeneratorX64::visitWasmUnsignedToFloat32(MWasmUnsignedToFloat32* ins)
{
MOZ_ASSERT(ins->input()->type() == MIRType::Int32);
LAsmJSUInt32ToFloat32* lir = new(alloc()) LAsmJSUInt32ToFloat32(useRegisterAtStart(ins->input()));
LWasmUint32ToFloat32* lir = new(alloc()) LWasmUint32ToFloat32(useRegisterAtStart(ins->input()));
define(lir, ins);
}

Просмотреть файл

@ -56,7 +56,7 @@ class LIRGeneratorX64 : public LIRGeneratorX86Shared
void visitAtomicExchangeTypedArrayElement(MAtomicExchangeTypedArrayElement* ins);
void visitAtomicTypedArrayElementBinop(MAtomicTypedArrayElementBinop* ins);
void visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins);
void visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins);
void visitWasmUnsignedToFloat32(MWasmUnsignedToFloat32* ins);
void visitAsmJSLoadHeap(MAsmJSLoadHeap* ins);
void visitAsmJSStoreHeap(MAsmJSStoreHeap* ins);
void visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap* ins);

Просмотреть файл

@ -243,7 +243,7 @@ CodeGeneratorX86::visitWasmUint32ToDouble(LWasmUint32ToDouble* lir)
}
void
CodeGeneratorX86::visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir)
CodeGeneratorX86::visitWasmUint32ToFloat32(LWasmUint32ToFloat32* lir)
{
Register input = ToRegister(lir->input());
Register temp = ToRegister(lir->temp());

Просмотреть файл

@ -44,7 +44,7 @@ class CodeGeneratorX86 : public CodeGeneratorX86Shared
void visitCompareBitwise(LCompareBitwise* lir);
void visitCompareBitwiseAndBranch(LCompareBitwiseAndBranch* lir);
void visitWasmUint32ToDouble(LWasmUint32ToDouble* lir);
void visitAsmJSUInt32ToFloat32(LAsmJSUInt32ToFloat32* lir);
void visitWasmUint32ToFloat32(LWasmUint32ToFloat32* lir);
void visitTruncateDToInt32(LTruncateDToInt32* ins);
void visitTruncateFToInt32(LTruncateFToInt32* ins);
void visitLoadTypedArrayElementStatic(LLoadTypedArrayElementStatic* ins);

Просмотреть файл

@ -95,12 +95,12 @@ class LWasmUint32ToDouble : public LInstructionHelper<1, 1, 1>
};
// Convert a 32-bit unsigned integer to a float32.
class LAsmJSUInt32ToFloat32: public LInstructionHelper<1, 1, 1>
class LWasmUint32ToFloat32: public LInstructionHelper<1, 1, 1>
{
public:
LIR_HEADER(AsmJSUInt32ToFloat32)
LIR_HEADER(WasmUint32ToFloat32)
LAsmJSUInt32ToFloat32(const LAllocation& input, const LDefinition& temp) {
LWasmUint32ToFloat32(const LAllocation& input, const LDefinition& temp) {
setOperand(0, input);
setTemp(0, temp);
}

Просмотреть файл

@ -265,10 +265,10 @@ LIRGeneratorX86::visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins)
}
void
LIRGeneratorX86::visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins)
LIRGeneratorX86::visitWasmUnsignedToFloat32(MWasmUnsignedToFloat32* ins)
{
MOZ_ASSERT(ins->input()->type() == MIRType::Int32);
LAsmJSUInt32ToFloat32* lir = new(alloc()) LAsmJSUInt32ToFloat32(useRegisterAtStart(ins->input()), temp());
LWasmUint32ToFloat32* lir = new(alloc()) LWasmUint32ToFloat32(useRegisterAtStart(ins->input()), temp());
define(lir, ins);
}

Просмотреть файл

@ -63,7 +63,7 @@ class LIRGeneratorX86 : public LIRGeneratorX86Shared
void visitAtomicExchangeTypedArrayElement(MAtomicExchangeTypedArrayElement* ins);
void visitAtomicTypedArrayElementBinop(MAtomicTypedArrayElementBinop* ins);
void visitWasmUnsignedToDouble(MWasmUnsignedToDouble* ins);
void visitAsmJSUnsignedToFloat32(MAsmJSUnsignedToFloat32* ins);
void visitWasmUnsignedToFloat32(MWasmUnsignedToFloat32* ins);
void visitAsmJSLoadHeap(MAsmJSLoadHeap* ins);
void visitAsmJSStoreHeap(MAsmJSStoreHeap* ins);
void visitAsmJSCompareExchangeHeap(MAsmJSCompareExchangeHeap* ins);