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

jscript: Added new helpers for jumps. 

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:25 +01:00 committed by Alexandre Julliard
parent 132ff14d37
commit 53ecdb6549
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/jscript/engine.c
View File

@ -587,6 +587,16 @@ static inline double get_op_double(exec_ctx_t *ctx){
return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.dbl; return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.dbl;
} }
static inline void jmp_next(exec_ctx_t *ctx)
{
ctx->ip++;
}
static inline void jmp_abs(exec_ctx_t *ctx, unsigned dst)
{
ctx->ip = dst;
}
/* ECMA-262 3rd Edition 12.2 */ /* ECMA-262 3rd Edition 12.2 */
static HRESULT interp_var_set(exec_ctx_t *ctx) static HRESULT interp_var_set(exec_ctx_t *ctx)
{ {
@ -656,10 +666,10 @@ static HRESULT interp_forin(exec_ctx_t *ctx)
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
ctx->ip++; jmp_next(ctx);
}else { }else {
stack_popn(ctx, 4); stack_popn(ctx, 4);
ctx->ip = arg; jmp_abs(ctx, arg);
} }
return S_OK; return S_OK;
} }
@ -711,9 +721,9 @@ static HRESULT interp_case(exec_ctx_t *ctx)
if(b) { if(b) {
stack_popn(ctx, 1); stack_popn(ctx, 1);
ctx->ip = arg; jmp_abs(ctx, arg);
}else { }else {
ctx->ip++; jmp_next(ctx);
} }
return S_OK; return S_OK;
} }
@ -1260,10 +1270,10 @@ static HRESULT interp_cnd_nz(exec_ctx_t *ctx)
return hres; return hres;
if(b) { if(b) {
ctx->ip = arg; jmp_abs(ctx, arg);
}else { }else {
stack_popn(ctx, 1); stack_popn(ctx, 1);
ctx->ip++; jmp_next(ctx);
} }
return S_OK; return S_OK;
} }
@ -1283,9 +1293,9 @@ static HRESULT interp_cnd_z(exec_ctx_t *ctx)
if(b) { if(b) {
stack_popn(ctx, 1); stack_popn(ctx, 1);
ctx->ip++; jmp_next(ctx);
}else { }else {
ctx->ip = arg; jmp_abs(ctx, arg);
} }
return S_OK; return S_OK;
} }
@ -2327,7 +2337,7 @@ static HRESULT interp_jmp(exec_ctx_t *ctx)
TRACE("%u\n", arg); TRACE("%u\n", arg);
ctx->ip = arg; jmp_abs(ctx, arg);
return S_OK; return S_OK;
} }
@ -2347,9 +2357,9 @@ static HRESULT interp_jmp_z(exec_ctx_t *ctx)
return hres; return hres;
if(b) if(b)
ctx->ip++; jmp_next(ctx);
else else
ctx->ip = arg; jmp_abs(ctx, arg);
return S_OK; return S_OK;
} }
@ -2367,7 +2377,7 @@ static HRESULT interp_ret(exec_ctx_t *ctx)
{ {
TRACE("\n"); TRACE("\n");
ctx->ip = -1; jmp_abs(ctx, -1);
return S_OK; return S_OK;
} }