Jacek Caban : jscript: No longer support per-statement compilation.
Alexandre Julliard
julliard at winehq.org
Thu Dec 29 12:15:45 CST 2011
Module: wine
Branch: master
Commit: b3907c40f74f4b25ed9c7a34004ddac051eb43e7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3907c40f74f4b25ed9c7a34004ddac051eb43e7
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Dec 29 11:09:09 2011 +0100
jscript: No longer support per-statement compilation.
---
dlls/jscript/compile.c | 4 ++--
dlls/jscript/engine.c | 14 ++++----------
dlls/jscript/engine.h | 2 +-
3 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c
index 5d63dbe..05d1ccc 100644
--- a/dlls/jscript/compile.c
+++ b/dlls/jscript/compile.c
@@ -1637,7 +1637,7 @@ HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, unsigned *re
return push_instr(parser->compiler, OP_ret) == -1 ? E_OUTOFMEMORY : S_OK;
}
-HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL compile_block, unsigned *ret_off)
+HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned *ret_off)
{
HRESULT hres;
@@ -1648,7 +1648,7 @@ HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL com
return hres;
*ret_off = parser->compiler->code_off;
- if(compile_block && stat->next)
+ if(stat->next)
hres = compile_block_statement(parser->compiler, stat);
else
hres = compile_statement(parser->compiler, NULL, stat);
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index c792a66..1cd96a7 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -2589,7 +2589,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx)
return hres;
}
-HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret)
+static HRESULT enter_bytecode(script_ctx_t *ctx, unsigned ip, return_type_t *rt, VARIANT *ret)
{
exec_ctx_t *exec_ctx = ctx->exec_ctx;
except_frame_t *prev_except_frame;
@@ -2602,19 +2602,13 @@ HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_typ
TRACE("\n");
- if(stat->instr_off == -1) {
- hres = compile_subscript_stat(exec_ctx->parser, stat, FALSE, &stat->instr_off);
- if(FAILED(hres))
- return hres;
- }
-
prev_rt = exec_ctx->rt;
prev_top = exec_ctx->top;
prev_scope = exec_ctx->scope_chain;
prev_except_frame = exec_ctx->except_frame;
prev_ip = exec_ctx->ip;
prev_ei = exec_ctx->ei;
- exec_ctx->ip = stat->instr_off;
+ exec_ctx->ip = ip;
exec_ctx->rt = rt;
exec_ctx->ei = &rt->ei;
exec_ctx->except_frame = NULL;
@@ -2762,9 +2756,9 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so
if(source->statement) {
if(source->statement->instr_off == -1)
- hres = compile_subscript_stat(ctx->parser, source->statement, TRUE, &source->statement->instr_off);
+ hres = compile_subscript_stat(ctx->parser, source->statement, &source->statement->instr_off);
if(SUCCEEDED(hres))
- hres = compiled_statement_eval(script, source->statement, &rt, &val);
+ hres = enter_bytecode(script, source->statement->instr_off, &rt, &val);
}
script->exec_ctx = prev_ctx;
diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h
index b42a2ba..c984ade 100644
--- a/dlls/jscript/engine.h
+++ b/dlls/jscript/engine.h
@@ -591,4 +591,4 @@ typedef struct {
} property_value_expression_t;
HRESULT compile_subscript(parser_ctx_t*,expression_t*,unsigned*) DECLSPEC_HIDDEN;
-HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,BOOL,unsigned*) DECLSPEC_HIDDEN;
+HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,unsigned*) DECLSPEC_HIDDEN;
More information about the wine-cvs
mailing list