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

FlushNativeStackFrame currently only handles the innermost nested trees writeback, so at least make it use the proper adjusted stack base for that.

Browse Source
This commit is contained in:
Andreas Gal 2008-08-13 19:23:28 -07:00
parent 01efe3882f
commit 8d4c97dbef
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jstracer.cpp
View File

@ -1773,8 +1773,11 @@ js_ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount)
/* If we bail out on a nested exit, the compiled code returns the outermost nesting
guard but what we are really interested in is the innermost guard that we hit
instead of the guard we were expecting there. */
if (lr->exit->exitType == NESTED_EXIT)
if (lr->exit->exitType == NESTED_EXIT) {
debug_only(printf("nested side exit, using guard %p instead of %p\n",
state.nestedExit, lr);)
lr = state.nestedExit;
}
/* sp_adj and ip_adj are relative to the tree we exit out of, not the tree we
entered into (which might be different in the presence of nested trees). */
@ -1816,7 +1819,8 @@ js_ExecuteTree(JSContext* cx, Fragment* f, uintN& inlineCallCount)
JS_ASSERT(*(uint64*)&global[globalFrameSize] == 0xdeadbeefdeadbeefLL);
/* write back native stack frame */
FlushNativeStackFrame(cx, e->calldepth, e->typeMap + e->numGlobalSlots, stack);
FlushNativeStackFrame(cx, e->calldepth, e->typeMap + e->numGlobalSlots,
stack + (((double*)state.sp) - ((double*)entry_sp)));
AUDIT(sideExitIntoInterpreter);