mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backed out changesets 37e7cae3d8c8 and 3ccbb670a699 (bug 898963) for Windows debug bustage.
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen
parent
e32592c81b
commit
780fb4fae2
@ -6024,20 +6024,15 @@ StackArgBytes(const VectorT &argTypes)
|
||||
return iter.stackBytesConsumedSoFar();
|
||||
}
|
||||
|
||||
static unsigned
|
||||
StackDecrementForCall(MacroAssembler &masm, unsigned bytesToPush)
|
||||
{
|
||||
// Include extra padding so that, after pushing the bytesToPush,
|
||||
// the stack is aligned for a call instruction.
|
||||
unsigned alreadyPushed = AlignmentAtPrologue + masm.framePushed();
|
||||
return AlignBytes(alreadyPushed + bytesToPush, StackAlignment) - alreadyPushed;
|
||||
}
|
||||
|
||||
template <class VectorT>
|
||||
static unsigned
|
||||
StackDecrementForCall(MacroAssembler &masm, const VectorT &argTypes, unsigned extraBytes = 0)
|
||||
{
|
||||
return StackDecrementForCall(masm, StackArgBytes(argTypes) + extraBytes);
|
||||
// Include extra padding so that, after pushing the arguments and
|
||||
// extraBytes, the stack is aligned for a call instruction.
|
||||
unsigned argBytes = StackArgBytes(argTypes);
|
||||
unsigned alreadyPushed = AlignmentAtPrologue + masm.framePushed();
|
||||
return AlignBytes(alreadyPushed + extraBytes + argBytes, StackAlignment) - alreadyPushed;
|
||||
}
|
||||
|
||||
static const unsigned FramePushedAfterSave = NonVolatileRegs.gprs().size() * sizeof(intptr_t) +
|
||||
@ -6305,10 +6300,8 @@ GenerateFFIInterpreterExit(ModuleCompiler &m, const ModuleCompiler::ExitDescript
|
||||
masm.align(CodeAlignment);
|
||||
m.setInterpExitOffset(exitIndex);
|
||||
masm.setFramePushed(0);
|
||||
#if defined(JS_CODEGEN_ARM)
|
||||
masm.Push(lr);
|
||||
#endif
|
||||
|
||||
#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
|
||||
MIRType typeArray[] = { MIRType_Pointer, // cx
|
||||
MIRType_Pointer, // exitDatum
|
||||
MIRType_Int32, // argc
|
||||
@ -6323,7 +6316,7 @@ GenerateFFIInterpreterExit(ModuleCompiler &m, const ModuleCompiler::ExitDescript
|
||||
masm.reserveStack(stackDec);
|
||||
|
||||
// Fill the argument array.
|
||||
unsigned offsetToCallerStackArgs = AlignmentAtPrologue + masm.framePushed();
|
||||
unsigned offsetToCallerStackArgs = NativeFrameSize + masm.framePushed();
|
||||
unsigned offsetToArgv = StackArgBytes(invokeArgTypes);
|
||||
Register scratch = ABIArgGenerator::NonArgReturnVolatileReg0;
|
||||
FillArgumentArray(m, exit.sig().args(), offsetToArgv, offsetToCallerStackArgs, scratch);
|
||||
@ -6394,6 +6387,59 @@ GenerateFFIInterpreterExit(ModuleCompiler &m, const ModuleCompiler::ExitDescript
|
||||
// registers to restore.
|
||||
masm.freeStack(stackDec);
|
||||
masm.ret();
|
||||
#else
|
||||
const unsigned arrayLength = Max<size_t>(1, exit.sig().args().length());
|
||||
const unsigned arraySize = arrayLength * sizeof(Value);
|
||||
const unsigned reserveSize = AlignBytes(arraySize, StackAlignment) +
|
||||
ShadowStackSpace;
|
||||
const unsigned callerArgsOffset = reserveSize + NativeFrameSize + sizeof(int32_t);
|
||||
masm.setFramePushed(0);
|
||||
masm.Push(lr);
|
||||
masm.reserveStack(reserveSize + sizeof(int32_t));
|
||||
|
||||
// Store arguments
|
||||
FillArgumentArray(m, exit.sig().args(), ShadowStackSpace, callerArgsOffset, IntArgReg0);
|
||||
|
||||
// argument 0: cx
|
||||
Register activation = IntArgReg3;
|
||||
LoadAsmJSActivationIntoRegister(masm, activation);
|
||||
|
||||
LoadJSContextFromActivation(masm, activation, IntArgReg0);
|
||||
|
||||
// argument 1: exitIndex
|
||||
masm.mov(ImmWord(exitIndex), IntArgReg1);
|
||||
|
||||
// argument 2: argc
|
||||
masm.mov(ImmWord(exit.sig().args().length()), IntArgReg2);
|
||||
|
||||
// argument 3: argv
|
||||
Address argv(StackPointer, ShadowStackSpace);
|
||||
masm.lea(Operand(argv), IntArgReg3);
|
||||
|
||||
AssertStackAlignment(masm);
|
||||
switch (exit.sig().retType().which()) {
|
||||
case RetType::Void:
|
||||
masm.call(AsmJSImm_InvokeFromAsmJS_Ignore);
|
||||
masm.branchTest32(Assembler::Zero, ReturnReg, ReturnReg, throwLabel);
|
||||
break;
|
||||
case RetType::Signed:
|
||||
masm.call(AsmJSImm_InvokeFromAsmJS_ToInt32);
|
||||
masm.branchTest32(Assembler::Zero, ReturnReg, ReturnReg, throwLabel);
|
||||
masm.unboxInt32(argv, ReturnReg);
|
||||
break;
|
||||
case RetType::Double:
|
||||
masm.call(AsmJSImm_InvokeFromAsmJS_ToNumber);
|
||||
masm.branchTest32(Assembler::Zero, ReturnReg, ReturnReg, throwLabel);
|
||||
masm.loadDouble(argv, ReturnFloatReg);
|
||||
break;
|
||||
case RetType::Float:
|
||||
MOZ_ASSUME_UNREACHABLE("Float32 shouldn't be returned from a FFI");
|
||||
break;
|
||||
}
|
||||
|
||||
masm.freeStack(reserveSize + sizeof(int32_t));
|
||||
masm.ret();
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
@ -6406,8 +6452,11 @@ GenerateOOLConvert(ModuleCompiler &m, RetType retType, Label *throwLabel)
|
||||
MIRTypeVector callArgTypes(m.cx());
|
||||
callArgTypes.infallibleAppend(typeArray, ArrayLength(typeArray));
|
||||
|
||||
// The stack is assumed to be aligned. The frame is allocated by GenerateFFIIonExit and
|
||||
// the stack usage here needs to kept in sync with GenerateFFIIonExit.
|
||||
// Reserve space for a call to InvokeFromAsmJS_* and an array of values
|
||||
// passed to this FFI call.
|
||||
unsigned arraySize = sizeof(Value);
|
||||
unsigned stackDec = StackDecrementForCall(masm, callArgTypes, arraySize);
|
||||
masm.reserveStack(stackDec);
|
||||
|
||||
// Store value
|
||||
unsigned offsetToArgv = StackArgBytes(callArgTypes);
|
||||
@ -6455,6 +6504,8 @@ GenerateOOLConvert(ModuleCompiler &m, RetType retType, Label *throwLabel)
|
||||
default:
|
||||
MOZ_ASSUME_UNREACHABLE("Unsupported convert type");
|
||||
}
|
||||
|
||||
masm.freeStack(stackDec);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -6466,57 +6517,29 @@ GenerateFFIIonExit(ModuleCompiler &m, const ModuleCompiler::ExitDescriptor &exit
|
||||
m.setIonExitOffset(exitIndex);
|
||||
masm.setFramePushed(0);
|
||||
|
||||
#if defined(JS_CODEGEN_X64)
|
||||
masm.Push(HeapReg);
|
||||
#elif defined(JS_CODEGEN_ARM)
|
||||
// The lr register holds the return address and needs to be saved. The GlobalReg
|
||||
// (r10) and HeapReg (r11) also need to be restored before returning to asm.js code.
|
||||
// The NANReg also needs to be restored, but is a constant and is reloaded before
|
||||
// returning to asm.js code.
|
||||
masm.PushRegsInMask(RegisterSet(GeneralRegisterSet((1<<GlobalReg.code()) |
|
||||
(1<<HeapReg.code()) |
|
||||
(1<<lr.code())),
|
||||
FloatRegisterSet(uint32_t(0))));
|
||||
#endif
|
||||
|
||||
// The stack frame is used for the call into Ion and also for calls into C for OOL
|
||||
// conversion of the result. A frame large enough for both is allocated.
|
||||
//
|
||||
// Arguments to the Ion function are in the following order on the stack:
|
||||
// descriptor | callee | argc | this | arg1 | arg2 | ...
|
||||
unsigned argBytes = 3 * sizeof(size_t) + (1 + exit.sig().args().length()) * sizeof(Value);
|
||||
|
||||
// On ARM, we call with ma_callIonNoPush which, following the Ion calling convention,
|
||||
// stores the return address into *sp. This means we need to include an extra word of
|
||||
// space before the arguments in the stack allocation. (On x86/x64, the call
|
||||
// instruction does the push itself and the ABI just requires us to be aligned before
|
||||
// the call instruction.)
|
||||
unsigned offsetToArgs = 0;
|
||||
RegisterSet restoreSet = RegisterSet::Intersect(RegisterSet::All(),
|
||||
RegisterSet::Not(RegisterSet::Volatile()));
|
||||
#if defined(JS_CODEGEN_ARM)
|
||||
offsetToArgs += sizeof(size_t);
|
||||
masm.Push(lr);
|
||||
#endif
|
||||
masm.PushRegsInMask(restoreSet);
|
||||
|
||||
unsigned stackDecForIonCall = StackDecrementForCall(masm, argBytes + offsetToArgs);
|
||||
// Arguments are in the following order on the stack:
|
||||
// descriptor | callee | argc | this | arg1 | arg2 | ...
|
||||
|
||||
// Reserve space for a call to AsmJSImm_CoerceInPlace_* and an array of values used by
|
||||
// OOLConvert which reuses the same frame. This code needs to be kept in sync with the
|
||||
// stack usage in GenerateOOLConvert.
|
||||
MIRType typeArray[] = { MIRType_Pointer, MIRType_Pointer }; // cx, argv
|
||||
MIRTypeVector callArgTypes(m.cx());
|
||||
callArgTypes.infallibleAppend(typeArray, ArrayLength(typeArray));
|
||||
unsigned stackDecForOOLCall = StackDecrementForCall(masm, callArgTypes, sizeof(Value));
|
||||
|
||||
// Allocate a frame large enough for both of the above calls.
|
||||
unsigned stackDec = Max(stackDecForIonCall, stackDecForOOLCall);
|
||||
|
||||
masm.reserveStack(stackDec);
|
||||
AssertStackAlignment(masm);
|
||||
// Reserve and align space for the arguments
|
||||
MIRTypeVector emptyVector(m.cx());
|
||||
unsigned argBytes = 3 * sizeof(size_t) + (1 + exit.sig().args().length()) * sizeof(Value);
|
||||
unsigned extraBytes = 0;
|
||||
#if defined(JS_CODEGEN_ARM)
|
||||
extraBytes += sizeof(size_t);
|
||||
#endif
|
||||
unsigned stackDec = StackDecrementForCall(masm, emptyVector, argBytes + extraBytes);
|
||||
masm.reserveStack(stackDec - extraBytes);
|
||||
|
||||
// 1. Descriptor
|
||||
size_t argOffset = offsetToArgs;
|
||||
uint32_t descriptor = MakeFrameDescriptor(masm.framePushed(), JitFrame_Entry);
|
||||
masm.storePtr(ImmWord(uintptr_t(descriptor)), Address(StackPointer, argOffset));
|
||||
argOffset += sizeof(size_t);
|
||||
uint32_t descriptor = MakeFrameDescriptor(masm.framePushed() + extraBytes, JitFrame_Entry);
|
||||
masm.storePtr(ImmWord(uintptr_t(descriptor)), Address(StackPointer, 0));
|
||||
|
||||
// 2. Callee
|
||||
Register callee = ABIArgGenerator::NonArgReturnVolatileReg0;
|
||||
@ -6538,26 +6561,24 @@ GenerateFFIIonExit(ModuleCompiler &m, const ModuleCompiler::ExitDescriptor &exit
|
||||
masm.loadPtr(Address(callee, offsetof(AsmJSModule::ExitDatum, fun)), callee);
|
||||
|
||||
// 2.3. Save callee
|
||||
masm.storePtr(callee, Address(StackPointer, argOffset));
|
||||
argOffset += sizeof(size_t);
|
||||
masm.storePtr(callee, Address(StackPointer, sizeof(size_t)));
|
||||
|
||||
// 3. Argc
|
||||
unsigned argc = exit.sig().args().length();
|
||||
masm.storePtr(ImmWord(uintptr_t(argc)), Address(StackPointer, argOffset));
|
||||
argOffset += sizeof(size_t);
|
||||
masm.storePtr(ImmWord(uintptr_t(argc)), Address(StackPointer, 2 * sizeof(size_t)));
|
||||
|
||||
// 4. |this| value
|
||||
masm.storeValue(UndefinedValue(), Address(StackPointer, argOffset));
|
||||
argOffset += sizeof(Value);
|
||||
masm.storeValue(UndefinedValue(), Address(StackPointer, 3 * sizeof(size_t)));
|
||||
|
||||
// 5. Fill the arguments
|
||||
unsigned offsetToArgs = 3 * sizeof(size_t) + sizeof(Value);
|
||||
unsigned offsetToCallerStackArgs = masm.framePushed();
|
||||
#if defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)
|
||||
offsetToCallerStackArgs += NativeFrameSize;
|
||||
#else
|
||||
offsetToCallerStackArgs += ShadowStackSpace;
|
||||
#endif
|
||||
FillArgumentArray(m, exit.sig().args(), argOffset, offsetToCallerStackArgs, scratch);
|
||||
argOffset += exit.sig().args().length() * sizeof(Value);
|
||||
JS_ASSERT(argOffset == offsetToArgs + argBytes);
|
||||
FillArgumentArray(m, exit.sig().args(), offsetToArgs, offsetToCallerStackArgs, scratch);
|
||||
|
||||
// Get the pointer to the ion code
|
||||
Label done, oolConvert;
|
||||
@ -6569,94 +6590,36 @@ GenerateFFIIonExit(ModuleCompiler &m, const ModuleCompiler::ExitDescriptor &exit
|
||||
masm.branchIfFunctionHasNoScript(callee, &ionFailed);
|
||||
#endif
|
||||
|
||||
masm.loadPtr(Address(callee, JSFunction::offsetOfNativeOrScript()), callee);
|
||||
masm.loadBaselineOrIonNoArgCheck(callee, callee, SequentialExecution, maybeDebugBreakpoint);
|
||||
masm.loadPtr(Address(callee, JSFunction::offsetOfNativeOrScript()), scratch);
|
||||
masm.loadBaselineOrIonNoArgCheck(scratch, scratch, SequentialExecution, maybeDebugBreakpoint);
|
||||
|
||||
AssertStackAlignment(masm);
|
||||
|
||||
{
|
||||
// Enable Activation.
|
||||
//
|
||||
// This sequence requires four registers, and needs to preserve the 'callee'
|
||||
// register, so there are five live registers.
|
||||
JS_ASSERT(callee == AsmJSIonExitRegCallee);
|
||||
Register reg0 = AsmJSIonExitRegE0;
|
||||
Register reg1 = AsmJSIonExitRegE1;
|
||||
Register reg2 = AsmJSIonExitRegE2;
|
||||
Register reg3 = AsmJSIonExitRegE3;
|
||||
|
||||
LoadAsmJSActivationIntoRegister(masm, reg0);
|
||||
|
||||
// The following is inlined:
|
||||
// JSContext *cx = activation->cx();
|
||||
// Activation *act = cx->mainThread().activation();
|
||||
// act.active_ = true;
|
||||
// act.prevIonTop_ = cx->mainThread().ionTop;
|
||||
// act.prevJitJSContext_ = cx->mainThread().jitJSContext;
|
||||
// cx->mainThread().jitJSContext = cx;
|
||||
// On the ARM store8() uses the secondScratchReg (lr) as a temp.
|
||||
size_t offsetOfActivation = offsetof(JSRuntime, mainThread) +
|
||||
PerThreadData::offsetOfActivation();
|
||||
size_t offsetOfIonTop = offsetof(JSRuntime, mainThread) + offsetof(PerThreadData, ionTop);
|
||||
size_t offsetOfJitJSContext = offsetof(JSRuntime, mainThread) +
|
||||
offsetof(PerThreadData, jitJSContext);
|
||||
masm.loadPtr(Address(reg0, AsmJSActivation::offsetOfContext()), reg3);
|
||||
masm.loadPtr(Address(reg3, JSContext::offsetOfRuntime()), reg0);
|
||||
masm.loadPtr(Address(reg0, offsetOfActivation), reg1);
|
||||
masm.store8(Imm32(1), Address(reg1, JitActivation::offsetOfActiveUint8()));
|
||||
masm.loadPtr(Address(reg0, offsetOfIonTop), reg2);
|
||||
masm.storePtr(reg2, Address(reg1, JitActivation::offsetOfPrevIonTop()));
|
||||
masm.loadPtr(Address(reg0, offsetOfJitJSContext), reg2);
|
||||
masm.storePtr(reg2, Address(reg1, JitActivation::offsetOfPrevJitJSContext()));
|
||||
masm.storePtr(reg3, Address(reg0, offsetOfJitJSContext));
|
||||
}
|
||||
LoadAsmJSActivationIntoRegister(masm, callee);
|
||||
masm.push(scratch);
|
||||
masm.setupUnalignedABICall(1, scratch);
|
||||
masm.passABIArg(callee);
|
||||
masm.callWithABI(AsmJSImm_EnableActivationFromAsmJS);
|
||||
masm.pop(scratch);
|
||||
|
||||
// 2. Call
|
||||
AssertStackAlignment(masm);
|
||||
#if defined(JS_CODEGEN_ARM)
|
||||
masm.ma_callIonNoPush(callee);
|
||||
// The return address has been popped from the stack, so adjust the stack
|
||||
// without changing the frame-pushed counter to keep the stack aligned.
|
||||
masm.subPtr(Imm32(4), sp);
|
||||
#else
|
||||
masm.callIon(callee);
|
||||
#if defined(JS_CODEGEN_ARM) && defined(DEBUG)
|
||||
// ARM still needs to push, before stack is aligned
|
||||
masm.Push(scratch);
|
||||
#endif
|
||||
AssertStackAlignment(masm);
|
||||
#if defined(JS_CODEGEN_ARM) && defined(DEBUG)
|
||||
masm.freeStack(sizeof(size_t));
|
||||
#endif
|
||||
masm.callIon(scratch);
|
||||
masm.freeStack(stackDec - extraBytes);
|
||||
|
||||
{
|
||||
// Disable Activation.
|
||||
//
|
||||
// This sequence needs three registers, and must preserve the JSReturnReg_Data and
|
||||
// JSReturnReg_Type, so there are five live registers.
|
||||
JS_ASSERT(JSReturnReg_Data == AsmJSIonExitRegReturnData);
|
||||
JS_ASSERT(JSReturnReg_Type == AsmJSIonExitRegReturnType);
|
||||
Register reg0 = AsmJSIonExitRegD0;
|
||||
Register reg1 = AsmJSIonExitRegD1;
|
||||
Register reg2 = AsmJSIonExitRegD2;
|
||||
|
||||
LoadAsmJSActivationIntoRegister(masm, reg0);
|
||||
|
||||
// The following is inlined:
|
||||
// JSContext *cx = activation->cx();
|
||||
// Activation *act = cx->mainThread().activation();
|
||||
// act.active_ = false;
|
||||
// cx->mainThread().ionTop = prevIonTop_;
|
||||
// cx->mainThread().jitJSContext = prevJitJSContext_;
|
||||
// On the ARM store8() uses the secondScratchReg (lr) as a temp.
|
||||
size_t offsetOfActivation = offsetof(JSRuntime, mainThread) +
|
||||
PerThreadData::offsetOfActivation();
|
||||
size_t offsetOfIonTop = offsetof(JSRuntime, mainThread) + offsetof(PerThreadData, ionTop);
|
||||
size_t offsetOfJitJSContext = offsetof(JSRuntime, mainThread) +
|
||||
offsetof(PerThreadData, jitJSContext);
|
||||
masm.loadPtr(Address(reg0, AsmJSActivation::offsetOfContext()), reg0);
|
||||
masm.loadPtr(Address(reg0, JSContext::offsetOfRuntime()), reg0);
|
||||
masm.loadPtr(Address(reg0, offsetOfActivation), reg1);
|
||||
masm.store8(Imm32(0), Address(reg1, JitActivation::offsetOfActiveUint8()));
|
||||
masm.loadPtr(Address(reg1, JitActivation::offsetOfPrevIonTop()), reg2);
|
||||
masm.storePtr(reg2, Address(reg0, offsetOfIonTop));
|
||||
masm.loadPtr(Address(reg1, JitActivation::offsetOfPrevJitJSContext()), reg2);
|
||||
masm.storePtr(reg2, Address(reg0, offsetOfJitJSContext));
|
||||
}
|
||||
masm.push(JSReturnReg_Type);
|
||||
masm.push(JSReturnReg_Data);
|
||||
LoadAsmJSActivationIntoRegister(masm, callee);
|
||||
masm.setupUnalignedABICall(1, scratch);
|
||||
masm.passABIArg(callee);
|
||||
masm.callWithABI(AsmJSImm_DisableActivationFromAsmJS);
|
||||
masm.pop(JSReturnReg_Data);
|
||||
masm.pop(JSReturnReg_Type);
|
||||
|
||||
#ifdef DEBUG
|
||||
masm.branchTestMagicValue(Assembler::Equal, JSReturnOperand, JS_ION_ERROR, throwLabel);
|
||||
@ -6682,20 +6645,8 @@ GenerateFFIIonExit(ModuleCompiler &m, const ModuleCompiler::ExitDescriptor &exit
|
||||
}
|
||||
|
||||
masm.bind(&done);
|
||||
masm.freeStack(stackDec);
|
||||
#if defined(JS_CODEGEN_ARM)
|
||||
masm.ma_vimm(GenericNaN(), NANReg);
|
||||
masm.PopRegsInMask(RegisterSet(GeneralRegisterSet((1<<GlobalReg.code()) |
|
||||
(1<<HeapReg.code()) |
|
||||
(1<<pc.code())),
|
||||
FloatRegisterSet(uint32_t(0))));
|
||||
#else
|
||||
# if defined(JS_CODEGEN_X64)
|
||||
masm.Pop(HeapReg);
|
||||
# endif
|
||||
masm.PopRegsInMask(restoreSet);
|
||||
masm.ret();
|
||||
#endif
|
||||
JS_ASSERT(masm.framePushed() == 0);
|
||||
|
||||
// oolConvert
|
||||
if (oolConvert.used()) {
|
||||
|
||||
@ -149,6 +149,24 @@ CoerceInPlace_ToNumber(JSContext *cx, MutableHandleValue val)
|
||||
return true;
|
||||
}
|
||||
|
||||
static void
|
||||
EnableActivationFromAsmJS(AsmJSActivation *activation)
|
||||
{
|
||||
JSContext *cx = activation->cx();
|
||||
Activation *act = cx->mainThread().activation();
|
||||
JS_ASSERT(act->isJit());
|
||||
act->asJit()->setActive(cx);
|
||||
}
|
||||
|
||||
static void
|
||||
DisableActivationFromAsmJS(AsmJSActivation *activation)
|
||||
{
|
||||
JSContext *cx = activation->cx();
|
||||
Activation *act = cx->mainThread().activation();
|
||||
JS_ASSERT(act->isJit());
|
||||
act->asJit()->setActive(cx, false);
|
||||
}
|
||||
|
||||
namespace js {
|
||||
|
||||
// Defined in AsmJS.cpp:
|
||||
@ -224,6 +242,10 @@ AddressOf(AsmJSImmKind kind, ExclusiveContext *cx)
|
||||
return RedirectCall(FuncCast(CoerceInPlace_ToNumber), Args_General2);
|
||||
case AsmJSImm_ToInt32:
|
||||
return RedirectCall(FuncCast<int32_t (double)>(js::ToInt32), Args_Int_Double);
|
||||
case AsmJSImm_EnableActivationFromAsmJS:
|
||||
return RedirectCall(FuncCast(EnableActivationFromAsmJS), Args_General1);
|
||||
case AsmJSImm_DisableActivationFromAsmJS:
|
||||
return RedirectCall(FuncCast(DisableActivationFromAsmJS), Args_General1);
|
||||
#if defined(JS_CODEGEN_ARM)
|
||||
case AsmJSImm_aeabi_idivmod:
|
||||
return RedirectCall(FuncCast(__aeabi_idivmod), Args_General2);
|
||||
|
||||
@ -80,6 +80,7 @@ class ABIArgGenerator
|
||||
uint32_t stackBytesConsumedSoFar() const { return stackOffset_; }
|
||||
static const Register NonArgReturnVolatileReg0;
|
||||
static const Register NonArgReturnVolatileReg1;
|
||||
|
||||
};
|
||||
|
||||
static MOZ_CONSTEXPR_VAR Register PreBarrierReg = r1;
|
||||
@ -97,22 +98,6 @@ static MOZ_CONSTEXPR_VAR FloatRegister ScratchFloatReg = { FloatRegisters::d15 }
|
||||
|
||||
static MOZ_CONSTEXPR_VAR FloatRegister NANReg = { FloatRegisters::d14 };
|
||||
|
||||
// Registers used in the GenerateFFIIonExit Enable Activation block.
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegCallee = r4;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegE0 = r0;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegE1 = r1;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegE2 = r2;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegE3 = r3;
|
||||
|
||||
// Registers used in the GenerateFFIIonExit Disable Activation block.
|
||||
// None of these may be the second scratch register (lr).
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegReturnData = r2;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegReturnType = r3;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegD0 = r0;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegD1 = r1;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegD2 = r4;
|
||||
|
||||
|
||||
static MOZ_CONSTEXPR_VAR FloatRegister d0 = {FloatRegisters::d0};
|
||||
static MOZ_CONSTEXPR_VAR FloatRegister d1 = {FloatRegisters::d1};
|
||||
static MOZ_CONSTEXPR_VAR FloatRegister d2 = {FloatRegisters::d2};
|
||||
|
||||
@ -690,6 +690,8 @@ enum AsmJSImmKind
|
||||
AsmJSImm_CoerceInPlace_ToInt32,
|
||||
AsmJSImm_CoerceInPlace_ToNumber,
|
||||
AsmJSImm_ToInt32,
|
||||
AsmJSImm_EnableActivationFromAsmJS,
|
||||
AsmJSImm_DisableActivationFromAsmJS,
|
||||
#if defined(JS_CODEGEN_ARM)
|
||||
AsmJSImm_aeabi_idivmod,
|
||||
AsmJSImm_aeabi_uidivmod,
|
||||
|
||||
@ -136,20 +136,6 @@ static MOZ_CONSTEXPR_VAR Register ForkJoinGetSliceReg_temp0 = rbx;
|
||||
static MOZ_CONSTEXPR_VAR Register ForkJoinGetSliceReg_temp1 = rcx;
|
||||
static MOZ_CONSTEXPR_VAR Register ForkJoinGetSliceReg_output = rsi;
|
||||
|
||||
// Registers used in the GenerateFFIIonExit Enable Activation block.
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegCallee = r10;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegE0 = rax;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegE1 = rdi;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegE2 = rbx;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegE3 = rsi;
|
||||
|
||||
// Registers used in the GenerateFFIIonExit Disable Activation block.
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegReturnData = ecx;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegReturnType = ecx;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegD0 = rax;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegD1 = rdi;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegD2 = rbx;
|
||||
|
||||
class ABIArgGenerator
|
||||
{
|
||||
#if defined(XP_WIN)
|
||||
|
||||
@ -87,20 +87,6 @@ class ABIArgGenerator
|
||||
static MOZ_CONSTEXPR_VAR Register OsrFrameReg = edx;
|
||||
static MOZ_CONSTEXPR_VAR Register PreBarrierReg = edx;
|
||||
|
||||
// Registers used in the GenerateFFIIonExit Enable Activation block.
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegCallee = ecx;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegE0 = edi;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegE1 = eax;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegE2 = ebx;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegE3 = edx;
|
||||
|
||||
// Registers used in the GenerateFFIIonExit Disable Activation block.
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegReturnData = edx;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegReturnType = ecx;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegD0 = edi;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegD1 = eax;
|
||||
static MOZ_CONSTEXPR_VAR Register AsmJSIonExitRegD2 = esi;
|
||||
|
||||
// GCC stack is aligned on 16 bytes, but we don't maintain the invariant in
|
||||
// jitted code.
|
||||
#if defined(__GNUC__)
|
||||
|
||||
@ -408,10 +408,6 @@ struct JSContext : public js::ExclusiveContext,
|
||||
JSRuntime *runtime() const { return runtime_; }
|
||||
js::PerThreadData &mainThread() const { return runtime()->mainThread; }
|
||||
|
||||
static size_t offsetOfRuntime() {
|
||||
return offsetof(JSContext, runtime_);
|
||||
}
|
||||
|
||||
friend class js::ExclusiveContext;
|
||||
friend class JS::AutoSaveExceptionState;
|
||||
|
||||
|
||||
@ -583,9 +583,6 @@ class PerThreadData : public PerThreadDataFriendFields
|
||||
static unsigned offsetOfAsmJSActivationStackReadOnly() {
|
||||
return offsetof(PerThreadData, asmJSActivationStack_);
|
||||
}
|
||||
static unsigned offsetOfActivation() {
|
||||
return offsetof(PerThreadData, activation_);
|
||||
}
|
||||
|
||||
js::AsmJSActivation *asmJSActivationStackFromAnyThread() const {
|
||||
return asmJSActivationStack_;
|
||||
|
||||
@ -1516,9 +1516,6 @@ jit::JitActivation::~JitActivation()
|
||||
}
|
||||
}
|
||||
|
||||
// setActive() is inlined in GenerateFFIIonExit() with explicit masm instructions so
|
||||
// changes to the logic here need to be reflected in GenerateFFIIonExit() in the enable
|
||||
// and disable activation instruction sequences.
|
||||
void
|
||||
jit::JitActivation::setActive(JSContext *cx, bool active)
|
||||
{
|
||||
|
||||
@ -1335,16 +1335,6 @@ class JitActivation : public Activation
|
||||
bool firstFrameIsConstructing() const {
|
||||
return firstFrameIsConstructing_;
|
||||
}
|
||||
static size_t offsetOfPrevIonTop() {
|
||||
return offsetof(JitActivation, prevIonTop_);
|
||||
}
|
||||
static size_t offsetOfPrevJitJSContext() {
|
||||
return offsetof(JitActivation, prevJitJSContext_);
|
||||
}
|
||||
static size_t offsetOfActiveUint8() {
|
||||
JS_ASSERT(sizeof(active_) == 1);
|
||||
return offsetof(JitActivation, active_);
|
||||
}
|
||||
|
||||
#ifdef CHECK_OSIPOINT_REGISTERS
|
||||
void setCheckRegs(bool check) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user