--- a/js/src/asmjs/WasmIonCompile.cpp
+++ b/js/src/asmjs/WasmIonCompile.cpp
@@ -103,17 +103,17 @@ class CallCompileState
MWasmCall::Args regArgs_;
// Reserved argument for passing Instance* to builtin instance method calls.
ABIArg instanceArg_;
// Accumulates the stack arguments while compiling arguments. This is only
// necessary to track when childClobbers_ is true so that the stack offsets
// can be updated.
- Vector<MAsmJSPassStackArg*, 0, SystemAllocPolicy> stackArgs_;
+ Vector<MWasmStackArg*, 0, SystemAllocPolicy> stackArgs_;
// Set by child calls (i.e., calls that execute while evaluating a parent's
// operands) to indicate that the child and parent call cannot reuse the
// same stack space -- the parent must store its stack arguments below the
// child's and increment sp when performing its call.
bool childClobbers_;
// Only FunctionCompiler should be directly manipulating CallCompileState.
@@ -166,17 +166,17 @@ class FunctionCompiler
uint32_t loopDepth_;
uint32_t blockDepth_;
ControlFlowPatchsVector blockPatches_;
FuncCompileResults& compileResults_;
// TLS pointer argument to the current function.
- MAsmJSParameter* tlsPointer_;
+ MWasmParameter* tlsPointer_;
public:
FunctionCompiler(const ModuleGeneratorData& mg,
Decoder& decoder,
const FuncBytes& func,
const ValTypeVector& locals,
MIRGenerator& mirGen,
FuncCompileResults& compileResults)
@@ -218,25 +218,25 @@ class FunctionCompiler
const ValTypeVector& args = func_.sig().args();
if (!mirGen_.ensureBallast())
return false;
if (!newBlock(/* prev */ nullptr, &curBlock_))
return false;
for (ABIArgValTypeIter i(args); !i.done(); i++) {
- MAsmJSParameter* ins = MAsmJSParameter::New(alloc(), *i, i.mirType());
+ MWasmParameter* ins = MWasmParameter::New(alloc(), *i, i.mirType());
curBlock_->add(ins);
curBlock_->initSlot(info().localSlot(i.index()), ins);
if (!mirGen_.ensureBallast())
return false;
}
// Set up a parameter that receives the hidden TLS pointer argument.
- tlsPointer_ = MAsmJSParameter::New(alloc(), ABIArg(WasmTlsReg), MIRType::Pointer);
+ tlsPointer_ = MWasmParameter::New(alloc(), ABIArg(WasmTlsReg), MIRType::Pointer);
curBlock_->add(tlsPointer_);
if (!mirGen_.ensureBallast())
return false;
for (size_t i = args.length(); i < locals_.length(); i++) {
MInstruction* ins = nullptr;
switch (locals_[i]) {
case ValType::I32:
@@ -925,17 +925,17 @@ class FunctionCompiler
return call->regArgs_.append(MWasmCall::Arg(AnyRegister(arg.gpr64().low), mirLow)) &&
call->regArgs_.append(MWasmCall::Arg(AnyRegister(arg.gpr64().high), mirHigh));
}
#endif
case ABIArg::GPR:
case ABIArg::FPU:
return call->regArgs_.append(MWasmCall::Arg(arg.reg(), argDef));
case ABIArg::Stack: {
- auto* mir = MAsmJSPassStackArg::New(alloc(), arg.offsetFromArgBase(), argDef);
+ auto* mir = MWasmStackArg::New(alloc(), arg.offsetFromArgBase(), argDef);
curBlock_->add(mir);
return call->stackArgs_.append(mir);
}
default:
MOZ_CRASH("Unknown ABIArg kind.");
}
}
@@ -976,17 +976,17 @@ class FunctionCompiler
// will use this offset after having bumped the stack pointer.
if (tls == TlsUsage::CallerSaved) {
call->tlsStackOffset_ = stackBytes;
stackBytes += sizeof(void*);
}
if (call->childClobbers_) {
call->spIncrement_ = AlignBytes(call->maxChildStackBytes_, AsmJSStackAlignment);
- for (MAsmJSPassStackArg* stackArg : call->stackArgs_)
+ for (MWasmStackArg* stackArg : call->stackArgs_)
stackArg->incrementOffset(call->spIncrement_);
// If instanceArg_ is not initialized then instanceArg_.kind() != ABIArg::Stack
if (call->instanceArg_.kind() == ABIArg::Stack) {
call->instanceArg_ = ABIArg(call->instanceArg_.offsetFromArgBase() +
call->spIncrement_);
}
--- a/js/src/jit/CodeGenerator.cpp
+++ b/js/src/jit/CodeGenerator.cpp
@@ -11411,22 +11411,22 @@ CodeGenerator::visitHasClass(LHasClass*
Register lhs = ToRegister(ins->lhs());
Register output = ToRegister(ins->output());
masm.loadObjClass(lhs, output);
masm.cmpPtrSet(Assembler::Equal, output, ImmPtr(ins->mir()->getClass()), output);
}
void
-CodeGenerator::visitAsmJSParameter(LAsmJSParameter* lir)
-{
-}
-
-void
-CodeGenerator::visitAsmJSParameterI64(LAsmJSParameterI64* lir)
+CodeGenerator::visitWasmParameter(LWasmParameter* lir)
+{
+}
+
+void
+CodeGenerator::visitWasmParameterI64(LWasmParameterI64* lir)
{
}
void
CodeGenerator::visitWasmReturn(LWasmReturn* lir)
{
// Don't emit a jump to the return label if this is the last block.
if (current->mir() != *gen->graph().poBegin())--- a/js/src/jit/CodeGenerator.h
+++ b/js/src/jit/CodeGenerator.h
@@ -364,18 +364,18 @@ class CodeGenerator final : public CodeG
void visitCallBindVar(LCallBindVar* lir);
void visitIsCallable(LIsCallable* lir);
void visitOutOfLineIsCallable(OutOfLineIsCallable* ool);
void visitIsConstructor(LIsConstructor* lir);
void visitOutOfLineIsConstructor(OutOfLineIsConstructor* ool);
void visitIsObject(LIsObject* lir);
void visitIsObjectAndBranch(LIsObjectAndBranch* lir);
void visitHasClass(LHasClass* lir);
- void visitAsmJSParameter(LAsmJSParameter* lir);
- void visitAsmJSParameterI64(LAsmJSParameterI64* lir);
+ void visitWasmParameter(LWasmParameter* lir);
+ void visitWasmParameterI64(LWasmParameterI64* lir);
void visitWasmReturn(LWasmReturn* ret);
void visitWasmReturnI64(LWasmReturnI64* ret);
void visitWasmReturnVoid(LWasmReturnVoid* ret);
void visitLexicalCheck(LLexicalCheck* ins);
void visitThrowRuntimeLexicalError(LThrowRuntimeLexicalError* ins);
void visitGlobalNameConflictsCheck(LGlobalNameConflictsCheck* ins);
void visitDebugger(LDebugger* ins);
void visitNewTarget(LNewTarget* ins);--- a/js/src/jit/Lowering.cpp
+++ b/js/src/jit/Lowering.cpp
@@ -4187,44 +4187,44 @@ LIRGenerator::visitWasmStoreGlobalVar(MW
MDefinition* value = ins->value();
if (value->type() == MIRType::Int64)
add(new(alloc()) LWasmStoreGlobalVarI64(useInt64RegisterAtStart(value)), ins);
else
add(new(alloc()) LWasmStoreGlobalVar(useRegisterAtStart(value)), ins);
}
void
-LIRGenerator::visitAsmJSParameter(MAsmJSParameter* ins)
+LIRGenerator::visitWasmParameter(MWasmParameter* ins)
{
ABIArg abi = ins->abi();
if (abi.argInRegister()) {
#if defined(JS_NUNBOX32)
if (abi.isGeneralRegPair()) {
- defineInt64Fixed(new(alloc()) LAsmJSParameterI64, ins,
+ defineInt64Fixed(new(alloc()) LWasmParameterI64, ins,
LInt64Allocation(LAllocation(AnyRegister(abi.gpr64().high)),
LAllocation(AnyRegister(abi.gpr64().low))));
return;
}
#endif
- defineFixed(new(alloc()) LAsmJSParameter, ins, LAllocation(abi.reg()));
+ defineFixed(new(alloc()) LWasmParameter, ins, LAllocation(abi.reg()));
return;
}
if (ins->type() == MIRType::Int64) {
MOZ_ASSERT(!abi.argInRegister());
- defineInt64Fixed(new(alloc()) LAsmJSParameterI64, ins,
+ defineInt64Fixed(new(alloc()) LWasmParameterI64, ins,
#if defined(JS_NUNBOX32)
LInt64Allocation(LArgument(abi.offsetFromArgBase() + INT64HIGH_OFFSET),
LArgument(abi.offsetFromArgBase() + INT64LOW_OFFSET))
#else
LInt64Allocation(LArgument(abi.offsetFromArgBase()))
#endif
);
} else {
MOZ_ASSERT(IsNumberType(ins->type()) || IsSimdType(ins->type()));
- defineFixed(new(alloc()) LAsmJSParameter, ins, LArgument(abi.offsetFromArgBase()));
+ defineFixed(new(alloc()) LWasmParameter, ins, LArgument(abi.offsetFromArgBase()));
}
}
void
LIRGenerator::visitWasmReturn(MWasmReturn* ins)
{
MDefinition* rval = ins->getOperand(0);
@@ -4266,25 +4266,25 @@ LIRGenerator::visitWasmReturnVoid(MWasmR
// Preserve the TLS pointer we were passed in `WasmTlsReg`.
MDefinition* tlsPtr = ins->getOperand(0);
lir->setOperand(0, useFixed(tlsPtr, WasmTlsReg));
add(lir);
}
void
-LIRGenerator::visitAsmJSPassStackArg(MAsmJSPassStackArg* ins)
+LIRGenerator::visitWasmStackArg(MWasmStackArg* ins)
{
if (ins->arg()->type() == MIRType::Int64) {
- add(new(alloc()) LAsmJSPassStackArgI64(useInt64OrConstantAtStart(ins->arg())), ins);
+ add(new(alloc()) LWasmStackArgI64(useInt64OrConstantAtStart(ins->arg())), ins);
} else if (IsFloatingPointType(ins->arg()->type()) || IsSimdType(ins->arg()->type())) {
MOZ_ASSERT(!ins->arg()->isEmittedAtUses());
- add(new(alloc()) LAsmJSPassStackArg(useRegisterAtStart(ins->arg())), ins);
+ add(new(alloc()) LWasmStackArg(useRegisterAtStart(ins->arg())), ins);
} else {
- add(new(alloc()) LAsmJSPassStackArg(useRegisterOrConstantAtStart(ins->arg())), ins);
+ add(new(alloc()) LWasmStackArg(useRegisterOrConstantAtStart(ins->arg())), ins);
}
}
void
LIRGenerator::visitWasmCall(MWasmCall* ins)
{
gen->setPerformsCall();
--- a/js/src/jit/Lowering.h
+++ b/js/src/jit/Lowering.h
@@ -286,20 +286,20 @@ class LIRGenerator : public LIRGenerator
void visitIsCallable(MIsCallable* ins);
void visitIsConstructor(MIsConstructor* ins);
void visitIsObject(MIsObject* ins);
void visitHasClass(MHasClass* ins);
void visitWasmAddOffset(MWasmAddOffset* ins);
void visitWasmBoundsCheck(MWasmBoundsCheck* ins);
void visitWasmLoadGlobalVar(MWasmLoadGlobalVar* ins);
void visitWasmStoreGlobalVar(MWasmStoreGlobalVar* ins);
- void visitAsmJSParameter(MAsmJSParameter* ins);
+ void visitWasmParameter(MWasmParameter* ins);
void visitWasmReturn(MWasmReturn* ins);
void visitWasmReturnVoid(MWasmReturnVoid* ins);
- void visitAsmJSPassStackArg(MAsmJSPassStackArg* ins);
+ void visitWasmStackArg(MWasmStackArg* ins);
void visitWasmCall(MWasmCall* ins);
void visitSetDOMProperty(MSetDOMProperty* ins);
void visitGetDOMProperty(MGetDOMProperty* ins);
void visitGetDOMMember(MGetDOMMember* ins);
void visitRecompileCheck(MRecompileCheck* ins);
void visitSimdBox(MSimdBox* ins);
void visitSimdUnbox(MSimdUnbox* ins);
void visitSimdUnaryArith(MSimdUnaryArith* ins);--- a/js/src/jit/MIR.h
+++ b/js/src/jit/MIR.h
@@ -13883,28 +13883,28 @@ class MWasmStoreGlobalVar
unsigned globalDataOffset() const { return globalDataOffset_; }
MDefinition* value() const { return getOperand(0); }
AliasSet getAliasSet() const override {
return AliasSet::Store(AliasSet::AsmJSGlobalVar);
}
};
-class MAsmJSParameter : public MNullaryInstruction
+class MWasmParameter : public MNullaryInstruction
{
ABIArg abi_;
- MAsmJSParameter(ABIArg abi, MIRType mirType)
+ MWasmParameter(ABIArg abi, MIRType mirType)
: abi_(abi)
{
setResultType(mirType);
}
public:
- INSTRUCTION_HEADER(AsmJSParameter)
+ INSTRUCTION_HEADER(WasmParameter)
TRIVIAL_NEW_WRAPPERS
ABIArg abi() const { return abi_; }
};
class MWasmReturn
: public MAryControlInstruction<2, 0>,
public NoTypePolicy::Data
@@ -13927,29 +13927,29 @@ class MWasmReturnVoid
initOperand(0, tlsPtr);
}
public:
INSTRUCTION_HEADER(WasmReturnVoid)
TRIVIAL_NEW_WRAPPERS
};
-class MAsmJSPassStackArg
+class MWasmStackArg
: public MUnaryInstruction,
public NoTypePolicy::Data
{
- MAsmJSPassStackArg(uint32_t spOffset, MDefinition* ins)
+ MWasmStackArg(uint32_t spOffset, MDefinition* ins)
: MUnaryInstruction(ins),
spOffset_(spOffset)
{}
uint32_t spOffset_;
public:
- INSTRUCTION_HEADER(AsmJSPassStackArg)
+ INSTRUCTION_HEADER(WasmStackArg)
TRIVIAL_NEW_WRAPPERS
NAMED_OPERANDS((0, arg))
uint32_t spOffset() const {
return spOffset_;
}
void incrementOffset(uint32_t inc) {
spOffset_ += inc;--- a/js/src/jit/MOpcodes.h
+++ b/js/src/jit/MOpcodes.h
@@ -282,18 +282,18 @@ namespace jit {
_(WasmUnsignedToDouble) \
_(WasmUnsignedToFloat32) \
_(AsmJSLoadHeap) \
_(AsmJSStoreHeap) \
_(WasmLoadGlobalVar) \
_(WasmStoreGlobalVar) \
_(WasmReturn) \
_(WasmReturnVoid) \
- _(AsmJSParameter) \
- _(AsmJSPassStackArg) \
+ _(WasmParameter) \
+ _(WasmStackArg) \
_(WasmCall) \
_(WasmSelect) \
_(WasmReinterpret) \
_(Rotate) \
_(NewDerivedTypedObject) \
_(RecompileCheck) \
_(AsmJSCompareExchangeHeap) \
_(AsmJSAtomicExchangeHeap) \--- a/js/src/jit/arm/CodeGenerator-arm.cpp
+++ b/js/src/jit/arm/CodeGenerator-arm.cpp
@@ -2913,19 +2913,19 @@ CodeGeneratorARM::visitAsmJSAtomicBinopC
masm.callWithABI(wasm::SymbolicAddress::AtomicFetchXor);
break;
default:
MOZ_CRASH("Unknown op");
}
}
void
-CodeGeneratorARM::visitAsmJSPassStackArg(LAsmJSPassStackArg* ins)
+CodeGeneratorARM::visitWasmStackArg(LWasmStackArg* ins)
{
- const MAsmJSPassStackArg* mir = ins->mir();
+ const MWasmStackArg* mir = ins->mir();
Address dst(StackPointer, mir->spOffset());
ScratchRegisterScope scratch(masm);
SecondScratchRegisterScope scratch2(masm);
if (ins->arg()->isConstant()) {
masm.ma_mov(Imm32(ToInt32(ins->arg())), scratch);
masm.ma_str(scratch, dst, scratch2);
} else {
@@ -3617,19 +3617,19 @@ CodeGeneratorARM::visitRotateI64(LRotate
if (mir->isLeftRotate())
masm.rotateLeft64(ToRegister(count), input, output, temp);
else
masm.rotateRight64(ToRegister(count), input, output, temp);
}
}
void
-CodeGeneratorARM::visitAsmJSPassStackArgI64(LAsmJSPassStackArgI64* ins)
+CodeGeneratorARM::visitWasmStackArgI64(LWasmStackArgI64* ins)
{
- const MAsmJSPassStackArg* mir = ins->mir();
+ const MWasmStackArg* mir = ins->mir();
Address dst(StackPointer, mir->spOffset());
if (IsConstant(ins->arg()))
masm.store64(Imm64(ToInt64(ins->arg())), dst);
else
masm.store64(ToRegister64(ins->arg()), dst);
}
void--- a/js/src/jit/arm/CodeGenerator-arm.h
+++ b/js/src/jit/arm/CodeGenerator-arm.h
@@ -173,17 +173,17 @@ class CodeGeneratorARM : public CodeGene
virtual void visitSubI64(LSubI64* lir);
virtual void visitMulI64(LMulI64* lir);
virtual void visitDivOrModI64(LDivOrModI64* lir);
virtual void visitUDivOrModI64(LUDivOrModI64* lir);
virtual void visitCompareI64(LCompareI64* lir);
virtual void visitCompareI64AndBranch(LCompareI64AndBranch* lir);
virtual void visitBitOpI64(LBitOpI64* lir);
virtual void visitRotateI64(LRotateI64* lir);
- virtual void visitAsmJSPassStackArgI64(LAsmJSPassStackArgI64* lir);
+ virtual void visitWasmStackArgI64(LWasmStackArgI64* lir);
virtual void visitWasmSelectI64(LWasmSelectI64* lir);
virtual void visitWasmReinterpretFromI64(LWasmReinterpretFromI64* lir);
virtual void visitWasmReinterpretToI64(LWasmReinterpretToI64* lir);
virtual void visitPopcntI64(LPopcntI64* ins);
virtual void visitClzI64(LClzI64* ins);
virtual void visitCtzI64(LCtzI64* ins);
virtual void visitNotI64(LNotI64* ins);
virtual void visitWasmTruncateToInt64(LWasmTruncateToInt64* ins);
@@ -255,17 +255,17 @@ class CodeGeneratorARM : public CodeGene
void visitAsmJSStoreHeap(LAsmJSStoreHeap* ins);
void visitAsmJSCompareExchangeHeap(LAsmJSCompareExchangeHeap* ins);
void visitAsmJSCompareExchangeCallout(LAsmJSCompareExchangeCallout* ins);
void visitAsmJSAtomicExchangeHeap(LAsmJSAtomicExchangeHeap* ins);
void visitAsmJSAtomicExchangeCallout(LAsmJSAtomicExchangeCallout* ins);
void visitAsmJSAtomicBinopHeap(LAsmJSAtomicBinopHeap* ins);
void visitAsmJSAtomicBinopHeapForEffect(LAsmJSAtomicBinopHeapForEffect* ins);
void visitAsmJSAtomicBinopCallout(LAsmJSAtomicBinopCallout* ins);
- void visitAsmJSPassStackArg(LAsmJSPassStackArg* ins);
+ void visitWasmStackArg(LWasmStackArg* ins);
void visitWasmTruncateToInt32(LWasmTruncateToInt32* ins);
void visitOutOfLineWasmTruncateCheck(OutOfLineWasmTruncateCheck* ool);
void visitCopySignD(LCopySignD* ins);
void visitCopySignF(LCopySignF* ins);
void visitMemoryBarrier(LMemoryBarrier* ins);
void generateInvalidateEpilogue();--- a/js/src/jit/arm64/CodeGenerator-arm64.cpp
+++ b/js/src/jit/arm64/CodeGenerator-arm64.cpp
@@ -669,19 +669,19 @@ CodeGeneratorARM64::visitAsmJSCompareExc
void
CodeGeneratorARM64::visitAsmJSAtomicBinopHeap(LAsmJSAtomicBinopHeap* ins)
{
MOZ_CRASH("visitAsmJSAtomicBinopHeap");
}
void
-CodeGeneratorARM64::visitAsmJSPassStackArg(LAsmJSPassStackArg* ins)
+CodeGeneratorARM64::visitWasmStackArg(LWasmStackArg* ins)
{
- MOZ_CRASH("visitAsmJSPassStackArg");
+ MOZ_CRASH("visitWasmStackArg");
}
void
CodeGeneratorARM64::visitUDiv(LUDiv* ins)
{
MOZ_CRASH("visitUDiv");
}
--- a/js/src/jit/arm64/CodeGenerator-arm64.h
+++ b/js/src/jit/arm64/CodeGenerator-arm64.h
@@ -199,17 +199,17 @@ class CodeGeneratorARM64 : public CodeGe
void visitCompareExchangeTypedArrayElement(LCompareExchangeTypedArrayElement* lir);
void visitAtomicExchangeTypedArrayElement(LAtomicExchangeTypedArrayElement* lir);
void visitWasmCall(LWasmCall* ins);
void visitWasmCallI64(LWasmCallI64* ins);
void visitAsmJSLoadHeap(LAsmJSLoadHeap* ins);
void visitAsmJSStoreHeap(LAsmJSStoreHeap* ins);
void visitAsmJSCompareExchangeHeap(LAsmJSCompareExchangeHeap* ins);
void visitAsmJSAtomicBinopHeap(LAsmJSAtomicBinopHeap* ins);
- void visitAsmJSPassStackArg(LAsmJSPassStackArg* ins);
+ void visitWasmStackArg(LWasmStackArg* ins);
void visitWasmLoadGlobalVar(LWasmLoadGlobalVar* ins);
void visitWasmStoreGlobalVar(LWasmStoreGlobalVar* ins);
void generateInvalidateEpilogue();
void setReturnDoubleRegs(LiveRegisterSet* regs);
--- a/js/src/jit/mips-shared/CodeGenerator-mips-shared.cpp
+++ b/js/src/jit/mips-shared/CodeGenerator-mips-shared.cpp
@@ -2303,35 +2303,35 @@ CodeGeneratorMIPSShared::visitAsmJSAtomi
atomicBinopToTypedIntArray(op, vt, Imm32(ToInt32(value)), srcAddr, flagTemp,
valueTemp, offsetTemp, maskTemp);
else
atomicBinopToTypedIntArray(op, vt, ToRegister(value), srcAddr, flagTemp,
valueTemp, offsetTemp, maskTemp);
}
void
-CodeGeneratorMIPSShared::visitAsmJSPassStackArg(LAsmJSPassStackArg* ins)
+CodeGeneratorMIPSShared::visitWasmStackArg(LWasmStackArg* ins)
{
- const MAsmJSPassStackArg* mir = ins->mir();
+ const MWasmStackArg* mir = ins->mir();
if (ins->arg()->isConstant()) {
masm.storePtr(ImmWord(ToInt32(ins->arg())), Address(StackPointer, mir->spOffset()));
} else {
if (ins->arg()->isGeneralReg()) {
masm.storePtr(ToRegister(ins->arg()), Address(StackPointer, mir->spOffset()));
} else {
masm.storeDouble(ToFloatRegister(ins->arg()).doubleOverlay(),
Address(StackPointer, mir->spOffset()));
}
}
}
void
-CodeGeneratorMIPSShared::visitAsmJSPassStackArgI64(LAsmJSPassStackArgI64* ins)
+CodeGeneratorMIPSShared::visitWasmStackArgI64(LWasmStackArgI64* ins)
{
- const MAsmJSPassStackArg* mir = ins->mir();
+ const MWasmStackArg* mir = ins->mir();
Address dst(StackPointer, mir->spOffset());
if (IsConstant(ins->arg()))
masm.store64(Imm64(ToInt64(ins->arg())), dst);
else
masm.store64(ToRegister64(ins->arg()), dst);
}
void--- a/js/src/jit/mips-shared/CodeGenerator-mips-shared.h
+++ b/js/src/jit/mips-shared/CodeGenerator-mips-shared.h
@@ -224,18 +224,18 @@ class CodeGeneratorMIPSShared : public C
void visitWasmAddOffset(LWasmAddOffset* 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 visitAsmJSPassStackArg(LAsmJSPassStackArg* ins);
- void visitAsmJSPassStackArgI64(LAsmJSPassStackArgI64* ins);
+ void visitWasmStackArg(LWasmStackArg* ins);
+ void visitWasmStackArgI64(LWasmStackArgI64* ins);
void visitWasmSelect(LWasmSelect* ins);
void visitWasmReinterpret(LWasmReinterpret* ins);
void visitMemoryBarrier(LMemoryBarrier* ins);
void visitAtomicTypedArrayElementBinop(LAtomicTypedArrayElementBinop* lir);
void visitAtomicTypedArrayElementBinopForEffect(LAtomicTypedArrayElementBinopForEffect* lir);
void visitCompareExchangeTypedArrayElement(LCompareExchangeTypedArrayElement* lir);
void visitAtomicExchangeTypedArrayElement(LAtomicExchangeTypedArrayElement* lir);--- a/js/src/jit/mips32/Assembler-mips32.h
+++ b/js/src/jit/mips32/Assembler-mips32.h
@@ -20,17 +20,17 @@ static constexpr Register CallTempReg5 =
static constexpr Register CallTempNonArgRegs[] = { t0, t1, t2, t3, t4 };
static const uint32_t NumCallTempNonArgRegs = mozilla::ArrayLength(CallTempNonArgRegs);
class ABIArgGenerator
{
unsigned usedArgSlots_;
unsigned firstArgFloatSize_;
// Note: This is not compliant with the system ABI. The Lowering phase
- // expects to lower an MAsmJSParameter to only one register.
+ // expects to lower an MWasmParameter to only one register.
bool useGPRForFloats_;
ABIArg current_;
public:
ABIArgGenerator();
ABIArg next(MIRType argType);
ABIArg& current() { return current_; }
--- a/js/src/jit/shared/LIR-shared.h
+++ b/js/src/jit/shared/LIR-shared.h
@@ -8357,26 +8357,26 @@ class LWasmStoreGlobalVarI64 : public LI
}
static const uint32_t InputIndex = 0;
const LInt64Allocation value() {
return getInt64Operand(InputIndex);
}
};
-class LAsmJSParameter : public LInstructionHelper<1, 0, 0>
-{
- public:
- LIR_HEADER(AsmJSParameter);
-};
-
-class LAsmJSParameterI64 : public LInstructionHelper<INT64_PIECES, 0, 0>
-{
- public:
- LIR_HEADER(AsmJSParameterI64);
+class LWasmParameter : public LInstructionHelper<1, 0, 0>
+{
+ public:
+ LIR_HEADER(WasmParameter);
+};
+
+class LWasmParameterI64 : public LInstructionHelper<INT64_PIECES, 0, 0>
+{
+ public:
+ LIR_HEADER(WasmParameterI64);
};
class LWasmReturn : public LInstructionHelper<0, 2, 0>
{
public:
LIR_HEADER(WasmReturn);
};
@@ -8391,40 +8391,40 @@ class LWasmReturnI64 : public LInstructi
};
class LWasmReturnVoid : public LInstructionHelper<0, 1, 0>
{
public:
LIR_HEADER(WasmReturnVoid);
};
-class LAsmJSPassStackArg : public LInstructionHelper<0, 1, 0>
-{
- public:
- LIR_HEADER(AsmJSPassStackArg);
- explicit LAsmJSPassStackArg(const LAllocation& arg) {
+class LWasmStackArg : public LInstructionHelper<0, 1, 0>
+{
+ public:
+ LIR_HEADER(WasmStackArg);
+ explicit LWasmStackArg(const LAllocation& arg) {
setOperand(0, arg);
}
- MAsmJSPassStackArg* mir() const {
- return mirRaw()->toAsmJSPassStackArg();
+ MWasmStackArg* mir() const {
+ return mirRaw()->toWasmStackArg();
}
const LAllocation* arg() {
return getOperand(0);
}
};
-class LAsmJSPassStackArgI64 : public LInstructionHelper<0, INT64_PIECES, 0>
-{
- public:
- LIR_HEADER(AsmJSPassStackArgI64);
- explicit LAsmJSPassStackArgI64(const LInt64Allocation& arg) {
+class LWasmStackArgI64 : public LInstructionHelper<0, INT64_PIECES, 0>
+{
+ public:
+ LIR_HEADER(WasmStackArgI64);
+ explicit LWasmStackArgI64(const LInt64Allocation& arg) {
setInt64Operand(0, arg);
}
- MAsmJSPassStackArg* mir() const {
- return mirRaw()->toAsmJSPassStackArg();
+ MWasmStackArg* mir() const {
+ return mirRaw()->toWasmStackArg();
}
const LInt64Allocation arg() {
return getInt64Operand(0);
}
};
class LWasmCallBase : public LInstruction
{--- a/js/src/jit/shared/LOpcodes-shared.h
+++ b/js/src/jit/shared/LOpcodes-shared.h
@@ -398,23 +398,23 @@
_(WasmStore) \
_(WasmStoreI64) \
_(WasmLoadGlobalVar) \
_(WasmLoadGlobalVarI64) \
_(WasmStoreGlobalVar) \
_(WasmStoreGlobalVarI64) \
_(AsmJSLoadHeap) \
_(AsmJSStoreHeap) \
- _(AsmJSParameter) \
- _(AsmJSParameterI64) \
+ _(WasmParameter) \
+ _(WasmParameterI64) \
_(WasmReturn) \
_(WasmReturnI64) \
_(WasmReturnVoid) \
- _(AsmJSPassStackArg) \
- _(AsmJSPassStackArgI64) \
+ _(WasmStackArg) \
+ _(WasmStackArgI64) \
_(WasmCall) \
_(WasmCallI64) \
_(AsmJSCompareExchangeHeap) \
_(AsmJSAtomicExchangeHeap) \
_(AsmJSAtomicBinopHeap) \
_(AsmJSAtomicBinopHeapForEffect)\
_(WasmUint32ToDouble) \
_(WasmUint32ToFloat32) \--- a/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp
+++ b/js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp
@@ -278,19 +278,19 @@ CodeGeneratorX86Shared::visitCompareFAnd
if (comp->cmpMir()->operandsAreNeverNaN())
nanCond = Assembler::NaN_HandledByCond;
masm.compareFloat(cond, lhs, rhs);
emitBranch(Assembler::ConditionFromDoubleCondition(cond), comp->ifTrue(), comp->ifFalse(), nanCond);
}
void
-CodeGeneratorX86Shared::visitAsmJSPassStackArg(LAsmJSPassStackArg* ins)
+CodeGeneratorX86Shared::visitWasmStackArg(LWasmStackArg* ins)
{
- const MAsmJSPassStackArg* mir = ins->mir();
+ const MWasmStackArg* mir = ins->mir();
Address dst(StackPointer, mir->spOffset());
if (ins->arg()->isConstant()) {
masm.storePtr(ImmWord(ToInt32(ins->arg())), dst);
} else if (ins->arg()->isGeneralReg()) {
masm.storePtr(ToRegister(ins->arg()), dst);
} else {
switch (mir->input()->type()) {
case MIRType::Double:
@@ -303,24 +303,24 @@ CodeGeneratorX86Shared::visitAsmJSPassSt
case MIRType::Bool32x4:
masm.storeAlignedSimd128Int(ToFloatRegister(ins->arg()), dst);
return;
case MIRType::Float32x4:
masm.storeAlignedSimd128Float(ToFloatRegister(ins->arg()), dst);
return;
default: break;
}
- MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE("unexpected mir type in AsmJSPassStackArg");
+ MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE("unexpected mir type in WasmStackArg");
}
}
void
-CodeGeneratorX86Shared::visitAsmJSPassStackArgI64(LAsmJSPassStackArgI64* ins)
+CodeGeneratorX86Shared::visitWasmStackArgI64(LWasmStackArgI64* ins)
{
- const MAsmJSPassStackArg* mir = ins->mir();
+ const MWasmStackArg* mir = ins->mir();
Address dst(StackPointer, mir->spOffset());
if (IsConstant(ins->arg()))
masm.store64(Imm64(ToInt64(ins->arg())), dst);
else
masm.store64(ToRegister64(ins->arg()), dst);
}
void--- a/js/src/jit/x86-shared/CodeGenerator-x86-shared.h
+++ b/js/src/jit/x86-shared/CodeGenerator-x86-shared.h
@@ -237,18 +237,18 @@ class CodeGeneratorX86Shared : public Co
virtual void visitRound(LRound* lir);
virtual void visitRoundF(LRoundF* lir);
virtual void visitGuardShape(LGuardShape* guard);
virtual void visitGuardObjectGroup(LGuardObjectGroup* guard);
virtual void visitGuardClass(LGuardClass* guard);
virtual void visitEffectiveAddress(LEffectiveAddress* ins);
virtual void visitUDivOrMod(LUDivOrMod* ins);
virtual void visitUDivOrModConstant(LUDivOrModConstant *ins);
- virtual void visitAsmJSPassStackArg(LAsmJSPassStackArg* ins);
- virtual void visitAsmJSPassStackArgI64(LAsmJSPassStackArgI64* ins);
+ virtual void visitWasmStackArg(LWasmStackArg* ins);
+ virtual void visitWasmStackArgI64(LWasmStackArgI64* ins);
virtual void visitWasmSelect(LWasmSelect* ins);
virtual void visitWasmReinterpret(LWasmReinterpret* lir);
virtual void visitMemoryBarrier(LMemoryBarrier* ins);
virtual void visitWasmAddOffset(LWasmAddOffset* lir);
virtual void visitWasmTruncateToInt32(LWasmTruncateToInt32* lir);
virtual void visitAtomicTypedArrayElementBinop(LAtomicTypedArrayElementBinop* lir);
virtual void visitAtomicTypedArrayElementBinopForEffect(LAtomicTypedArrayElementBinopForEffect* lir);
virtual void visitCompareExchangeTypedArrayElement(LCompareExchangeTypedArrayElement* lir);