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

Merge. I miss CVS.

Browse Source
This commit is contained in:
Andreas Gal 2008-08-13 21:37:33 -07:00
commit 2f533e6051
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/src/jsinterp.cpp
View File

@ -1321,6 +1321,12 @@ have_fun:
}
frame.slots = sp - fun->u.i.nvars;
ok = js_Interpret(cx);
#ifdef JS_TRACER
if (JS_TRACE_MONITOR(cx).recorder) {
js_AbortRecording(cx, frame.down->regs->pc,
"recording out of js_Invoke interpreter activation");
}
#endif
} else {
/* fun might be onerror trying to report a syntax error in itself. */
frame.scopeChain = NULL;
@ -2505,14 +2511,20 @@ js_Interpret(JSContext *cx)
METER_OP_INIT(op); /* to nullify first METER_OP_PAIR */
# define DO_OP() JS_EXTENSION_(goto *jumpTable[op])
# define DO_OP() JS_BEGIN_MACRO \
JS_ASSERT(!JS_TRACE_MONITOR(cx).recorder || \
jumpTable == recordingJumpTable); \
JS_EXTENSION_(goto *jumpTable[op]); \
JS_END_MACRO
# define DO_NEXT_OP(n) JS_BEGIN_MACRO \
METER_OP_PAIR(op, regs.pc[n]); \
op = (JSOp) *(regs.pc += (n)); \
DO_OP(); \
JS_END_MACRO
# define BEGIN_CASE(OP) L_##OP:
# define BEGIN_CASE(OP) L_##OP: \
JS_ASSERT(!JS_TRACE_MONITOR(cx).recorder || \
jumpTable == recordingJumpTable);
# define END_CASE(OP) DO_NEXT_OP(OP##_LENGTH);
# define END_VARLEN_CASE DO_NEXT_OP(len);
# define ADD_EMPTY_CASE(OP) BEGIN_CASE(OP) \