jscript: Use bytecode for pre-decrement implementation.
This commit is contained in:
parent
667cc2e68a
commit
4d0e360266
|
@ -651,6 +651,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr,
|
||||||
return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_postinc, -1);
|
return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_postinc, -1);
|
||||||
case EXPR_POSTINC:
|
case EXPR_POSTINC:
|
||||||
return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_postinc, 1);
|
return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_postinc, 1);
|
||||||
|
case EXPR_PREDEC:
|
||||||
|
return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_preinc, -1);
|
||||||
case EXPR_PREINC:
|
case EXPR_PREINC:
|
||||||
return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_preinc, 1);
|
return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_preinc, 1);
|
||||||
case EXPR_SUB:
|
case EXPR_SUB:
|
||||||
|
|
|
@ -2735,7 +2735,7 @@ static HRESULT interp_postinc(exec_ctx_t *ctx)
|
||||||
return stack_push(ctx, &v);
|
return stack_push(ctx, &v);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ECMA-262 3rd Edition 11.4.4 */
|
/* ECMA-262 3rd Edition 11.4.4, 11.4.5 */
|
||||||
static HRESULT interp_preinc(exec_ctx_t *ctx)
|
static HRESULT interp_preinc(exec_ctx_t *ctx)
|
||||||
{
|
{
|
||||||
const int arg = ctx->parser->code->instrs[ctx->ip].arg1.lng;
|
const int arg = ctx->parser->code->instrs[ctx->ip].arg1.lng;
|
||||||
|
@ -2768,40 +2768,6 @@ static HRESULT interp_preinc(exec_ctx_t *ctx)
|
||||||
return stack_push(ctx, &v);
|
return stack_push(ctx, &v);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ECMA-262 3rd Edition 11.4.5 */
|
|
||||||
HRESULT pre_decrement_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
|
|
||||||
{
|
|
||||||
unary_expression_t *expr = (unary_expression_t*)_expr;
|
|
||||||
VARIANT val, num;
|
|
||||||
exprval_t exprval;
|
|
||||||
HRESULT hres;
|
|
||||||
|
|
||||||
TRACE("\n");
|
|
||||||
|
|
||||||
hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval);
|
|
||||||
if(FAILED(hres))
|
|
||||||
return hres;
|
|
||||||
|
|
||||||
hres = exprval_value(ctx, &exprval, ei, &val);
|
|
||||||
if(SUCCEEDED(hres)) {
|
|
||||||
hres = to_number(ctx, &val, ei, &num);
|
|
||||||
VariantClear(&val);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(SUCCEEDED(hres)) {
|
|
||||||
num_set_val(&val, num_val(&num)-1.0);
|
|
||||||
hres = put_value(ctx, &exprval, &val, ei);
|
|
||||||
}
|
|
||||||
|
|
||||||
exprval_release(&exprval);
|
|
||||||
if(FAILED(hres))
|
|
||||||
return hres;
|
|
||||||
|
|
||||||
ret->type = EXPRVAL_VARIANT;
|
|
||||||
ret->u.var = val;
|
|
||||||
return S_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ECMA-262 3rd Edition 11.9.3 */
|
/* ECMA-262 3rd Edition 11.9.3 */
|
||||||
static HRESULT equal_values(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, BOOL *ret)
|
static HRESULT equal_values(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, BOOL *ret)
|
||||||
{
|
{
|
||||||
|
|
|
@ -564,7 +564,6 @@ HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*
|
||||||
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 delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
|
HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
|
||||||
HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
|
HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
|
||||||
HRESULT pre_decrement_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 left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
|
||||||
HRESULT right_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
|
HRESULT right_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 right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
|
||||||
|
|
|
@ -1325,7 +1325,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,
|
||||||
pre_decrement_expression_eval,
|
compiled_expression_eval,
|
||||||
compiled_expression_eval,
|
compiled_expression_eval,
|
||||||
compiled_expression_eval,
|
compiled_expression_eval,
|
||||||
compiled_expression_eval,
|
compiled_expression_eval,
|
||||||
|
|
Loading…
Reference in New Issue