Commit 7904932a authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

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

parent 96e822a3
......@@ -627,6 +627,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr,
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_ASSIGNRRSHIFT:
return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_rshift2);
case EXPR_ASSIGNXOR:
return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_xor);
case EXPR_BAND:
......
......@@ -3141,25 +3141,6 @@ static HRESULT interp_rshift(exec_ctx_t *ctx)
}
/* ECMA-262 3rd Edition 11.7.3 */
static HRESULT rshift2_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv)
{
DWORD li, ri;
HRESULT hres;
hres = to_uint32(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.3 */
static HRESULT interp_rshift2(exec_ctx_t *ctx)
{
DWORD r, l;
......@@ -3212,16 +3193,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_rrshift_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, rshift2_eval, ei, ret);
}
static HRESULT interp_undefined(exec_ctx_t *ctx)
{
VARIANT v;
......
......@@ -569,7 +569,6 @@ HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp
HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT left_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_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;
......
......@@ -1342,7 +1342,7 @@ static const expression_eval_t expression_eval_table[] = {
compiled_expression_eval,
assign_lshift_expression_eval,
compiled_expression_eval,
assign_rrshift_expression_eval,
compiled_expression_eval,
compiled_expression_eval,
compiled_expression_eval,
compiled_expression_eval,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment