marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Store entry scope chain in call_frame_t. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Jacek Caban 2016-03-25 12:04:19 +01:00 committed by Alexandre Julliard
parent 49ecfa950b
commit 400435dbe3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/jscript/engine.c
View File

@ -2466,7 +2466,6 @@ static HRESULT unwind_exception(exec_ctx_t *ctx)
static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t *ret)
{
exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx;
scope_chain_t *prev_scope;
call_frame_t *frame;
jsop_t op;
HRESULT hres = S_OK;
@ -2474,7 +2473,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t
TRACE("\n");
frame = ctx->call_ctx;
prev_scope = frame->scope;
while(frame->ip != -1) {
op = frame->bytecode->instrs[frame->ip].op;
@ -2496,13 +2494,13 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t
assert(ctx->call_ctx == frame);
if(FAILED(hres)) {
while(frame->scope != prev_scope)
while(frame->scope != frame->base_scope)
scope_pop(&frame->scope);
stack_popn(exec_ctx, exec_ctx->top-frame->stack_base);
}
assert(exec_ctx->top == frame->stack_base);
assert(frame->scope == prev_scope);
assert(frame->scope == frame->base_scope);
ctx->call_ctx = frame->prev_frame;
release_call_frame(frame);
@ -2565,7 +2563,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_
frame->stack_base = ctx->top;
if(scope)
frame->scope = scope_addref(scope);
frame->base_scope = frame->scope = scope_addref(scope);
frame->exec_ctx = ctx;

1
dlls/jscript/engine.h
View File

@ -196,6 +196,7 @@ typedef struct _call_frame_t {
except_frame_t *except_frame;
unsigned stack_base;
scope_chain_t *scope;
scope_chain_t *base_scope;
bytecode_t *bytecode;
function_code_t *function;