Module: wine Branch: master Commit: e5a31cc2d0184c85fa335b36436f30dbea8e19de URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a31cc2d0184c85fa335b3643...
Author: Jacek Caban jacek@codeweavers.com Date: Thu Dec 1 13:22:52 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 b0fa861..e5598f6 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -408,6 +408,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return push_instr_bstr(ctx, OP_ident, ((identifier_expression_t*)expr)->identifier); case EXPR_IN: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_in); + case EXPR_LESS: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lt); case EXPR_LITERAL: return compile_literal(ctx, ((literal_expression_t*)expr)->literal); case EXPR_LOGNEG: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 62efc44..25af171 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3016,26 +3016,24 @@ static HRESULT less_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, BOOL g }
/* ECMA-262 3rd Edition 11.8.1 */ -HRESULT less_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_lt(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, FALSE, ei, &b); - VariantClear(&lval); - VariantClear(&rval); + hres = less_eval(ctx->parser->script, l, r, FALSE, &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.8.3 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 362e9d1..7d39102 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -56,6 +56,7 @@ typedef struct _func_stack { X(jmp, 0, ARG_ADDR, 0) \ X(jmp_nz, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \ + X(lt, 1, 0,0) \ X(minus, 1, 0,0) \ X(mod, 1, 0,0) \ X(mul, 1, 0,0) \ @@ -560,7 +561,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 less_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT lesseq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT greater_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; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 3fffbe9..45d1ce9 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1331,7 +1331,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - less_expression_eval, + compiled_expression_eval, lesseq_expression_eval, greater_expression_eval, greatereq_expression_eval,