December 2011 - Wine-Commits

Jacek Caban : jscript: Get rid of no longer needed interp_tree.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: 83e86588943d9ff8bf6aa976e6c0b00416d9bdf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e86588943d9ff8bf6aa976e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 11:20:43 2011 +0100 jscript: Get rid of no longer needed interp_tree. --- dlls/jscript/compile.c | 1 - dlls/jscript/engine.c | 17 +---------------- dlls/jscript/engine.h | 8 +------- dlls/jscript/parser.y | 1 - 4 files changed, 2 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 6d01db6..60b0c2e 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -81,7 +81,6 @@ static void dump_instr_arg(instr_arg_type_t type, instr_arg_t *arg) case ARG_DBL: TRACE_(jscript_disas)("\t%lf", *arg->dbl); break; - case ARG_STAT: case ARG_FUNC: case ARG_NONE: break; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index dce9410..2efa5ad 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 Jacek Caban for CodeWeavers + * Copyright 2008,2011 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2439,21 +2439,6 @@ static HRESULT interp_ret(exec_ctx_t *ctx) return S_OK; } -static HRESULT interp_tree(exec_ctx_t *ctx) -{ - instr_t *instr = ctx->parser->code->instrs+ctx->ip; - VARIANT v; - HRESULT hres; - - TRACE("\n"); - - hres = instr->arg1.stat->eval(ctx->parser->script, instr->arg1.stat, ctx->rt, &v); - if(FAILED(hres)) - return hres; - - return stack_push(ctx, &v); -} - typedef HRESULT (*op_func_t)(exec_ctx_t*); static const op_func_t op_funcs[] = { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 04d2698..fa681a5 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -1,5 +1,5 @@ /* - * Copyright 2008 Jacek Caban for CodeWeavers + * Copyright 2008,2011 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -106,7 +106,6 @@ typedef struct _func_stack { X(throw_ref, 0, ARG_UINT, 0) \ X(throw_type, 0, ARG_UINT, ARG_STR) \ X(tonum, 1, 0,0) \ - X(tree, 1, ARG_STAT, 0) \ X(typeof, 1, 0,0) \ X(typeofid, 1, 0,0) \ X(typeofident,1, 0,0) \ @@ -126,7 +125,6 @@ OP_LIST } jsop_t; typedef union { - statement_t *stat; BSTR bstr; double *dbl; LONG lng; @@ -140,7 +138,6 @@ typedef enum { ARG_ADDR, ARG_BSTR, ARG_DBL, - ARG_STAT, ARG_FUNC, ARG_INT, ARG_STR, @@ -296,8 +293,6 @@ typedef struct _variable_declaration_t { struct _variable_declaration_t *next; } variable_declaration_t; -typedef HRESULT (*statement_eval_t)(script_ctx_t*,statement_t*,return_type_t*,VARIANT*); - typedef enum { STAT_BLOCK, STAT_BREAK, @@ -319,7 +314,6 @@ typedef enum { struct _statement_t { statement_type_t type; - statement_eval_t eval; statement_t *next; }; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index c45fb6e..81ec9a2 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -844,7 +844,6 @@ static void *new_statement(parser_ctx_t *ctx, statement_type_t type, size_t size return NULL; stat->type = type; - stat->eval = NULL; stat->next = NULL; return stat;

1 0

Aric Stewart : usp10: Cache FontScriptTags information.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: 1090cd2f11595e6c120256a5a719fead6fa7613a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1090cd2f11595e6c120256a5a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 29 14:50:12 2011 -0600 usp10: Cache FontScriptTags information. --- dlls/usp10/shape.c | 46 ++++++++++++++++++++++++++++--------------- dlls/usp10/usp10.c | 1 + dlls/usp10/usp10_internal.h | 7 ++++++ 3 files changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0574591..fcf765e 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3779,39 +3779,53 @@ DWORD CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWORD pgi, DW return 0; } -static HRESULT GSUB_GetFontScriptTags(LPCVOID table, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags, LPCVOID* script_table) +static void GSUB_initialize_script_cache(ScriptCache *psc) { - const GSUB_ScriptList *script; - const GSUB_Header* header = (const GSUB_Header*)table; int i; - HRESULT rc = S_OK; - script = (const GSUB_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); + if (!psc->script_count) + { + const GSUB_ScriptList *script; + const GSUB_Header* header = (const GSUB_Header*)psc->GSUB_Table; + script = (const GSUB_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); + psc->script_count = GET_BE_WORD(script->ScriptCount); + TRACE("initializing %i scripts in this font\n",psc->script_count); + psc->scripts = HeapAlloc(GetProcessHeap(),0,sizeof(LoadedScript) * psc->script_count); + for (i = 0; i < psc->script_count; i++) + { + int offset = GET_BE_WORD(script->ScriptRecord[i].Script); + psc->scripts[i].tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + psc->scripts[i].table = ((const BYTE*)script + offset); + } + } +} - *pcTags = GET_BE_WORD(script->ScriptCount); - TRACE("%i scripts in this font\n",*pcTags); +static HRESULT GSUB_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags, LPCVOID* script_table) +{ + int i; + HRESULT rc = S_OK; + + GSUB_initialize_script_cache(psc); + *pcTags = psc->script_count; if (!searchingFor && cMaxTags < *pcTags) rc = E_OUTOFMEMORY; else if (searchingFor) rc = USP_E_SCRIPT_NOT_IN_FONT; - for (i = 0; i < *pcTags; i++) + for (i = 0; i < psc->script_count; i++) { if (i < cMaxTags) - pScriptTags[i] = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + pScriptTags[i] = psc->scripts[i].tag; if (searchingFor) { - if (strncmp(script->ScriptRecord[i].ScriptTag, (char*)&searchingFor,4)==0) + if (searchingFor == psc->scripts[i].tag) { - pScriptTags[0] = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + pScriptTags[0] = psc->scripts[i].tag; *pcTags = 1; if (script_table) - { - int offset = GET_BE_WORD(script->ScriptRecord[i].Script); - *script_table = ((const BYTE*)script + offset); - } + *script_table = psc->scripts[i].table; rc = S_OK; break; } @@ -3836,7 +3850,7 @@ HRESULT SHAPE_GetFontScriptTags( HDC hdc, ScriptCache *psc, searching = MS_MAKE_TAG(ShapingData[psa->eScript].otTag[0], ShapingData[psa->eScript].otTag[1], ShapingData[psa->eScript].otTag[2], ShapingData[psa->eScript].otTag[3]); } - hr = GSUB_GetFontScriptTags(psc->GSUB_Table, searching, cMaxTags, pScriptTags, pcTags, NULL); + hr = GSUB_GetFontScriptTags(psc, searching, cMaxTags, pScriptTags, pcTags, NULL); if (FAILED(hr)) *pcTags = 0; return hr; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 2e2efb5..e9278b3 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -933,6 +933,7 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) heap_free(((ScriptCache *)*psc)->GSUB_Table); heap_free(((ScriptCache *)*psc)->GDEF_Table); heap_free(((ScriptCache *)*psc)->CMAP_Table); + heap_free(((ScriptCache *)*psc)->scripts); heap_free(((ScriptCache *)*psc)->features); heap_free(*psc); *psc = NULL; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index fb98377..6243877 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -132,6 +132,11 @@ typedef struct { } LoadedFeature; typedef struct { + OPENTYPE_TAG tag; + LPCVOID table; +} LoadedScript; + +typedef struct { LOGFONTW lf; TEXTMETRICW tm; BOOL sfnt; @@ -143,6 +148,8 @@ typedef struct { LPVOID CMAP_format12_Table; INT feature_count; LoadedFeature *features; + INT script_count; + LoadedScript *scripts; OPENTYPE_TAG userScript; OPENTYPE_TAG userLang;

1 0

Aric Stewart : usp10: Updates to ScriptGetFontScriptTags.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: 1fc015636e452380b3e99c48f5b9d68b131bb06c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc015636e452380b3e99c48f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 29 14:50:08 2011 -0600 usp10: Updates to ScriptGetFontScriptTags. --- dlls/usp10/shape.c | 21 ++++++++++++--------- dlls/usp10/tests/usp10.c | 14 ++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 91f706b..0574591 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3788,12 +3788,19 @@ static HRESULT GSUB_GetFontScriptTags(LPCVOID table, OPENTYPE_TAG searchingFor, script = (const GSUB_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); - *pcTags = 0; - TRACE("%i scripts in this font\n",GET_BE_WORD(script->ScriptCount)); - if (!searchingFor && cMaxTags < GET_BE_WORD(script->ScriptCount)) + *pcTags = GET_BE_WORD(script->ScriptCount); + TRACE("%i scripts in this font\n",*pcTags); + + if (!searchingFor && cMaxTags < *pcTags) rc = E_OUTOFMEMORY; - for (i = 0; i < GET_BE_WORD(script->ScriptCount); i++) + else if (searchingFor) + rc = USP_E_SCRIPT_NOT_IN_FONT; + + for (i = 0; i < *pcTags; i++) { + if (i < cMaxTags) + pScriptTags[i] = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); + if (searchingFor) { if (strncmp(script->ScriptRecord[i].ScriptTag, (char*)&searchingFor,4)==0) @@ -3805,14 +3812,10 @@ static HRESULT GSUB_GetFontScriptTags(LPCVOID table, OPENTYPE_TAG searchingFor, int offset = GET_BE_WORD(script->ScriptRecord[i].Script); *script_table = ((const BYTE*)script + offset); } + rc = S_OK; break; } } - else if (i < cMaxTags) - { - pScriptTags[i] = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); - *pcTags = *pcTags + 1; - } } return rc; } diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index cdd1510..aa03ffe 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2880,6 +2880,11 @@ static void test_ScriptGetFontFunctions(HDC hdc) SCRIPT_CACHE sc = NULL; OPENTYPE_TAG tags[5]; int count = 0; + int outnItems=0; + SCRIPT_ITEM outpItems[15]; + SCRIPT_CONTROL Control; + SCRIPT_STATE State; + static const WCHAR test_phagspa[] = {0xa84f, 0xa861, 0xa843, 0x0020, 0xa863, 0xa861, 0xa859, 0x0020, 0xa850, 0xa85c, 0xa85e}; hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, NULL, NULL); ok(hr == E_INVALIDARG,"Incorrect return code\n"); @@ -2903,6 +2908,15 @@ static void test_ScriptGetFontFunctions(HDC hdc) else if (hr == E_OUTOFMEMORY) ok(count == 0, "Count should be 0 with E_OUTOFMEMORY return\n"); ok(sc != NULL, "ScriptCache should be initialized\n"); + + memset(&Control, 0, sizeof(Control)); + memset(&State, 0, sizeof(State)); + + hr = ScriptItemize(test_phagspa, 10, 15, &Control, &State, outpItems, &outnItems); + ok(hr == S_OK, "ScriptItemize failed: 0x%08x\n", hr); + memset(tags,0,sizeof(tags)); + hr = pScriptGetFontScriptTags(hdc, &sc, &outpItems[0].a, 5, tags, &count); + ok( hr == USP_E_SCRIPT_NOT_IN_FONT || broken(hr == S_OK), "wrong return code\n"); ScriptFreeCache(&sc); } }

1 0

Jacek Caban : jscript: Get rid of return_type_t.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: da07748ca21ce388a712867ef806fca3ddc421fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=da07748ca21ce388a712867ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 11:21:05 2011 +0100 jscript: Get rid of return_type_t. --- dlls/jscript/engine.c | 37 +++++++++++++------------------------ dlls/jscript/engine.h | 2 -- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2efa5ad..9138d1d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -37,10 +37,6 @@ static const WCHAR stringW[] = {'s','t','r','i','n','g',0}; static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; static const WCHAR unknownW[] = {'u','n','k','n','o','w','n',0}; -struct _return_type_t { - jsexcept_t ei; -}; - struct _except_frame_t { unsigned stack_top; scope_chain_t *scope; @@ -718,7 +714,7 @@ static HRESULT interp_throw(exec_ctx_t *ctx) { TRACE("\n"); - ctx->rt->ei.var = *stack_pop(ctx); + ctx->ei->var = *stack_pop(ctx); return DISP_E_EXCEPTION; } @@ -807,7 +803,7 @@ static HRESULT interp_end_finally(exec_ctx_t *ctx) VariantClear(v); stack_popn(ctx, 1); - ctx->rt->ei.var = *stack_pop(ctx); + ctx->ei->var = *stack_pop(ctx); return DISP_E_EXCEPTION; } @@ -2471,8 +2467,8 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) ctx->ip = except_frame->catch_off; - except_val = ctx->rt->ei.var; - memset(&ctx->rt->ei, 0, sizeof(ctx->rt->ei)); + except_val = ctx->ei->var; + memset(ctx->ei, 0, sizeof(*ctx->ei)); ident = except_frame->ident; heap_free(except_frame); @@ -2482,7 +2478,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) hres = create_dispex(ctx->parser->script, NULL, NULL, &scope_obj); if(SUCCEEDED(hres)) { - hres = jsdisp_propput_name(scope_obj, ident, &except_val, &ctx->rt->ei, NULL/*FIXME*/); + hres = jsdisp_propput_name(scope_obj, ident, &except_val, ctx->ei, NULL/*FIXME*/); if(FAILED(hres)) jsdisp_release(scope_obj); } @@ -2510,28 +2506,25 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) return hres; } -static HRESULT enter_bytecode(script_ctx_t *ctx, unsigned ip, return_type_t *rt, VARIANT *ret) +static HRESULT enter_bytecode(script_ctx_t *ctx, unsigned ip, jsexcept_t *ei, VARIANT *ret) { exec_ctx_t *exec_ctx = ctx->exec_ctx; except_frame_t *prev_except_frame; unsigned prev_ip, prev_top; scope_chain_t *prev_scope; - return_type_t *prev_rt; jsexcept_t *prev_ei; jsop_t op; HRESULT hres = S_OK; TRACE("\n"); - 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 = ip; - exec_ctx->rt = rt; - exec_ctx->ei = &rt->ei; + exec_ctx->ei = ei; exec_ctx->except_frame = NULL; while(exec_ctx->ip != -1) { @@ -2551,7 +2544,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, unsigned ip, return_type_t *rt, } } - exec_ctx->rt = prev_rt; exec_ctx->ip = prev_ip; exec_ctx->ei = prev_ei; exec_ctx->except_frame = prev_except_frame; @@ -2582,7 +2574,6 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so var_list_t *var; VARIANT val; exec_ctx_t *prev_ctx; - return_type_t rt; HRESULT hres = S_OK; for(func = source->functions; func; func = func->next) { @@ -2622,31 +2613,29 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so prev_parser = ctx->parser; ctx->parser = parser; - V_VT(&val) = VT_EMPTY; - memset(&rt, 0, sizeof(rt)); - if(source->statement) { if(source->instr_off == -1) { hres = compile_subscript_stat(ctx->parser, source->statement, from_eval, &source->instr_off); if(FAILED(hres) && is_jscript_error(hres)) - hres = throw_syntax_error(script, &rt.ei, hres, NULL); + hres = throw_syntax_error(script, ei, hres, NULL); } if(SUCCEEDED(hres)) - hres = enter_bytecode(script, source->instr_off, &rt, &val); + hres = enter_bytecode(script, source->instr_off, ei, &val); + }else { + V_VT(&val) = VT_EMPTY; } script->exec_ctx = prev_ctx; ctx->parser = prev_parser; - *ei = rt.ei; if(FAILED(hres)) { VariantClear(&val); return hres; } - if(!retv) - VariantClear(&val); if(retv) *retv = val; + else + VariantClear(&val); return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index fa681a5..386f448 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -223,7 +223,6 @@ static inline void scope_addref(scope_chain_t *scope) scope->ref++; } -typedef struct _return_type_t return_type_t; typedef struct _except_frame_t except_frame_t; struct _exec_ctx_t { @@ -242,7 +241,6 @@ struct _exec_ctx_t { unsigned ip; jsexcept_t *ei; - return_type_t *rt; /* FIXME */ }; static inline void exec_addref(exec_ctx_t *ctx)

1 0

Jacek Caban : jscript: Get rid of no longer needed compile_interp_fallback since we can handle all execution by bytecode .
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: cdd90254ddee6eddb4061ff3c1cb96409a003743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd90254ddee6eddb4061ff3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 11:20:33 2011 +0100 jscript: Get rid of no longer needed compile_interp_fallback since we can handle all execution by bytecode. We use compiler on whole functions body now. There is still some work done to move it one level up (to whole source string) to do some work that's currently done (sometimes in a hacky way) by parser, but the most critical part is done. --- dlls/jscript/compile.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 8500076..6d01db6 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -518,18 +518,6 @@ static HRESULT compile_new_expression(compiler_ctx_t *ctx, call_expression_t *ex return push_instr_int(ctx, OP_new, arg_cnt); } -static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, statement_t *stat) -{ - unsigned instr; - - instr = push_instr(ctx, OP_tree); - if(instr == -1) - return E_OUTOFMEMORY; - - instr_ptr(ctx, instr)->arg1.stat = stat; - return S_OK; -} - static HRESULT compile_call_expression(compiler_ctx_t *ctx, call_expression_t *expr, BOOL *no_ret) { unsigned arg_cnt = 0; @@ -1614,7 +1602,7 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, hres = compile_with_statement(ctx, (with_statement_t*)stat); break; default: - hres = compile_interp_fallback(ctx, stat); + assert(0); } if(stat_ctx) {

1 0

Jacek Caban : jscript: Make compiler responsible for proper return from regular code vs. eval-interpreted code.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: dd7a5301e69be44bdcff35926959469af5850ebb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd7a5301e69be44bdcff35926… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 11:14:14 2011 +0100 jscript: Make compiler responsible for proper return from regular code vs. eval-interpreted code. --- dlls/jscript/compile.c | 4 +++- dlls/jscript/engine.c | 9 ++------- dlls/jscript/engine.h | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index aca5f73..12310d0 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1688,7 +1688,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, unsigned *ret_off) +HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL from_eval, unsigned *ret_off) { unsigned off; HRESULT hres; @@ -1709,6 +1709,8 @@ HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, unsigned resolve_labels(parser->compiler, off); + if(!from_eval && push_instr(parser->compiler, OP_pop) == -1) + return E_OUTOFMEMORY; if(push_instr(parser->compiler, OP_ret) == -1) return E_OUTOFMEMORY; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 387d508..9295064 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2740,7 +2740,7 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so if(source->statement) { if(source->instr_off == -1) { - hres = compile_subscript_stat(ctx->parser, source->statement, &source->instr_off); + hres = compile_subscript_stat(ctx->parser, source->statement, from_eval, &source->instr_off); if(FAILED(hres) && is_jscript_error(hres)) hres = throw_syntax_error(script, &rt.ei, hres, NULL); } @@ -2751,18 +2751,13 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so script->exec_ctx = prev_ctx; ctx->parser = prev_parser; - if(rt.type != RT_NORMAL && rt.type != RT_RETURN) { - FIXME("wrong rt %d\n", rt.type); - hres = E_FAIL; - } - *ei = rt.ei; if(FAILED(hres)) { VariantClear(&val); return hres; } - if(!retv || (!from_eval && rt.type != RT_RETURN)) + if(!retv) VariantClear(&val); if(retv) *retv = val; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 530a65a..fa47a4c 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*,unsigned*) DECLSPEC_HIDDEN; +HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,BOOL,unsigned*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Use bytecode for return statement implementation.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: fc092da98e88940245b4185a2edd083879ed2821 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc092da98e88940245b4185a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 11:15:09 2011 +0100 jscript: Use bytecode for return statement implementation. --- dlls/jscript/compile.c | 33 +++++++++------------- dlls/jscript/engine.c | 70 ------------------------------------------------ dlls/jscript/engine.h | 2 - 3 files changed, 14 insertions(+), 91 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 12310d0..dca023c 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1258,7 +1258,7 @@ static HRESULT pop_to_stat(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx) statement_ctx_t *iter = ctx->stat_ctx; unsigned stack_pop = 0; - while(1) { + while(iter) { if(iter->using_scope && push_instr(ctx, OP_pop_scope) == -1) return E_OUTOFMEMORY; if(iter->using_except && push_instr(ctx, OP_pop_except) == -1) @@ -1343,8 +1343,19 @@ static HRESULT compile_break_statement(compiler_ctx_t *ctx, branch_statement_t * /* ECMA-262 3rd Edition 12.9 */ static HRESULT compile_return_statement(compiler_ctx_t *ctx, expression_statement_t *stat) { - stat->stat.eval = return_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); + HRESULT hres; + + hres = pop_to_stat(ctx, NULL); + if(FAILED(hres)) + return hres; + + if(stat->expr) { + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + } + + return push_instr(ctx, OP_ret) == -1 ? E_OUTOFMEMORY : S_OK; } /* ECMA-262 3rd Edition 12.10 */ @@ -1672,22 +1683,6 @@ static HRESULT init_compiler(parser_ctx_t *parser) return S_OK; } -HRESULT compile_subscript(parser_ctx_t *parser, expression_t *expr, unsigned *ret_off) -{ - HRESULT hres; - - hres = init_compiler(parser); - if(FAILED(hres)) - return hres; - - *ret_off = parser->compiler->code_off; - hres = compile_expression(parser->compiler, expr); - if(FAILED(hres)) - return hres; - - return push_instr(parser->compiler, OP_ret) == -1 ? E_OUTOFMEMORY : S_OK; -} - HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL from_eval, unsigned *ret_off) { unsigned off; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9295064..3bdfb4b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -54,8 +54,6 @@ struct _except_frame_t { except_frame_t *next; }; -static HRESULT expr_eval(script_ctx_t*,expression_t*,jsexcept_t*,VARIANT*); - static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v) { if(!ctx->stack_size) { @@ -670,27 +668,6 @@ HRESULT break_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ return E_NOTIMPL; } -/* ECMA-262 3rd Edition 12.9 */ -HRESULT return_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) -{ - expression_statement_t *stat = (expression_statement_t*)_stat; - HRESULT hres; - - TRACE("\n"); - - if(stat->expr) { - hres = expr_eval(ctx, stat->expr, &rt->ei, ret); - if(FAILED(hres)) - return hres; - }else { - V_VT(ret) = VT_EMPTY; - } - - TRACE("= %s\n", debugstr_variant(ret)); - rt->type = RT_RETURN; - return S_OK; -} - /* ECMA-262 3rd Edition 12.10 */ HRESULT interp_push_scope(exec_ctx_t *ctx) { @@ -2638,53 +2615,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, unsigned ip, return_type_t *rt, return S_OK; } -static HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, jsexcept_t *ei, VARIANT *ret) -{ - exec_ctx_t *exec_ctx = ctx->exec_ctx; - unsigned prev_ip, prev_top; - jsexcept_t *prev_ei; - jsop_t op; - HRESULT hres = S_OK; - - TRACE("\n"); - - if(expr->instr_off == -1) { - hres = compile_subscript(ctx->exec_ctx->parser, expr, &expr->instr_off); - if(FAILED(hres)) - return hres; - } - - prev_top = exec_ctx->top; - prev_ip = exec_ctx->ip; - prev_ei = exec_ctx->ei; - exec_ctx->ip = expr->instr_off; - exec_ctx->ei = ei; - - while(exec_ctx->ip != -1) { - op = exec_ctx->parser->code->instrs[exec_ctx->ip].op; - hres = op_funcs[op](exec_ctx); - if(FAILED(hres)) - break; - exec_ctx->ip += op_move[op]; - } - - exec_ctx->ip = prev_ip; - exec_ctx->ei = prev_ei; - - if(FAILED(hres)) { - stack_popn(exec_ctx, exec_ctx->top-prev_top); - return hres; - } - - assert(exec_ctx->top == prev_top+1); - - if(exec_ctx->top == prev_top) - V_VT(ret) = VT_EMPTY; - else - *ret = *stack_pop(exec_ctx); - return S_OK; -} - HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, BOOL from_eval, jsexcept_t *ei, VARIANT *retv) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index fa47a4c..a56bc43 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -413,7 +413,6 @@ typedef struct { HRESULT continue_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT return_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; typedef struct { enum { @@ -590,5 +589,4 @@ typedef struct { prop_val_t *property_list; } 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;

1 0

Jacek Caban : jscript: Use bytecode for labeled continue and break statements.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: e0552ad8c3bcb43d467e84af62ada70722b577fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0552ad8c3bcb43d467e84af6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 11:16:24 2011 +0100 jscript: Use bytecode for labeled continue and break statements. --- dlls/jscript/compile.c | 12 ++++-------- dlls/jscript/engine.c | 20 -------------------- dlls/jscript/engine.h | 3 --- 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index dca023c..8500076 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1294,10 +1294,8 @@ static HRESULT compile_continue_statement(compiler_ctx_t *ctx, branch_statement_ return JS_E_INVALID_CONTINUE; } - if(stat->identifier) { - stat->stat.eval = continue_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); - } + if(stat->identifier) + return push_instr(ctx, OP_label) == -1 ? E_OUTOFMEMORY : S_OK; /* FIXME */ hres = pop_to_stat(ctx, pop_ctx); if(FAILED(hres)) @@ -1325,10 +1323,8 @@ static HRESULT compile_break_statement(compiler_ctx_t *ctx, branch_statement_t * return JS_E_INVALID_BREAK; } - if(stat->identifier) { - stat->stat.eval = break_statement_eval; - return compile_interp_fallback(ctx, &stat->stat); - } + if(stat->identifier) + return push_instr(ctx, OP_label) == -1 ? E_OUTOFMEMORY : S_OK; /* FIXME */ hres = pop_to_stat(ctx, pop_ctx); if(FAILED(hres)) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 013ce0a..dce9410 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -644,26 +644,6 @@ static HRESULT interp_forin(exec_ctx_t *ctx) return S_OK; } -/* ECMA-262 3rd Edition 12.7 */ -HRESULT continue_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) -{ - branch_statement_t *stat = (branch_statement_t*)_stat; - - assert(stat->identifier != NULL); - FIXME("identifier not implemented\n"); - return E_NOTIMPL; -} - -/* ECMA-262 3rd Edition 12.8 */ -HRESULT break_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t *rt, VARIANT *ret) -{ - branch_statement_t *stat = (branch_statement_t*)_stat; - - assert(stat->identifier != NULL); - FIXME("identifier not implemented\n"); - return E_NOTIMPL; -} - /* ECMA-262 3rd Edition 12.10 */ HRESULT interp_push_scope(exec_ctx_t *ctx) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index a56bc43..04d2698 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -411,9 +411,6 @@ typedef struct { statement_t *finally_statement; } try_statement_t; -HRESULT continue_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT break_statement_eval(script_ctx_t*,statement_t*,return_type_t*,VARIANT*) DECLSPEC_HIDDEN; - typedef struct { enum { EXPRVAL_VARIANT,

1 0

Jacek Caban : jscript: Get rid of no longer needed type field of return_type_t structure.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: b82a6982a93a418d67656ea08cbcb4db82ba4709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82a6982a93a418d67656ea08… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 11:16:08 2011 +0100 jscript: Get rid of no longer needed type field of return_type_t structure. --- dlls/jscript/engine.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3bdfb4b..013ce0a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -38,10 +38,6 @@ static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; static const WCHAR unknownW[] = {'u','n','k','n','o','w','n',0}; struct _return_type_t { - enum{ - RT_NORMAL, - RT_RETURN - } type; jsexcept_t ei; }; @@ -2510,7 +2506,6 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) ctx->ip = except_frame->catch_off; - assert(ctx->rt->type == RT_NORMAL); except_val = ctx->rt->ei.var; memset(&ctx->rt->ei, 0, sizeof(ctx->rt->ei)); @@ -2574,7 +2569,7 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, unsigned ip, return_type_t *rt, exec_ctx->ei = &rt->ei; exec_ctx->except_frame = NULL; - while(exec_ctx->ip != -1 && exec_ctx->rt->type == RT_NORMAL) { + while(exec_ctx->ip != -1) { op = exec_ctx->parser->code->instrs[exec_ctx->ip].op; hres = op_funcs[op](exec_ctx); if(FAILED(hres)) { @@ -2596,11 +2591,9 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, unsigned ip, return_type_t *rt, exec_ctx->ei = prev_ei; exec_ctx->except_frame = prev_except_frame; - if(FAILED(hres) || rt->type != RT_NORMAL) { + if(FAILED(hres)) { while(exec_ctx->scope_chain != prev_scope) scope_pop(&exec_ctx->scope_chain); - } - if(FAILED(hres)) { stack_popn(exec_ctx, exec_ctx->top-prev_top); return hres; } @@ -2666,7 +2659,6 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so V_VT(&val) = VT_EMPTY; memset(&rt, 0, sizeof(rt)); - rt.type = RT_NORMAL; if(source->statement) { if(source->instr_off == -1) {

1 0

Jacek Caban : jscript: Handle invalid continue statements in compiler.
by Alexandre Julliard Dec. 30, 2011

Dec. 30, 2011

Module: wine Branch: master Commit: 11ccf0f33e26e8e7f45f14096dc5eb632e0c2cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=11ccf0f33e26e8e7f45f14096… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 30 11:13:55 2011 +0100 jscript: Handle invalid continue statements in compiler. --- dlls/jscript/compile.c | 7 ++++++- dlls/jscript/engine.c | 16 ++++------------ dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 2 ++ po/ar.po | 34 +++++++++++++++++++--------------- po/bg.po | 34 +++++++++++++++++++--------------- po/ca.po | 34 +++++++++++++++++++--------------- po/cs.po | 34 +++++++++++++++++++--------------- po/da.po | 34 +++++++++++++++++++--------------- po/de.po | 34 +++++++++++++++++++--------------- po/el.po | 34 +++++++++++++++++++--------------- po/en.po | 34 +++++++++++++++++++--------------- po/en_US.po | 34 +++++++++++++++++++--------------- po/eo.po | 34 +++++++++++++++++++--------------- po/es.po | 34 +++++++++++++++++++--------------- po/fa.po | 34 +++++++++++++++++++--------------- po/fi.po | 34 +++++++++++++++++++--------------- po/fr.po | 34 +++++++++++++++++++--------------- po/he.po | 34 +++++++++++++++++++--------------- po/hi.po | 34 +++++++++++++++++++--------------- po/hu.po | 34 +++++++++++++++++++--------------- po/it.po | 34 +++++++++++++++++++--------------- po/ja.po | 34 +++++++++++++++++++--------------- po/ko.po | 34 +++++++++++++++++++--------------- po/lt.po | 34 +++++++++++++++++++--------------- po/ml.po | 34 +++++++++++++++++++--------------- po/nb_NO.po | 34 +++++++++++++++++++--------------- po/nl.po | 34 +++++++++++++++++++--------------- po/or.po | 34 +++++++++++++++++++--------------- po/pa.po | 34 +++++++++++++++++++--------------- po/pl.po | 34 +++++++++++++++++++--------------- po/pt_BR.po | 34 +++++++++++++++++++--------------- po/pt_PT.po | 34 +++++++++++++++++++--------------- po/rm.po | 34 +++++++++++++++++++--------------- po/ro.po | 34 +++++++++++++++++++--------------- po/ru.po | 34 +++++++++++++++++++--------------- po/sk.po | 34 +++++++++++++++++++--------------- po/sl.po | 34 +++++++++++++++++++--------------- po/sr_RS(a)cyrillic.po | 34 +++++++++++++++++++--------------- po/sr_RS(a)latin.po | 34 +++++++++++++++++++--------------- po/sv.po | 34 +++++++++++++++++++--------------- po/te.po | 34 +++++++++++++++++++--------------- po/th.po | 34 +++++++++++++++++++--------------- po/tr.po | 34 +++++++++++++++++++--------------- po/uk.po | 34 +++++++++++++++++++--------------- po/wa.po | 34 +++++++++++++++++++--------------- po/wine.pot | 34 +++++++++++++++++++--------------- po/zh_CN.po | 34 +++++++++++++++++++--------------- po/zh_TW.po | 34 +++++++++++++++++++--------------- 51 files changed, 870 insertions(+), 688 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11ccf0f33e26e8e7f45f1…

1 0