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

jscript: Use bytecode for '>>=' expression.

This commit is contained in:
Jacek Caban 2011-12-08 12:03:35 +01:00 committed by Alexandre Julliard
parent 28013dfa6f
commit d30bfb6e54
4 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/jscript/compile.c
View File

@ -625,6 +625,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr,
return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mod);
case EXPR_ASSIGNOR:
return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_or);
case EXPR_ASSIGNRSHIFT:
return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_rshift);
case EXPR_ASSIGNXOR:
return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_xor);
case EXPR_BAND:

40
dlls/jscript/engine.c
View File

@ -3119,26 +3119,6 @@ HRESULT left_shift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD
return binary_expr_eval(ctx, expr, lshift_eval, ei, ret);
}
/* ECMA-262 3rd Edition 11.7.2 */
static HRESULT rshift_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv)
{
DWORD ri;
INT li;
HRESULT hres;
hres = to_int32(ctx, lval, ei, &li);
if(FAILED(hres))
return hres;
hres = to_uint32(ctx, rval, ei, &ri);
if(FAILED(hres))
return hres;
V_VT(retv) = VT_I4;
V_I4(retv) = li >> (ri&0x1f);
return S_OK;
}
/* ECMA-262 3rd Edition 11.7.2 */
static HRESULT interp_rshift(exec_ctx_t *ctx)
{
@ -3157,16 +3137,6 @@ static HRESULT interp_rshift(exec_ctx_t *ctx)
return stack_push_int(ctx, l >> (r&0x1f));
}
/* ECMA-262 3rd Edition 11.7.2 */
HRESULT right_shift_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 binary_expr_eval(ctx, expr, rshift_eval, ei, ret);
}
/* ECMA-262 3rd Edition 11.7.3 */
static HRESULT rshift2_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv)
{
@ -3232,16 +3202,6 @@ HRESULT assign_lshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DW
return assign_oper_eval(ctx, expr->expression1, expr->expression2, lshift_eval, ei, ret);
}
/* ECMA-262 3rd Edition 11.13.2 */
HRESULT assign_rshift_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, rshift_eval, ei, ret);
}
/* ECMA-262 3rd Edition 11.13.2 */
HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
{

1
dlls/jscript/engine.h
View File

@ -569,7 +569,6 @@ HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp
HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT right2_shift_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_rrshift_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

@ -1341,7 +1341,7 @@ static const expression_eval_t expression_eval_table[] = {
right2_shift_expression_eval,
compiled_expression_eval,
assign_lshift_expression_eval,
assign_rshift_expression_eval,
compiled_expression_eval,
assign_rrshift_expression_eval,
compiled_expression_eval,
compiled_expression_eval,