forked from Mirrors/wine-wine
jscript: Renamed jmp_z and jmp_nz to cnd_z and cnd_nz.
parent
00030ff66f
commit
e5d7d50faa
|
@ -377,7 +377,7 @@ static HRESULT compile_conditional_expression(compiler_ctx_t *ctx, conditional_e
|
||||||
if(FAILED(hres))
|
if(FAILED(hres))
|
||||||
return hres;
|
return hres;
|
||||||
|
|
||||||
jmp_false = push_instr(ctx, OP_jmp_z);
|
jmp_false = push_instr(ctx, OP_cnd_z);
|
||||||
if(jmp_false == -1)
|
if(jmp_false == -1)
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
|
|
||||||
|
@ -716,7 +716,7 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr,
|
||||||
case EXPR_ADD:
|
case EXPR_ADD:
|
||||||
return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add);
|
return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add);
|
||||||
case EXPR_AND:
|
case EXPR_AND:
|
||||||
return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_jmp_z);
|
return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_cnd_z);
|
||||||
case EXPR_ARRAY:
|
case EXPR_ARRAY:
|
||||||
return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_array);
|
return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_array);
|
||||||
case EXPR_ARRAYLIT:
|
case EXPR_ARRAYLIT:
|
||||||
|
@ -802,7 +802,7 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr,
|
||||||
case EXPR_NOTEQEQ:
|
case EXPR_NOTEQEQ:
|
||||||
return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2);
|
return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2);
|
||||||
case EXPR_OR:
|
case EXPR_OR:
|
||||||
return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_jmp_nz);
|
return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_cnd_nz);
|
||||||
case EXPR_PLUS:
|
case EXPR_PLUS:
|
||||||
return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum);
|
return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum);
|
||||||
case EXPR_POSTDEC:
|
case EXPR_POSTDEC:
|
||||||
|
@ -915,7 +915,7 @@ static HRESULT compile_if_statement(compiler_ctx_t *ctx, if_statement_t *stat)
|
||||||
if(FAILED(hres))
|
if(FAILED(hres))
|
||||||
return hres;
|
return hres;
|
||||||
|
|
||||||
jmp_else = push_instr(ctx, OP_jmp_z);
|
jmp_else = push_instr(ctx, OP_cnd_z);
|
||||||
if(jmp_else == -1)
|
if(jmp_else == -1)
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
|
|
||||||
|
|
|
@ -1765,7 +1765,7 @@ HRESULT interp_obj_prop(exec_ctx_t *ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ECMA-262 3rd Edition 11.11 */
|
/* ECMA-262 3rd Edition 11.11 */
|
||||||
static HRESULT interp_jmp_nz(exec_ctx_t *ctx)
|
static HRESULT interp_cnd_nz(exec_ctx_t *ctx)
|
||||||
{
|
{
|
||||||
const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint;
|
const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint;
|
||||||
VARIANT_BOOL b;
|
VARIANT_BOOL b;
|
||||||
|
@ -1787,7 +1787,7 @@ static HRESULT interp_jmp_nz(exec_ctx_t *ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ECMA-262 3rd Edition 11.11 */
|
/* ECMA-262 3rd Edition 11.11 */
|
||||||
static HRESULT interp_jmp_z(exec_ctx_t *ctx)
|
static HRESULT interp_cnd_z(exec_ctx_t *ctx)
|
||||||
{
|
{
|
||||||
const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint;
|
const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint;
|
||||||
VARIANT_BOOL b;
|
VARIANT_BOOL b;
|
||||||
|
|
|
@ -52,6 +52,8 @@ typedef struct _func_stack {
|
||||||
X(call, 1, ARG_UINT, ARG_UINT) \
|
X(call, 1, ARG_UINT, ARG_UINT) \
|
||||||
X(call_member,1, ARG_UINT, ARG_UINT) \
|
X(call_member,1, ARG_UINT, ARG_UINT) \
|
||||||
X(carray, 1, ARG_UINT, 0) \
|
X(carray, 1, ARG_UINT, 0) \
|
||||||
|
X(cnd_nz, 0, ARG_ADDR, 0) \
|
||||||
|
X(cnd_z, 0, ARG_ADDR, 0) \
|
||||||
X(delete, 1, 0,0) \
|
X(delete, 1, 0,0) \
|
||||||
X(delete_ident,1,ARG_BSTR, 0) \
|
X(delete_ident,1,ARG_BSTR, 0) \
|
||||||
X(div, 1, 0,0) \
|
X(div, 1, 0,0) \
|
||||||
|
@ -67,8 +69,6 @@ typedef struct _func_stack {
|
||||||
X(instanceof, 1, 0,0) \
|
X(instanceof, 1, 0,0) \
|
||||||
X(int, 1, ARG_INT, 0) \
|
X(int, 1, ARG_INT, 0) \
|
||||||
X(jmp, 0, ARG_ADDR, 0) \
|
X(jmp, 0, ARG_ADDR, 0) \
|
||||||
X(jmp_nz, 0, ARG_ADDR, 0) \
|
|
||||||
X(jmp_z, 0, ARG_ADDR, 0) \
|
|
||||||
X(lshift, 1, 0,0) \
|
X(lshift, 1, 0,0) \
|
||||||
X(lt, 1, 0,0) \
|
X(lt, 1, 0,0) \
|
||||||
X(lteq, 1, 0,0) \
|
X(lteq, 1, 0,0) \
|
||||||
|
|
Loading…
Reference in New Issue