Jacek Caban : jscript: Renamed jmp_z and jmp_nz to cnd_z and cnd_nz.
Alexandre Julliard
julliard at winehq.org
Tue Dec 20 13:43:26 CST 2011
Module: wine
Branch: master
Commit: e5d7d50faaf572980bcb7aa6a71a71e0385b85c1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d7d50faaf572980bcb7aa6a71a71e0385b85c1
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Dec 20 11:47:23 2011 +0100
jscript: Renamed jmp_z and jmp_nz to cnd_z and cnd_nz.
---
dlls/jscript/compile.c | 8 ++++----
dlls/jscript/engine.c | 4 ++--
dlls/jscript/engine.h | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c
index 07bd65f..3633493 100644
--- a/dlls/jscript/compile.c
+++ b/dlls/jscript/compile.c
@@ -377,7 +377,7 @@ static HRESULT compile_conditional_expression(compiler_ctx_t *ctx, conditional_e
if(FAILED(hres))
return hres;
- jmp_false = push_instr(ctx, OP_jmp_z);
+ jmp_false = push_instr(ctx, OP_cnd_z);
if(jmp_false == -1)
return E_OUTOFMEMORY;
@@ -716,7 +716,7 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr,
case EXPR_ADD:
return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add);
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:
return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_array);
case EXPR_ARRAYLIT:
@@ -802,7 +802,7 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr,
case EXPR_NOTEQEQ:
return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2);
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:
return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum);
case EXPR_POSTDEC:
@@ -915,7 +915,7 @@ static HRESULT compile_if_statement(compiler_ctx_t *ctx, if_statement_t *stat)
if(FAILED(hres))
return hres;
- jmp_else = push_instr(ctx, OP_jmp_z);
+ jmp_else = push_instr(ctx, OP_cnd_z);
if(jmp_else == -1)
return E_OUTOFMEMORY;
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 14bd250..80486b8 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1765,7 +1765,7 @@ HRESULT interp_obj_prop(exec_ctx_t *ctx)
}
/* 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;
VARIANT_BOOL b;
@@ -1787,7 +1787,7 @@ static HRESULT interp_jmp_nz(exec_ctx_t *ctx)
}
/* 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;
VARIANT_BOOL b;
diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h
index 071c98b..3e58db2 100644
--- a/dlls/jscript/engine.h
+++ b/dlls/jscript/engine.h
@@ -52,6 +52,8 @@ typedef struct _func_stack {
X(call, 1, ARG_UINT, ARG_UINT) \
X(call_member,1, ARG_UINT, ARG_UINT) \
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_ident,1,ARG_BSTR, 0) \
X(div, 1, 0,0) \
@@ -67,8 +69,6 @@ typedef struct _func_stack {
X(instanceof, 1, 0,0) \
X(int, 1, ARG_INT, 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(lt, 1, 0,0) \
X(lteq, 1, 0,0) \
More information about the wine-cvs
mailing list