Jacek Caban : jscript: Use bytecode for this expression implementation.
Alexandre Julliard
julliard at winehq.org
Thu Nov 24 15:04:39 CST 2011
Module: wine
Branch: master
Commit: 83667e74d6fe8afc5c2bbdcec176b0775b73402a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=83667e74d6fe8afc5c2bbdcec176b0775b73402a
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Nov 24 14:24:14 2011 +0100
jscript: Use bytecode for this expression implementation.
---
dlls/jscript/compile.c | 2 ++
dlls/jscript/engine.c | 13 +++++++------
dlls/jscript/engine.h | 2 +-
dlls/jscript/parser.y | 2 +-
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c
index 9542912..0393c6a 100644
--- a/dlls/jscript/compile.c
+++ b/dlls/jscript/compile.c
@@ -223,6 +223,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr)
return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_neq2);
case EXPR_PLUS:
return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_tonum);
+ case EXPR_THIS:
+ return push_instr(ctx, OP_this) == -1 ? E_OUTOFMEMORY : S_OK;
default:
assert(expr->eval != compiled_expression_eval);
return compile_interp_fallback(ctx, expr);
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index fc19128..5446fa3 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -1694,15 +1694,16 @@ HRESULT call_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags
}
/* ECMA-262 3rd Edition 11.1.1 */
-HRESULT this_expression_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret)
+HRESULT interp_this(exec_ctx_t *ctx)
{
+ VARIANT v;
+
TRACE("\n");
- ret->type = EXPRVAL_VARIANT;
- V_VT(&ret->u.var) = VT_DISPATCH;
- V_DISPATCH(&ret->u.var) = ctx->exec_ctx->this_obj;
- IDispatch_AddRef(ctx->exec_ctx->this_obj);
- return S_OK;
+ V_VT(&v) = VT_DISPATCH;
+ V_DISPATCH(&v) = ctx->this_obj;
+ IDispatch_AddRef(ctx->this_obj);
+ return stack_push(ctx, &v);
}
/* ECMA-262 3rd Edition 10.1.4 */
diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h
index c775066..e7b66ec 100644
--- a/dlls/jscript/engine.h
+++ b/dlls/jscript/engine.h
@@ -54,6 +54,7 @@ typedef struct _func_stack {
X(null, 1, 0,0) \
X(regexp, 1, ARG_STR, ARG_INT) \
X(str, 1, ARG_STR, 0) \
+ X(this, 1, 0,0) \
X(tonum, 1, 0,0) \
X(tree, 1, ARG_EXPR, 0) \
X(ret, 0, 0,0)
@@ -528,7 +529,6 @@ HRESULT array_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,expr
HRESULT member_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT new_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT call_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
-HRESULT this_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT array_literal_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN;
diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y
index 7f46e94..a380576 100644
--- a/dlls/jscript/parser.y
+++ b/dlls/jscript/parser.y
@@ -1357,7 +1357,7 @@ static const expression_eval_t expression_eval_table[] = {
member_expression_eval,
new_expression_eval,
call_expression_eval,
- this_expression_eval,
+ compiled_expression_eval,
function_expression_eval,
identifier_expression_eval,
array_literal_expression_eval,
More information about the wine-cvs
mailing list