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-06 10:42:30 +01:00 committed by Alexandre Julliard
parent c74641acf2
commit 9749de29bc
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

@ -501,6 +501,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr)
return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mod); return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mod);
case EXPR_ASSIGNOR: case EXPR_ASSIGNOR:
return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_or); return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_or);
case EXPR_ASSIGNXOR:
return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_xor);
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_BOR: case EXPR_BOR:

29
dlls/jscript/engine.c
View File

@ -2169,25 +2169,6 @@ static HRESULT interp_or(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 xor_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_xor(exec_ctx_t *ctx) static HRESULT interp_xor(exec_ctx_t *ctx)
{ {
@ -3365,16 +3346,6 @@ HRESULT assign_and_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD
return assign_oper_eval(ctx, expr->expression1, expr->expression2, bitand_eval, ei, ret); return assign_oper_eval(ctx, expr->expression1, expr->expression2, bitand_eval, ei, ret);
} }
/* ECMA-262 3rd Edition 11.13.2 */
HRESULT assign_xor_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, xor_eval, ei, ret);
}
static HRESULT interp_jmp(exec_ctx_t *ctx) static HRESULT interp_jmp(exec_ctx_t *ctx)
{ {
const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; const unsigned arg = ctx->parser->code->instrs[ctx->ip].arg1.uint;

1
dlls/jscript/engine.h
View File

@ -577,7 +577,6 @@ HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept
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 assign_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT assign_xor_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

@ -1351,7 +1351,7 @@ static const expression_eval_t expression_eval_table[] = {
compiled_expression_eval, compiled_expression_eval,
assign_and_expression_eval, assign_and_expression_eval,
compiled_expression_eval, compiled_expression_eval,
assign_xor_expression_eval, compiled_expression_eval,
compiled_expression_eval, compiled_expression_eval,
array_expression_eval, array_expression_eval,
member_expression_eval, member_expression_eval,