Jacek Caban : jscript: Use bytecode for '^=' expression implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9749de29bcd39e39bb9b29f33c2529d88999d97f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9749de29bcd39e39bb9b29f33c...

Author: Jacek Caban 
Date:   Tue Dec  6 10:42:30 2011 +0100

jscript: Use bytecode for '^=' expression implementation.

---

dlls/jscript/compile.c |    2 ++
 dlls/jscript/engine.c  |   29 -----------------------------
 dlls/jscript/engine.h  |    1 -
 dlls/jscript/parser.y  |    2 +-
 4 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c
index 22d5a5f..645217a 100644
--- a/dlls/jscript/compile.c
+++ b/dlls/jscript/compile.c
@@ -501,6 +501,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr)
         return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mod);
     case EXPR_ASSIGNOR:
         return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_or);
+    case EXPR_ASSIGNXOR:
+        return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_xor);
     case EXPR_BITNEG:
         return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg);
     case EXPR_BOR:
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 9816b64..8e5e5f1 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -2170,25 +2170,6 @@ static HRESULT interp_or(exec_ctx_t *ctx)
 }

/* ECMA-262 3rd Edition    11.10 */
-static HRESULT xor_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv)
-{
-    INT li, ri;
-    HRESULT hres;
-
-    hres = to_int32(ctx, lval, ei, &li);
-    if(FAILED(hres))
-        return hres;
-
-    hres = to_int32(ctx, rval, ei, &ri);
-    if(FAILED(hres))
-        return hres;
-
-    V_VT(retv) = VT_I4;
-    V_I4(retv) = li^ri;
-    return S_OK;
-}
-
-/* ECMA-262 3rd Edition    11.10 */
 static HRESULT interp_xor(exec_ctx_t *ctx)
 {
     INT l, r;
@@ -3365,16 +3346,6 @@ HRESULT assign_and_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD
     return assign_oper_eval(ctx, expr->expression1, expr->expression2, bitand_eval, ei, ret);
 }

-/* ECMA-262 3rd Edition    11.13.2 */
-HRESULT assign_xor_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
-{
-    binary_expression_t *expr = (binary_expression_t*)_expr;
-
-    TRACE("\n");
-
-    return assign_oper_eval(ctx, expr->expression1, expr->expression2, xor_eval, ei, ret);
-}
-
 static HRESULT interp_jmp(exec_ctx_t *ctx)
 {
     const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint;
diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h
index 49c7aa8..d613267 100644
--- a/dlls/jscript/engine.h
+++ b/dlls/jscript/engine.h
@@ -577,7 +577,6 @@ HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept
 HRESULT assign_rshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
 HRESULT assign_rrshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
 HRESULT assign_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
-HRESULT assign_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;

HRESULT compiled_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;

diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y
index 0192eff..bf3732d 100644
--- a/dlls/jscript/parser.y
+++ b/dlls/jscript/parser.y
@@ -1351,7 +1351,7 @@ static const expression_eval_t expression_eval_table[] = {
    compiled_expression_eval,
    assign_and_expression_eval,
    compiled_expression_eval,
-   assign_xor_expression_eval,
+   compiled_expression_eval,
    compiled_expression_eval,
    array_expression_eval,
    member_expression_eval,