ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Use bytecode for '<' expression implementation.

This commit is contained in:
Jacek Caban 2011-12-01 13:22:52 +01:00 committed by Alexandre Julliard
parent 39b7e6e50c
commit e5a31cc2d0
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/jscript/compile.c
View File

@ -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); return push_instr_bstr(ctx, OP_ident, ((identifier_expression_t*)expr)->identifier);
case EXPR_IN: case EXPR_IN:
return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_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: case EXPR_LITERAL:
return compile_literal(ctx, ((literal_expression_t*)expr)->literal); return compile_literal(ctx, ((literal_expression_t*)expr)->literal);
case EXPR_LOGNEG: case EXPR_LOGNEG:

22
dlls/jscript/engine.c
View File

@ -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 */ /* 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 *l, *r;
VARIANT rval, lval;
BOOL b; BOOL b;
HRESULT hres; HRESULT hres;
TRACE("\n"); r = stack_pop(ctx);
l = stack_pop(ctx);
hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); TRACE("%s < %s\n", debugstr_variant(l), debugstr_variant(r));
hres = less_eval(ctx->parser->script, l, r, FALSE, &ctx->ei, &b);
VariantClear(l);
VariantClear(r);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
hres = less_eval(ctx, &lval, &rval, FALSE, ei, &b); return stack_push_bool(ctx, b);
VariantClear(&lval);
VariantClear(&rval);
if(FAILED(hres))
return hres;
return return_bool(ret, b);
} }
/* ECMA-262 3rd Edition 11.8.3 */ /* ECMA-262 3rd Edition 11.8.3 */

2
dlls/jscript/engine.h
View File

@ -56,6 +56,7 @@ typedef struct _func_stack {
X(jmp, 0, ARG_ADDR, 0) \ X(jmp, 0, ARG_ADDR, 0) \
X(jmp_nz, 0, ARG_ADDR, 0) \ X(jmp_nz, 0, ARG_ADDR, 0) \
X(jmp_z, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \
X(lt, 1, 0,0) \
X(minus, 1, 0,0) \ X(minus, 1, 0,0) \
X(mod, 1, 0,0) \ X(mod, 1, 0,0) \
X(mul, 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 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_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 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 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 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; HRESULT greatereq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;

2
dlls/jscript/parser.y
View File

@ -1331,7 +1331,7 @@ static const expression_eval_t expression_eval_table[] = {
compiled_expression_eval, compiled_expression_eval,
compiled_expression_eval, compiled_expression_eval,
compiled_expression_eval, compiled_expression_eval,
less_expression_eval, compiled_expression_eval,
lesseq_expression_eval, lesseq_expression_eval,
greater_expression_eval, greater_expression_eval,
greatereq_expression_eval, greatereq_expression_eval,