Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-28 12:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't expect args and vars in a top-level frame that is mapped to the native frame.

Browse Source
This commit is contained in:
Andreas Gal 2008-07-07 22:20:27 -07:00
parent 378bda5b6d
commit c48dc0d2a9
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/src/jstracer.cpp
View File

@ -413,6 +413,9 @@ TraceRecorder::TraceRecorder(JSContext* cx, Fragmento* fragmento, Fragment* _fra
if (fragment->vmprivate == NULL) {
/* generate the entry map and stash it in the trace */
unsigned entryNativeFrameSlots = nativeFrameSlots(entryFrame, entryRegs);
#ifdef DEBUG
printf("entryNativeFrameSlots: %d\n", entryNativeFrameSlots);
#endif
LIns* data = lir_buf_writer->skip(sizeof(VMFragmentInfo) +
entryNativeFrameSlots * sizeof(char));
fragmentInfo = (VMFragmentInfo*)data->payload();
@ -573,13 +576,15 @@ TraceRecorder::nativeFrameOffset(void* p) const
JS_ASSERT(fp != NULL); // must be on the frame somewhere
for (JSStackFrame* fp2 = fp; fp2 != entryFrame; fp2 = fp2->down)
offset += (fp2->argc + fp2->nvars + size_t(fp2->regs->sp - fp2->spbase));
if ((vp >= fp->argv) && (vp < fp->argv + fp->argc))
return (offset + size_t(vp - fp->argv)) * sizeof(double);
offset += fp->argc;
// FIXME: fixing bug 441686 collapses the vars and spbase cases
if ((vp >= fp->vars) && (vp < fp->vars + fp->nvars))
return (offset + size_t(vp - fp->vars)) * sizeof(double);
offset += fp->nvars;
if (fp->down) {
if ((vp >= fp->argv) && (vp < fp->argv + fp->argc))
return (offset + size_t(vp - fp->argv)) * sizeof(double);
offset += fp->argc;
// FIXME: fixing bug 441686 collapses the vars and spbase cases
if ((vp >= fp->vars) && (vp < fp->vars + fp->nvars))
return (offset + size_t(vp - fp->vars)) * sizeof(double);
offset += fp->nvars;
}
JS_ASSERT((vp >= fp->spbase) && (vp < fp->spbase + fp->script->depth));
return (offset + size_t(vp - fp->spbase)) * sizeof(double);
}

3
js/src/trace.js
View File

@ -2,8 +2,7 @@ f = function() {
var q = 1;
//for (var j = 0; j < 500; ++j)
for (var i = 0; i < 5000; ++i) {
q += 2;
q += 2;
q++;
//++q;
}
print("q=" + q + " i=" + i);