wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1020359 - MIPS followup on bug 1019304. Overhaul PJS bailout mechanism. r=shu

Browse Source
This commit is contained in:
Branislav Rankov 2014-07-04 14:33:33 +02:00
parent 3793c3a90a
commit e760b3165a
2 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jit/mips/CodeGenerator-mips.cpp
View File

@ -197,7 +197,7 @@ CodeGeneratorMIPS::generateOutOfLineCode()
// the same.
masm.move32(Imm32(frameSize()), ra);
JitCode *handler = gen->jitRuntime()->getGenericBailoutHandler();
JitCode *handler = gen->jitRuntime()->getGenericBailoutHandler(gen->info().executionMode());
masm.branch(handler);
}

48
js/src/jit/mips/Trampoline-mips.cpp
View File

@ -16,6 +16,7 @@
#ifdef JS_ION_PERF
# include "jit/PerfSpewer.h"
#endif
#include "jit/ParallelFunctions.h"
#include "jit/VMFunctions.h"
#include "jit/ExecutionMode-inl.h"
@ -522,6 +523,11 @@ JitRuntime::generateArgumentsRectifier(JSContext *cx, ExecutionMode mode, void *
return code;
}
// NOTE: Members snapshotOffset_ and padding_ of BailoutStack
// are not stored in PushBailoutFrame().
static const uint32_t bailoutDataSize = sizeof(BailoutStack) - 2 * sizeof(uintptr_t);
static const uint32_t bailoutInfoOutParamSize = 2 * sizeof(uintptr_t);
/* There are two different stack layouts when doing bailout. They are
* represented via class BailoutStack.
*
@ -540,13 +546,8 @@ JitRuntime::generateArgumentsRectifier(JSContext *cx, ExecutionMode mode, void *
* (See: JitRuntime::generateBailoutHandler).
*/
static void
GenerateBailoutThunk(JSContext *cx, MacroAssembler &masm, uint32_t frameClass)
PushBailoutFrame(MacroAssembler &masm, uint32_t frameClass, Register spArg)
{
// NOTE: Members snapshotOffset_ and padding_ of BailoutStack
// are not stored in this function.
static const uint32_t bailoutDataSize = sizeof(BailoutStack) - 2 * sizeof(uintptr_t);
static const uint32_t bailoutInfoOutParamSize = 2 * sizeof(uintptr_t);
// Make sure that alignment is proper.
masm.checkStackAlignment();
@ -577,7 +578,14 @@ GenerateBailoutThunk(JSContext *cx, MacroAssembler &masm, uint32_t frameClass)
masm.storePtr(ImmWord(frameClass), Address(StackPointer, BailoutStack::offsetOfFrameClass()));
// Put pointer to BailoutStack as first argument to the Bailout()
masm.movePtr(StackPointer, a0);
masm.movePtr(StackPointer, spArg);
}
static void
GenerateBailoutThunk(JSContext *cx, MacroAssembler &masm, uint32_t frameClass)
{
PushBailoutFrame(masm, frameClass, a0);
// Put pointer to BailoutInfo
masm.subPtr(Imm32(bailoutInfoOutParamSize), StackPointer);
masm.storePtr(ImmPtr(nullptr), Address(StackPointer, 0));
@ -612,6 +620,32 @@ GenerateBailoutThunk(JSContext *cx, MacroAssembler &masm, uint32_t frameClass)
masm.branch(bailoutTail);
}
static void
GenerateParallelBailoutThunk(MacroAssembler &masm, uint32_t frameClass)
{
// As GenerateBailoutThunk, except we return an error immediately. We do
// the bailout dance so that we can walk the stack and have accurate
// reporting of frame information.
PushBailoutFrame(masm, frameClass, a0);
// Parallel bailout is like parallel failure in that we unwind all the way
// to the entry frame. Reserve space for the frame pointer of the entry frame.
const int sizeOfEntryFramePointer = sizeof(uint8_t *) * 2;
masm.reserveStack(sizeOfEntryFramePointer);
masm.movePtr(sp, a1);
masm.setupAlignedABICall(2);
masm.passABIArg(a0);
masm.passABIArg(a1);
masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, BailoutPar));
// Get the frame pointer of the entry frame and return.
masm.moveValue(MagicValue(JS_ION_ERROR), JSReturnOperand);
masm.loadPtr(Address(sp, 0), sp);
masm.ret();
}
JitCode *
JitRuntime::generateBailoutTable(JSContext *cx, uint32_t frameClass)
{