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-11-22 16:31:44 +01:00 committed by Alexandre Julliard
parent dcca57fd87
commit b1b0aadaab
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/jscript/compile.c
View File

@ -107,6 +107,8 @@ static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr)
static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr)
{ {
switch(expr->type) { switch(expr->type) {
case EXPR_ADD:
return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add);
case EXPR_BITNEG: case EXPR_BITNEG:
return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg);
case EXPR_EQEQ: case EXPR_EQEQ:

16
dlls/jscript/engine.c
View File

@ -2213,13 +2213,21 @@ static HRESULT add_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep
} }
/* ECMA-262 3rd Edition 11.6.1 */ /* ECMA-262 3rd Edition 11.6.1 */
HRESULT add_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) HRESULT interp_add(exec_ctx_t *ctx)
{ {
binary_expression_t *expr = (binary_expression_t*)_expr; VARIANT *l, *r, ret;
HRESULT hres;
TRACE("\n"); r = stack_pop(ctx);
l = stack_pop(ctx);
return binary_expr_eval(ctx, expr, add_eval, ei, ret); TRACE("%s + %s\n", debugstr_variant(l), debugstr_variant(r));
hres = add_eval(ctx->parser->script, l, r, &ctx->ei, &ret);
if(FAILED(hres))
return hres;
return stack_push(ctx, &ret);
} }
/* ECMA-262 3rd Edition 11.6.2 */ /* ECMA-262 3rd Edition 11.6.2 */

2
dlls/jscript/engine.h
View File

@ -42,6 +42,7 @@ typedef struct _func_stack {
} func_stack_t; } func_stack_t;
#define OP_LIST \ #define OP_LIST \
X(add, 1, 0) \
X(bneg, 1, 0) \ X(bneg, 1, 0) \
X(eq2, 1, 0) \ X(eq2, 1, 0) \
X(neg, 1, 0) \ X(neg, 1, 0) \
@ -529,7 +530,6 @@ HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*
HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT in_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT in_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT add_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT sub_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT sub_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT mul_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT mul_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;

2
dlls/jscript/parser.y
View File

@ -1313,7 +1313,7 @@ static const expression_eval_t expression_eval_table[] = {
binary_and_expression_eval, binary_and_expression_eval,
instanceof_expression_eval, instanceof_expression_eval,
in_expression_eval, in_expression_eval,
add_expression_eval, compiled_expression_eval,
sub_expression_eval, sub_expression_eval,
mul_expression_eval, mul_expression_eval,
div_expression_eval, div_expression_eval,