ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Store stack base in call_frame_t. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2016-03-25 12:03:55 +01:00 committed by Alexandre Julliard
parent a120ecbefc
commit 0e32c09901
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/jscript/engine.c
View File

@ -2471,7 +2471,6 @@ static HRESULT unwind_exception(exec_ctx_t *ctx)
static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t *ret) 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; exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx;
unsigned prev_top;
scope_chain_t *prev_scope; scope_chain_t *prev_scope;
call_frame_t *frame; call_frame_t *frame;
jsop_t op; jsop_t op;
@ -2480,7 +2479,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t
TRACE("\n"); TRACE("\n");
frame = ctx->call_ctx; frame = ctx->call_ctx;
prev_top = exec_ctx->top;
prev_scope = exec_ctx->scope_chain; prev_scope = exec_ctx->scope_chain;
while(frame->ip != -1) { while(frame->ip != -1) {
@ -2501,19 +2499,21 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t
} }
assert(ctx->call_ctx == frame); assert(ctx->call_ctx == frame);
ctx->call_ctx = frame->prev_frame;
release_call_frame(frame);
if(FAILED(hres)) { if(FAILED(hres)) {
while(exec_ctx->scope_chain != prev_scope) while(exec_ctx->scope_chain != prev_scope)
scope_pop(&exec_ctx->scope_chain); scope_pop(&exec_ctx->scope_chain);
stack_popn(exec_ctx, exec_ctx->top-prev_top); stack_popn(exec_ctx, exec_ctx->top-frame->stack_base);
return hres;
} }
assert(exec_ctx->top == prev_top+1 || exec_ctx->top == prev_top); assert(exec_ctx->top == frame->stack_base);
ctx->call_ctx = frame->prev_frame;
release_call_frame(frame);
if(FAILED(hres))
return hres;
assert(exec_ctx->scope_chain == prev_scope); assert(exec_ctx->scope_chain == prev_scope);
assert(exec_ctx->top == prev_top);
*ret = exec_ctx->ret; *ret = exec_ctx->ret;
exec_ctx->ret = jsval_undefined(); exec_ctx->ret = jsval_undefined();
@ -2568,6 +2568,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_
frame->bytecode = bytecode; frame->bytecode = bytecode;
frame->function = function; frame->function = function;
frame->ip = function->instr_off; frame->ip = function->instr_off;
frame->stack_base = ctx->top;
frame->exec_ctx = ctx; frame->exec_ctx = ctx;

1
dlls/jscript/engine.h
View File

@ -193,6 +193,7 @@ struct _parser_ctx_t;
typedef struct _call_frame_t { typedef struct _call_frame_t {
unsigned ip; unsigned ip;
except_frame_t *except_frame; except_frame_t *except_frame;
unsigned stack_base;
bytecode_t *bytecode; bytecode_t *bytecode;
function_code_t *function; function_code_t *function;