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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9f9f5ae0a7a5ec9ce31bd110c6a30fd172f8ee37
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9f9f5ae0a7a5ec9ce31bd110c6...

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Thu Dec  1 13:23:36 2011 +0100

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

---

 dlls/jscript/compile.c |    2 ++
 dlls/jscript/engine.c  |   20 +++++++++-----------
 dlls/jscript/engine.h  |    2 +-
 dlls/jscript/parser.y  |    2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c
index 7a82683..ed42b4d 100644
--- a/dlls/jscript/compile.c
+++ b/dlls/jscript/compile.c
@@ -406,6 +406,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr)
         return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2);
     case EXPR_GREATER:
         return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gt);
+    case EXPR_GREATEREQ:
+        return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gteq);
     case EXPR_IDENT:
         return push_instr_bstr(ctx, OP_ident, ((identifier_expression_t*)expr)->identifier);
     case EXPR_IN:
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 8d177c2..d24392c 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -3079,26 +3079,24 @@ static HRESULT interp_gt(exec_ctx_t *ctx)
 }
 
 /* ECMA-262 3rd Edition    11.8.4 */
-HRESULT greatereq_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+static HRESULT interp_gteq(exec_ctx_t *ctx)
 {
-    binary_expression_t *expr = (binary_expression_t*)_expr;
-    VARIANT rval, lval;
+    VARIANT *l, *r;
     BOOL b;
     HRESULT hres;
 
-    TRACE("\n");
+    r = stack_pop(ctx);
+    l = stack_pop(ctx);
 
-    hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval);
-    if(FAILED(hres))
-        return hres;
+    TRACE("%s >= %s\n", debugstr_variant(l), debugstr_variant(r));
 
-    hres = less_eval(ctx, &lval, &rval, TRUE, ei, &b);
-    VariantClear(&lval);
-    VariantClear(&rval);
+    hres = less_eval(ctx->parser->script, l, r, TRUE, &ctx->ei, &b);
+    VariantClear(l);
+    VariantClear(r);
     if(FAILED(hres))
         return hres;
 
-    return return_bool(ret, b);
+    return stack_push_bool(ctx, b);
 }
 
 /* ECMA-262 3rd Edition    11.4.8 */
diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h
index c176180..e86db0f 100644
--- a/dlls/jscript/engine.h
+++ b/dlls/jscript/engine.h
@@ -51,6 +51,7 @@ typedef struct _func_stack {
     X(eq,         1, 0,0)                  \
     X(eq2,        1, 0,0)                  \
     X(gt,         1, 0,0)                  \
+    X(gteq,         1, 0,0)                \
     X(ident,      1, ARG_BSTR,   0)        \
     X(in,         1, 0,0)                  \
     X(int,        1, ARG_INT,    0)        \
@@ -563,7 +564,6 @@ HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcep
 HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
 HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
 HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
-HRESULT greatereq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
 HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
 HRESULT right_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
 HRESULT right2_shift_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 39bcba6..c1c5df6 100644
--- a/dlls/jscript/parser.y
+++ b/dlls/jscript/parser.y
@@ -1334,7 +1334,7 @@ static const expression_eval_t expression_eval_table[] = {
    compiled_expression_eval,
    compiled_expression_eval,
    compiled_expression_eval,
-   greatereq_expression_eval,
+   compiled_expression_eval,
    compiled_expression_eval,
    compiled_expression_eval,
    left_shift_expression_eval,