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-08 12:03:09 +01:00 committed by Alexandre Julliard
parent 1ef486421e
commit fc4948af2c
4 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/jscript/compile.c
View File

@ -613,6 +613,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr,
return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_LAST); return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_LAST);
case EXPR_ASSIGNADD: case EXPR_ASSIGNADD:
return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_add); return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_add);
case EXPR_ASSIGNAND:
return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_and);
case EXPR_ASSIGNSUB: case EXPR_ASSIGNSUB:
return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_sub); return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_sub);
case EXPR_ASSIGNMUL: case EXPR_ASSIGNMUL:

29
dlls/jscript/engine.c
View File

@ -2164,25 +2164,6 @@ static HRESULT interp_xor(exec_ctx_t *ctx)
return stack_push_int(ctx, l^r); return stack_push_int(ctx, l^r);
} }
/* ECMA-262 3rd Edition 11.10 */
static HRESULT bitand_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 */ /* ECMA-262 3rd Edition 11.10 */
static HRESULT interp_and(exec_ctx_t *ctx) static HRESULT interp_and(exec_ctx_t *ctx)
{ {
@ -3248,16 +3229,6 @@ HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, D
return assign_oper_eval(ctx, expr->expression1, expr->expression2, rshift2_eval, ei, ret); return assign_oper_eval(ctx, expr->expression1, expr->expression2, rshift2_eval, ei, ret);
} }
/* ECMA-262 3rd Edition 11.13.2 */
HRESULT assign_and_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, bitand_eval, ei, ret);
}
static HRESULT interp_undefined(exec_ctx_t *ctx) static HRESULT interp_undefined(exec_ctx_t *ctx)
{ {
VARIANT v; VARIANT v;

1
dlls/jscript/engine.h
View File

@ -571,7 +571,6 @@ HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_
HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT assign_rshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; 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_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 compiled_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;

2
dlls/jscript/parser.y
View File

@ -1348,7 +1348,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,
assign_and_expression_eval, compiled_expression_eval,
compiled_expression_eval, compiled_expression_eval,
compiled_expression_eval, compiled_expression_eval,
compiled_expression_eval, compiled_expression_eval,