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

jscript: Added new opcode to enter catch block and use it to setup the scope. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2017-05-01 18:30:06 +02:00 committed by Alexandre Julliard
parent b7bb16673c
commit 622eb728d7
3 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/jscript/compile.c
View File

@ -1720,6 +1720,10 @@ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat)
instr_ptr(ctx, push_except)->u.arg[0].uint = ctx->code_off; instr_ptr(ctx, push_except)->u.arg[0].uint = ctx->code_off;
hres = push_instr_bstr(ctx, OP_enter_catch, ident);
if(FAILED(hres))
return hres;
hres = compile_statement(ctx, &catch_ctx, stat->catch_block->statement); hres = compile_statement(ctx, &catch_ctx, stat->catch_block->statement);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;

48
dlls/jscript/engine.c
View File

@ -968,6 +968,26 @@ static HRESULT interp_end_finally(script_ctx_t *ctx)
return S_OK; return S_OK;
} }
static HRESULT interp_enter_catch(script_ctx_t *ctx)
{
const BSTR ident = get_op_bstr(ctx, 0);
jsdisp_t *scope_obj;
jsval_t v;
HRESULT hres;
hres = create_dispex(ctx, NULL, NULL, &scope_obj);
if(FAILED(hres))
return hres;
v = stack_pop(ctx);
hres = jsdisp_propput_name(scope_obj, ident, v);
jsval_release(v);
if(SUCCEEDED(hres))
hres = scope_push(ctx->call_ctx->scope, scope_obj, to_disp(scope_obj), &ctx->call_ctx->scope);
jsdisp_release(scope_obj);
return hres;
}
/* ECMA-262 3rd Edition 13 */ /* ECMA-262 3rd Edition 13 */
static HRESULT interp_func(script_ctx_t *ctx) static HRESULT interp_func(script_ctx_t *ctx)
{ {
@ -2655,6 +2675,7 @@ static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres)
} }
except_frame = frame->except_frame; except_frame = frame->except_frame;
ident = except_frame->ident;
frame->except_frame = except_frame->next; frame->except_frame = except_frame->next;
assert(except_frame->stack_top <= ctx->stack_top); assert(except_frame->stack_top <= ctx->stack_top);
@ -2664,37 +2685,20 @@ static HRESULT unwind_exception(script_ctx_t *ctx, HRESULT exception_hres)
scope_pop(&frame->scope); scope_pop(&frame->scope);
frame->ip = except_frame->catch_off; frame->ip = except_frame->catch_off;
if(ident) assert(frame->bytecode->instrs[frame->ip].op == OP_enter_catch);
except_val = ctx->ei.val; except_val = ctx->ei.val;
ctx->ei.val = jsval_undefined(); ctx->ei.val = jsval_undefined();
clear_ei(ctx); clear_ei(ctx);
ident = except_frame->ident;
heap_free(except_frame); heap_free(except_frame);
if(ident) { hres = stack_push(ctx, except_val);
jsdisp_t *scope_obj; if(FAILED(hres))
return hres;
hres = create_dispex(ctx, NULL, NULL, &scope_obj);
if(SUCCEEDED(hres)) {
hres = jsdisp_propput_name(scope_obj, ident, except_val);
if(FAILED(hres))
jsdisp_release(scope_obj);
}
jsval_release(except_val);
if(FAILED(hres))
return hres;
hres = scope_push(frame->scope, scope_obj, to_disp(scope_obj), &frame->scope);
jsdisp_release(scope_obj);
}else {
hres = stack_push(ctx, except_val);
if(FAILED(hres))
return hres;
if(!ident)
hres = stack_push(ctx, jsval_bool(FALSE)); hres = stack_push(ctx, jsval_bool(FALSE));
}
return hres; return hres;
} }

1
dlls/jscript/engine.h
View File

@ -35,6 +35,7 @@
X(div, 1, 0,0) \ X(div, 1, 0,0) \
X(double, 1, ARG_DBL, 0) \ X(double, 1, ARG_DBL, 0) \
X(end_finally,1, 0,0) \ X(end_finally,1, 0,0) \
X(enter_catch,1, ARG_BSTR, 0) \
X(eq, 1, 0,0) \ X(eq, 1, 0,0) \
X(eq2, 1, 0,0) \ X(eq2, 1, 0,0) \
X(forin, 0, ARG_ADDR, 0) \ X(forin, 0, ARG_ADDR, 0) \