March 2016 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Use wined3d_texture_blt() in wined3d_device_copy_sub_resource_region().
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 1c91fd4b388c039431380e92c68bfcbf928ab5af URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c91fd4b388c039431380e92c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 25 17:52:28 2016 +0100 wined3d: Use wined3d_texture_blt() in wined3d_device_copy_sub_resource_region(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e2c6e5d..f91e3f7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3915,9 +3915,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev unsigned int dst_y, unsigned int dst_z, struct wined3d_resource *src_resource, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box) { - struct wined3d_surface *dst_surface, *src_surface; struct wined3d_texture *dst_texture, *src_texture; - struct wined3d_resource *tmp; RECT dst_rect, src_rect; HRESULT hr; @@ -4003,30 +4001,25 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev } dst_texture = wined3d_texture_from_resource(dst_resource); - if (!(tmp = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx))) - { - WARN("Invalid dst_sub_resource_idx %u.\n", dst_sub_resource_idx); - return WINED3DERR_INVALIDCALL; - } - dst_surface = surface_from_resource(tmp); - src_texture = wined3d_texture_from_resource(src_resource); - if (!(tmp = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx))) - { - WARN("Invalid src_sub_resource_idx %u.\n", src_sub_resource_idx); - return WINED3DERR_INVALIDCALL; - } - src_surface = surface_from_resource(tmp); if (src_box) + { SetRect(&src_rect, src_box->left, src_box->top, src_box->right, src_box->bottom); + } else - SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); + { + unsigned int level = src_sub_resource_idx % src_texture->level_count; + + SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(src_texture, level), + wined3d_texture_get_level_height(src_texture, level)); + } SetRect(&dst_rect, dst_x, dst_y, dst_x + (src_rect.right - src_rect.left), dst_y + (src_rect.bottom - src_rect.top)); - if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) + if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect, + src_texture, src_sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) WARN("Failed to blit, hr %#x.\n", hr); return hr;

1 0

Henri Verbeet : wined3d: Use wined3d_texture_blt() in wined3d_swapchain_get_front_buffer_data().
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: a36c7e6bdad29976d7b81bada73a5fc4a820c7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36c7e6bdad29976d7b81bada… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 25 17:52:29 2016 +0100 wined3d: Use wined3d_texture_blt() in wined3d_swapchain_get_front_buffer_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c2883bb..1b6d2e5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -172,19 +172,11 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain, HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, struct wined3d_texture *dst_texture, unsigned int sub_resource_idx) { - struct wined3d_surface *src_surface, *dst_surface; - struct wined3d_resource *sub_resource; RECT src_rect, dst_rect; TRACE("swapchain %p, dst_texture %p, sub_resource_idx %u.\n", swapchain, dst_texture, sub_resource_idx); - if (!(sub_resource = wined3d_texture_get_sub_resource(dst_texture, sub_resource_idx)) || - sub_resource->type != WINED3D_RTYPE_SURFACE) - return WINED3DERR_INVALIDCALL; - - dst_surface = surface_from_resource(sub_resource); - src_surface = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)); - SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); + SetRect(&src_rect, 0, 0, swapchain->front_buffer->resource.width, swapchain->front_buffer->resource.height); dst_rect = src_rect; if (swapchain->desc.windowed) @@ -194,7 +186,8 @@ HRESULT CDECL wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapc wine_dbgstr_rect(&dst_rect)); } - return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT); + return wined3d_texture_blt(dst_texture, sub_resource_idx, &dst_rect, + swapchain->front_buffer, 0, &src_rect, 0, NULL, WINED3D_TEXF_POINT); } struct wined3d_texture * CDECL wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain,

1 0

Stefan Dösinger : wined3d: Avoid storing rectangle pointers in struct wined3d_cs_present.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 08158f7e121bf90e4a49e8ab3bcad57cb844bc41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08158f7e121bf90e4a49e8ab3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 25 17:52:30 2016 +0100 wined3d: Avoid storing rectangle pointers in struct wined3d_cs_present. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 91e1759..3692c6b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -59,8 +59,8 @@ struct wined3d_cs_present enum wined3d_cs_op opcode; HWND dst_window_override; struct wined3d_swapchain *swapchain; - const RECT *src_rect; - const RECT *dst_rect; + RECT src_rect; + RECT dst_rect; DWORD flags; }; @@ -258,7 +258,7 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) swapchain = op->swapchain; wined3d_swapchain_set_window(swapchain, op->dst_window_override); - swapchain->swapchain_ops->swapchain_present(swapchain, op->src_rect, op->dst_rect, op->flags); + swapchain->swapchain_ops->swapchain_present(swapchain, &op->src_rect, &op->dst_rect, op->flags); } void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, @@ -270,8 +270,8 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw op->opcode = WINED3D_CS_OP_PRESENT; op->dst_window_override = dst_window_override; op->swapchain = swapchain; - op->src_rect = src_rect; - op->dst_rect = dst_rect; + op->src_rect = *src_rect; + op->dst_rect = *dst_rect; op->flags = flags; cs->ops->submit(cs);

1 0

Kerstin Noa : wined3d: Add NVIDIA GeForce GTX 980 GPU information.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: 058783b8b494cf6c4df84a6130f70431b4371e7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=058783b8b494cf6c4df84a613… Author: Kerstin Noa <ker.noa(a)posteo.de> Date: Fri Mar 25 17:52:31 2016 +0100 wined3d: Add NVIDIA GeForce GTX 980 GPU information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6bf1247..f14eaaf 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1289,6 +1289,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX960M, "NVIDIA GeForce GTX 960M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX980, "NVIDIA GeForce GTX 980", DRIVER_NVIDIA_GEFORCE8, 4096}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1737,6 +1738,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"GTX 980", CARD_NVIDIA_GEFORCE_GTX980}, /* GeForce 900 - highend */ {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ {"GTX 960M", CARD_NVIDIA_GEFORCE_GTX960M}, /* GeForce 900 - midend high mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7b7b65b..242268d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1720,9 +1720,10 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a, CARD_NVIDIA_GEFORCE_GTX960 = 0x1401, - CARD_NVIDIA_GEFORCE_GTX960M = 0x139B, + CARD_NVIDIA_GEFORCE_GTX960M = 0x139b, CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, + CARD_NVIDIA_GEFORCE_GTX980 = 0x13c0, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Alexandre Julliard : makefiles: Always expand the library name for cross-compiled import libraries.
by Alexandre Julliard 28 Mar '16

28 Mar '16

Module: wine Branch: master Commit: ffd2e484ba744c8a9ae8611bae6d613eabcf2342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffd2e484ba744c8a9ae8611ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 26 14:57:39 2016 +0900 makefiles: Always expand the library name for cross-compiled import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 7f81208..98645db 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2001,13 +2001,11 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra if (submake->importlib && !strcmp( submake->importlib, name )) { - const char *dir = top_obj_dir_path( make, submake->base_dir ); - const char *ext = cross ? "cross.a" : *dll_ext ? "def" : "a"; - - if (!cross && submake->staticimplib) - lib = base_dir_path( submake, submake->staticimplib ); + if (cross || !*dll_ext || submake->staticimplib) + lib = base_dir_path( submake, strmake( "lib%s.a", name )); else - strarray_add( deps, strmake( "%s/lib%s.%s", dir, name, ext )); + strarray_add( deps, top_obj_dir_path( make, + strmake( "%s/lib%s.def", submake->base_dir, name ))); break; } @@ -2016,6 +2014,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra if (lib) { + if (cross) lib = replace_extension( lib, ".a", ".cross.a" ); lib = top_obj_dir_path( make, lib ); strarray_add( deps, lib ); strarray_add( &ret, lib );

1 0

Jacek Caban : jscript: Store function description in call_frame_t.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 132ff14d3739b03549244af07d442209b4a3fc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=132ff14d3739b03549244af07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:03:11 2016 +0100 jscript: Store function description in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 12 +++++------- dlls/jscript/engine.h | 3 +-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8b0477f..333df27 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -825,12 +825,13 @@ static HRESULT interp_end_finally(exec_ctx_t *ctx) static HRESULT interp_func(exec_ctx_t *ctx) { unsigned func_idx = get_op_uint(ctx, 0); + call_frame_t *frame = ctx->script->call_ctx; jsdisp_t *dispex; HRESULT hres; TRACE("%d\n", func_idx); - hres = create_source_function(ctx->script, ctx->script->call_ctx->bytecode, ctx->func_code->funcs+func_idx, + hres = create_source_function(ctx->script, frame->bytecode, frame->function->funcs+func_idx, ctx->scope_chain, &dispex); if(FAILED(hres)) return hres; @@ -2453,7 +2454,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t { exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; except_frame_t *prev_except_frame; - function_code_t *prev_func; unsigned prev_ip, prev_top; scope_chain_t *prev_scope; call_frame_t *frame; @@ -2467,10 +2467,8 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t prev_scope = exec_ctx->scope_chain; prev_except_frame = exec_ctx->except_frame; prev_ip = exec_ctx->ip; - prev_func = exec_ctx->func_code; exec_ctx->ip = func->instr_off; exec_ctx->except_frame = NULL; - exec_ctx->func_code = func; while(exec_ctx->ip != -1) { op = frame->bytecode->instrs[exec_ctx->ip].op; @@ -2491,7 +2489,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t exec_ctx->ip = prev_ip; exec_ctx->except_frame = prev_except_frame; - exec_ctx->func_code = prev_func; assert(ctx->call_ctx == frame); ctx->call_ctx = frame->prev_frame; @@ -2550,7 +2547,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } -static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode) +static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_code_t *function) { call_frame_t *frame; @@ -2559,6 +2556,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode) return E_OUTOFMEMORY; frame->bytecode = bytecode; + frame->function = function; frame->exec_ctx = ctx; frame->prev_frame = ctx->script->call_ctx; @@ -2601,7 +2599,7 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, js } } - hres = setup_call_frame(ctx, code); + hres = setup_call_frame(ctx, code, func); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index fc99c68..31b904c 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -192,6 +192,7 @@ struct _parser_ctx_t; typedef struct _call_frame_t { bytecode_t *bytecode; + function_code_t *function; struct _call_frame_t *prev_frame; exec_ctx_t *exec_ctx; @@ -200,12 +201,10 @@ typedef struct _call_frame_t { struct _exec_ctx_t { LONG ref; - struct _parser_ctx_t *parser; script_ctx_t *script; scope_chain_t *scope_chain; jsdisp_t *var_disp; IDispatch *this_obj; - function_code_t *func_code; BOOL is_global; jsval_t *stack;

1 0

Jacek Caban : jscript: Added new helpers for jumps.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 53ecdb6549eccd84657d8b20ad0d9ba6dd7f987f URL: http://source.winehq.org/git/wine.git/?a=commit;h=53ecdb6549eccd84657d8b20a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:03:25 2016 +0100 jscript: Added new helpers for jumps. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 333df27..3118994 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -587,6 +587,16 @@ static inline double get_op_double(exec_ctx_t *ctx){ return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.dbl; } +static inline void jmp_next(exec_ctx_t *ctx) +{ + ctx->ip++; +} + +static inline void jmp_abs(exec_ctx_t *ctx, unsigned dst) +{ + ctx->ip = dst; +} + /* ECMA-262 3rd Edition 12.2 */ static HRESULT interp_var_set(exec_ctx_t *ctx) { @@ -656,10 +666,10 @@ static HRESULT interp_forin(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - ctx->ip++; + jmp_next(ctx); }else { stack_popn(ctx, 4); - ctx->ip = arg; + jmp_abs(ctx, arg); } return S_OK; } @@ -711,9 +721,9 @@ static HRESULT interp_case(exec_ctx_t *ctx) if(b) { stack_popn(ctx, 1); - ctx->ip = arg; + jmp_abs(ctx, arg); }else { - ctx->ip++; + jmp_next(ctx); } return S_OK; } @@ -1260,10 +1270,10 @@ static HRESULT interp_cnd_nz(exec_ctx_t *ctx) return hres; if(b) { - ctx->ip = arg; + jmp_abs(ctx, arg); }else { stack_popn(ctx, 1); - ctx->ip++; + jmp_next(ctx); } return S_OK; } @@ -1283,9 +1293,9 @@ static HRESULT interp_cnd_z(exec_ctx_t *ctx) if(b) { stack_popn(ctx, 1); - ctx->ip++; + jmp_next(ctx); }else { - ctx->ip = arg; + jmp_abs(ctx, arg); } return S_OK; } @@ -2327,7 +2337,7 @@ static HRESULT interp_jmp(exec_ctx_t *ctx) TRACE("%u\n", arg); - ctx->ip = arg; + jmp_abs(ctx, arg); return S_OK; } @@ -2347,9 +2357,9 @@ static HRESULT interp_jmp_z(exec_ctx_t *ctx) return hres; if(b) - ctx->ip++; + jmp_next(ctx); else - ctx->ip = arg; + jmp_abs(ctx, arg); return S_OK; } @@ -2367,7 +2377,7 @@ static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n"); - ctx->ip = -1; + jmp_abs(ctx, -1); return S_OK; }

1 0

Jacek Caban : jscript: Store exception frame in call_frame_t.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: fa5d9b3db132a13ad0527fb57f4bfadd0f288df2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5d9b3db132a13ad0527fb57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:03:35 2016 +0100 jscript: Store exception frame in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 21 ++++++++++----------- dlls/jscript/engine.h | 3 ++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3118994..8688d4f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -764,6 +764,7 @@ static HRESULT interp_push_except(exec_ctx_t *ctx) { const unsigned arg1 = get_op_uint(ctx, 0); const BSTR arg2 = get_op_bstr(ctx, 1); + call_frame_t *frame = ctx->script->call_ctx; except_frame_t *except; unsigned stack_top; @@ -790,22 +791,23 @@ static HRESULT interp_push_except(exec_ctx_t *ctx) except->scope = ctx->scope_chain; except->catch_off = arg1; except->ident = arg2; - except->next = ctx->except_frame; - ctx->except_frame = except; + except->next = frame->except_frame; + frame->except_frame = except; return S_OK; } /* ECMA-262 3rd Edition 12.14 */ static HRESULT interp_pop_except(exec_ctx_t *ctx) { + call_frame_t *frame = ctx->script->call_ctx; except_frame_t *except; TRACE("\n"); - except = ctx->except_frame; + except = frame->except_frame; assert(except != NULL); - ctx->except_frame = except->next; + frame->except_frame = except->next; heap_free(except); return S_OK; } @@ -2411,13 +2413,14 @@ static void release_call_frame(call_frame_t *frame) static HRESULT unwind_exception(exec_ctx_t *ctx) { + call_frame_t *frame = ctx->script->call_ctx; except_frame_t *except_frame; jsval_t except_val; BSTR ident; HRESULT hres; - except_frame = ctx->except_frame; - ctx->except_frame = except_frame->next; + except_frame = frame->except_frame; + frame->except_frame = except_frame->next; assert(except_frame->stack_top <= ctx->top); stack_popn(ctx, ctx->top - except_frame->stack_top); @@ -2463,7 +2466,6 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t *ret) { exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - except_frame_t *prev_except_frame; unsigned prev_ip, prev_top; scope_chain_t *prev_scope; call_frame_t *frame; @@ -2475,10 +2477,8 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t frame = ctx->call_ctx; prev_top = exec_ctx->top; prev_scope = exec_ctx->scope_chain; - prev_except_frame = exec_ctx->except_frame; prev_ip = exec_ctx->ip; exec_ctx->ip = func->instr_off; - exec_ctx->except_frame = NULL; while(exec_ctx->ip != -1) { op = frame->bytecode->instrs[exec_ctx->ip].op; @@ -2486,7 +2486,7 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t if(FAILED(hres)) { TRACE("EXCEPTION %08x\n", hres); - if(!exec_ctx->except_frame) + if(!frame->except_frame) break; hres = unwind_exception(exec_ctx); @@ -2498,7 +2498,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t } exec_ctx->ip = prev_ip; - exec_ctx->except_frame = prev_except_frame; assert(ctx->call_ctx == frame); ctx->call_ctx = frame->prev_frame; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 31b904c..e31b9b9 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -191,6 +191,8 @@ typedef struct _except_frame_t except_frame_t; struct _parser_ctx_t; typedef struct _call_frame_t { + except_frame_t *except_frame; + bytecode_t *bytecode; function_code_t *function; @@ -210,7 +212,6 @@ struct _exec_ctx_t { jsval_t *stack; unsigned stack_size; unsigned top; - except_frame_t *except_frame; jsval_t ret; unsigned ip;

1 0

Jacek Caban : jscript: Store instruction pointer in call_frame_t.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: a120ecbefc5b23c3d6167f50ebf76dd2699d4c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a120ecbefc5b23c3d6167f50e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:03:45 2016 +0100 jscript: Store instruction pointer in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 35 +++++++++++++++++++---------------- dlls/jscript/engine.h | 3 +-- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8688d4f..f622233 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -568,33 +568,38 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re } static inline BSTR get_op_bstr(exec_ctx_t *ctx, int i){ - return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.arg[i].bstr; + call_frame_t *frame = ctx->script->call_ctx; + return frame->bytecode->instrs[frame->ip].u.arg[i].bstr; } static inline unsigned get_op_uint(exec_ctx_t *ctx, int i){ - return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.arg[i].uint; + call_frame_t *frame = ctx->script->call_ctx; + return frame->bytecode->instrs[frame->ip].u.arg[i].uint; } static inline unsigned get_op_int(exec_ctx_t *ctx, int i){ - return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.arg[i].lng; + call_frame_t *frame = ctx->script->call_ctx; + return frame->bytecode->instrs[frame->ip].u.arg[i].lng; } static inline jsstr_t *get_op_str(exec_ctx_t *ctx, int i){ - return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.arg[i].str; + call_frame_t *frame = ctx->script->call_ctx; + return frame->bytecode->instrs[frame->ip].u.arg[i].str; } static inline double get_op_double(exec_ctx_t *ctx){ - return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.dbl; + call_frame_t *frame = ctx->script->call_ctx; + return frame->bytecode->instrs[frame->ip].u.dbl; } static inline void jmp_next(exec_ctx_t *ctx) { - ctx->ip++; + ctx->script->call_ctx->ip++; } static inline void jmp_abs(exec_ctx_t *ctx, unsigned dst) { - ctx->ip = dst; + ctx->script->call_ctx->ip = dst; } /* ECMA-262 3rd Edition 12.2 */ @@ -2428,7 +2433,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) while(except_frame->scope != ctx->scope_chain) scope_pop(&ctx->scope_chain); - ctx->ip = except_frame->catch_off; + frame->ip = except_frame->catch_off; except_val = ctx->script->ei.val; ctx->script->ei.val = jsval_undefined(); @@ -2466,7 +2471,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t *ret) { exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - unsigned prev_ip, prev_top; + unsigned prev_top; scope_chain_t *prev_scope; call_frame_t *frame; jsop_t op; @@ -2477,11 +2482,9 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t frame = ctx->call_ctx; prev_top = exec_ctx->top; prev_scope = exec_ctx->scope_chain; - prev_ip = exec_ctx->ip; - exec_ctx->ip = func->instr_off; - while(exec_ctx->ip != -1) { - op = frame->bytecode->instrs[exec_ctx->ip].op; + while(frame->ip != -1) { + op = frame->bytecode->instrs[frame->ip].op; hres = op_funcs[op](exec_ctx); if(FAILED(hres)) { TRACE("EXCEPTION %08x\n", hres); @@ -2493,12 +2496,10 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t if(FAILED(hres)) break; }else { - exec_ctx->ip += op_move[op]; + frame->ip += op_move[op]; } } - exec_ctx->ip = prev_ip; - assert(ctx->call_ctx == frame); ctx->call_ctx = frame->prev_frame; release_call_frame(frame); @@ -2566,6 +2567,8 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->bytecode = bytecode; frame->function = function; + frame->ip = function->instr_off; + frame->exec_ctx = ctx; frame->prev_frame = ctx->script->call_ctx; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index e31b9b9..ddbea50 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -191,6 +191,7 @@ typedef struct _except_frame_t except_frame_t; struct _parser_ctx_t; typedef struct _call_frame_t { + unsigned ip; except_frame_t *except_frame; bytecode_t *bytecode; @@ -213,8 +214,6 @@ struct _exec_ctx_t { unsigned stack_size; unsigned top; jsval_t ret; - - unsigned ip; }; static inline void exec_addref(exec_ctx_t *ctx)

1 0

Jacek Caban : jscript: Store stack base in call_frame_t.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 0e32c0990143469c8578a86f0c1ce8b748c67365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e32c0990143469c8578a86f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:03:55 2016 +0100 jscript: Store stack base in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 17 +++++++++-------- dlls/jscript/engine.h | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f622233..db6c2ae 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2471,7 +2471,6 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t *ret) { exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; - unsigned prev_top; scope_chain_t *prev_scope; call_frame_t *frame; jsop_t op; @@ -2480,7 +2479,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t TRACE("\n"); frame = ctx->call_ctx; - prev_top = exec_ctx->top; prev_scope = exec_ctx->scope_chain; while(frame->ip != -1) { @@ -2501,19 +2499,21 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t } assert(ctx->call_ctx == frame); - ctx->call_ctx = frame->prev_frame; - release_call_frame(frame); if(FAILED(hres)) { while(exec_ctx->scope_chain != prev_scope) scope_pop(&exec_ctx->scope_chain); - stack_popn(exec_ctx, exec_ctx->top-prev_top); - return hres; + stack_popn(exec_ctx, exec_ctx->top-frame->stack_base); } - assert(exec_ctx->top == prev_top+1 || exec_ctx->top == prev_top); + assert(exec_ctx->top == frame->stack_base); + ctx->call_ctx = frame->prev_frame; + release_call_frame(frame); + + if(FAILED(hres)) + return hres; + assert(exec_ctx->scope_chain == prev_scope); - assert(exec_ctx->top == prev_top); *ret = exec_ctx->ret; exec_ctx->ret = jsval_undefined(); @@ -2568,6 +2568,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode, function_ frame->bytecode = bytecode; frame->function = function; frame->ip = function->instr_off; + frame->stack_base = ctx->top; frame->exec_ctx = ctx; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index ddbea50..e803047 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -193,6 +193,7 @@ struct _parser_ctx_t; typedef struct _call_frame_t { unsigned ip; except_frame_t *except_frame; + unsigned stack_base; bytecode_t *bytecode; function_code_t *function;

1 0