Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-02 07:05:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

When re-importing register values after a tree call, make sure to use the inner tree's nativeStackBase, since we also use the inner tree's sp.

Browse Source
This commit is contained in:
Andreas Gal 2008-08-13 16:29:59 -07:00
parent ffb0d48439
commit f62d43d631
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/src/jstracer.cpp
View File

@ -645,7 +645,7 @@ TraceRecorder::TraceRecorder(JSContext* cx, GuardRecord* _anchor,
eor_ins = addName(lir->insLoadi(lirbuf->state, offsetof(InterpState, eor)), "eor");
/* read into registers all values on the stack and all globals we know so far */
import(lirbuf->sp, ngslots, callDepth, globalTypeMap, stackTypeMap);
import(treeInfo, lirbuf->sp, ngslots, callDepth, globalTypeMap, stackTypeMap);
}
TraceRecorder::~TraceRecorder()
@ -1028,7 +1028,7 @@ TraceRecorder::import(LIns* base, ptrdiff_t offset, jsval* p, uint8& t,
}
void
TraceRecorder::import(LIns* sp, unsigned ngslots, unsigned callDepth,
TraceRecorder::import(TreeInfo* treeInfo, LIns* sp, unsigned ngslots, unsigned callDepth,
uint8* globalTypeMap, uint8* stackTypeMap)
{
/* the first time we compile a tree this will be empty as we add entries lazily */
@ -1362,7 +1362,7 @@ TraceRecorder::emitTreeCall(Fragment* inner, GuardRecord* lr)
ti->dependentTrees.addUnique(fragment);
/* Read back all registers, in case the called tree changed any of them. */
SideExit* exit = lr->exit;
import(inner_sp, exit->numGlobalSlots, exit->calldepth,
import(ti, inner_sp, exit->numGlobalSlots, exit->calldepth,
exit->typeMap, exit->typeMap + exit->numGlobalSlots);
/* Restore sp and rp to their original values (we still have them in a register). */
if (callDepth > 0) {
@ -2649,11 +2649,13 @@ TraceRecorder::clearFrameSlotsFromCache()
bool
TraceRecorder::record_EnterFrame()
{
#ifdef DEBUG
printf("EnterFrame %s\n", js_AtomToPrintableString(cx, cx->fp->fun->atom));
#endif
if (++callDepth >= MAX_CALLDEPTH)
ABORT_TRACE("exceeded maximum call depth");
#ifdef DEBUG
printf("EnterFrame %s, callDepth=%d\n",
js_AtomToPrintableString(cx, cx->fp->fun->atom),
callDepth);
#endif
JSStackFrame* fp = cx->fp;
LIns* void_ins = lir->insImm(JSVAL_TO_BOOLEAN(JSVAL_VOID));
@ -2676,7 +2678,9 @@ bool
TraceRecorder::record_LeaveFrame()
{
#ifdef DEBUG
printf("LeaveFrame (back to %s)\n", js_AtomToPrintableString(cx, cx->fp->fun->atom));
printf("LeaveFrame (back to %s), callDept=%d\n",
js_AtomToPrintableString(cx, cx->fp->fun->atom),
callDepth);
#endif
if (callDepth-- <= 0)
return false;

2
js/src/jstracer.h
View File

@ -225,7 +225,7 @@ class TraceRecorder {
ptrdiff_t nativeGlobalOffset(jsval* p) const;
void import(nanojit::LIns* base, ptrdiff_t offset, jsval* p, uint8& t,
const char *prefix, uintN index, JSStackFrame *fp);
void import(nanojit::LIns* sp, unsigned ngslots, unsigned callDepth,
void import(TreeInfo* treeInfo, nanojit::LIns* sp, unsigned ngslots, unsigned callDepth,
uint8* globalTypeMap, uint8* stackTypeMap);
void trackNativeStackUse(unsigned slots);