September 2021 - Wine-commits

Rémi Bernon : winebus.sys: Return an event from SDL bus wait on input report.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 8b434bdc7fe98e3bd97e180f31bc18d87161c05a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b434bdc7fe98e3bd97e180f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:41 2021 +0200 winebus.sys: Return an event from SDL bus wait on input report. Instead of calling process_hid_report. This adds a reference count on unix devices to make sure they are kept alive until all their input report events have been processed. This also uses a bus-specific device list, to be able to find devices from joystick ids without having to call back to the win32 side. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 78 +++++++++++++++++++++++++++-------------- dlls/winebus.sys/main.c | 31 ++++++++++++++-- dlls/winebus.sys/unix_private.h | 4 +++ dlls/winebus.sys/unixlib.c | 50 ++++++++++++++++++++++++-- dlls/winebus.sys/unixlib.h | 8 +++++ 5 files changed, 140 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b434bdc7fe98e3bd97e…

1 0

Rémi Bernon : winebus.sys: Return an event from UDEV bus wait on input report.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: e0ac56267fe97ddd4b5137d1f43ce65238fa85bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0ac56267fe97ddd4b5137d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:42 2021 +0200 winebus.sys: Return an event from UDEV bus wait on input report. Instead of calling process_hid_report. We need to guard the event queue as the input reports are read from dedicated threads. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index e26e11c720d..45c5b2e151a 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -648,6 +648,7 @@ static DWORD CALLBACK device_report_thread(void *args) { DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; struct platform_private *private = impl_from_DEVICE_OBJECT(device); + struct unix_device *iface = &private->unix_device; struct pollfd plfds[2]; plfds[0].fd = private->device_fd; @@ -671,7 +672,11 @@ static DWORD CALLBACK device_report_thread(void *args) else if (size == 0) TRACE_(hid_report)("Failed to read report\n"); else - process_hid_report(device, report_buffer, size); + { + EnterCriticalSection(&udev_cs); + bus_event_queue_input_report(&event_queue, iface, report_buffer, size); + LeaveCriticalSection(&udev_cs); + } } return 0; } @@ -876,6 +881,7 @@ static DWORD CALLBACK lnxev_device_report_thread(void *args) { DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; struct wine_input_private *private = input_impl_from_DEVICE_OBJECT(device); + struct unix_device *iface = &private->base.unix_device; struct pollfd plfds[2]; plfds[0].fd = private->base.device_fd; @@ -899,7 +905,11 @@ static DWORD CALLBACK lnxev_device_report_thread(void *args) else if (size == 0) TRACE_(hid_report)("Failed to read report\n"); else if (set_report_from_event(private, &ie)) - process_hid_report(device, private->current_report_buffer, private->buffer_length); + { + EnterCriticalSection(&udev_cs); + bus_event_queue_input_report(&event_queue, iface, private->current_report_buffer, private->buffer_length); + LeaveCriticalSection(&udev_cs); + } } return 0; } @@ -1276,16 +1286,27 @@ NTSTATUS udev_bus_wait(void *args) pfd[1].events = POLLIN; pfd[1].revents = 0; + /* cleanup previously returned event */ + bus_event_cleanup(result); + while (1) { - if (bus_event_queue_pop(&event_queue, result)) return STATUS_PENDING; + EnterCriticalSection(&udev_cs); + if (bus_event_queue_pop(&event_queue, result)) + { + LeaveCriticalSection(&udev_cs); + return STATUS_PENDING; + } + LeaveCriticalSection(&udev_cs); if (poll(pfd, 2, -1) <= 0) continue; if (pfd[1].revents) break; process_monitor_event(udev_monitor); } TRACE("UDEV main loop exiting\n"); + EnterCriticalSection(&udev_cs); bus_event_queue_destroy(&event_queue); + LeaveCriticalSection(&udev_cs); udev_monitor_unref(udev_monitor); udev_unref(udev_context); udev_context = NULL;

1 0

Rémi Bernon : winebus.sys: Return an event from IOHID bus wait on input report.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: bc0ad0e13bb74f43084b92dbd75285512917d715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc0ad0e13bb74f43084b92db… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:43 2021 +0200 winebus.sys: Return an event from IOHID bus wait on input report. Instead of calling process_hid_report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 4 ---- dlls/winebus.sys/bus_iohid.c | 9 ++++++--- dlls/winebus.sys/main.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 75ff218c26d..67215019dfc 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -29,10 +29,6 @@ struct unix_device *get_unix_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; -/* HID Plug and Play Bus */ -DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) DECLSPEC_HIDDEN; -void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; - /* General Bus Functions */ BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index d9de7059be3..c16c780bc76 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -133,8 +133,8 @@ static void handle_IOHIDDeviceIOHIDReportCallback(void *context, IOReturn result, void *sender, IOHIDReportType type, uint32_t reportID, uint8_t *report, CFIndex report_length) { - DEVICE_OBJECT *device = (DEVICE_OBJECT*)context; - process_hid_report(device, report, report_length); + struct unix_device *iface = (struct unix_device *)context; + bus_event_queue_input_report(&event_queue, iface, report, report_length); } static void iohid_device_destroy(struct unix_device *iface) @@ -161,7 +161,7 @@ static NTSTATUS iohid_device_start(struct unix_device *iface, DEVICE_OBJECT *dev length = CFNumberToDWORD(num); private->buffer = HeapAlloc(GetProcessHeap(), 0, length); - IOHIDDeviceRegisterInputReportCallback(private->device, private->buffer, length, handle_IOHIDDeviceIOHIDReportCallback, device); + IOHIDDeviceRegisterInputReportCallback(private->device, private->buffer, length, handle_IOHIDDeviceIOHIDReportCallback, iface); return STATUS_SUCCESS; } @@ -378,6 +378,9 @@ NTSTATUS iohid_bus_wait(void *args) { struct bus_event *result = args; + /* cleanup previously returned event */ + bus_event_cleanup(result); + do { if (bus_event_queue_pop(&event_queue, result)) return STATUS_PENDING; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 87526fc2129..ce548980640 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -370,7 +370,7 @@ static DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, struct uni return device; } -DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) +static DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) { struct device_extension *ext; DEVICE_OBJECT *ret = NULL; @@ -477,7 +477,7 @@ static NTSTATUS deliver_last_report(struct device_extension *ext, DWORD buffer_l } } -void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) +static void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) { struct device_extension *ext = (struct device_extension*)device->DeviceExtension; IRP *irp;

1 0

Rémi Bernon : winebus.sys: Poll all UDEV fds together in the bus_wait thread.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: be503e97fb1d4db580c91521fd9c6f51e484ab9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=be503e97fb1d4db580c91521… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:44 2021 +0200 winebus.sys: Poll all UDEV fds together in the bus_wait thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 285 +++++++++++++++++++------------------------- 1 file changed, 124 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be503e97fb1d4db580c9…

1 0

Rémi Bernon : winebus.sys: Remove the now useless get_unix_device.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 5f8ebe7a608855b0afd45dc725934addbbacfda0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f8ebe7a608855b0afd45dc7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:45 2021 +0200 winebus.sys: Remove the now useless get_unix_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 2 -- dlls/winebus.sys/main.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 67215019dfc..df53508d2c0 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -27,8 +27,6 @@ #include "unixlib.h" -struct unix_device *get_unix_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; - /* General Bus Functions */ BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index ce548980640..3e63a84adcc 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -217,12 +217,6 @@ static void unix_device_set_feature_report(DEVICE_OBJECT *device, HID_XFER_PACKE winebus_call(device_set_feature_report, &params); } -struct unix_device *get_unix_device(DEVICE_OBJECT *device) -{ - struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - return ext->unix_device; -} - static DWORD get_device_index(struct device_desc *desc) { struct device_extension *ext;

1 0

Rémi Bernon : winebus.sys: Remove the DEVICE_OBJECT arg on device_start.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: cdaf1d9a7f97f02ab92c11f288aaf0cf55d4b195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdaf1d9a7f97f02ab92c11f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:46 2021 +0200 winebus.sys: Remove the DEVICE_OBJECT arg on device_start. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 4 ++-- dlls/winebus.sys/main.c | 7 +------ dlls/winebus.sys/unix_private.h | 2 +- dlls/winebus.sys/unixlib.c | 9 ++++----- dlls/winebus.sys/unixlib.h | 7 ------- 7 files changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index c16c780bc76..8bdd7857ae6 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -151,7 +151,7 @@ static int iohid_device_compare(struct unix_device *iface, void *context) return 0; } -static NTSTATUS iohid_device_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS iohid_device_start(struct unix_device *iface) { DWORD length; struct platform_private *private = impl_from_unix_device(iface); diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 6eafcb75285..6a6f364edf6 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -502,7 +502,7 @@ static int sdl_device_compare(struct unix_device *iface, void *context) return impl_from_unix_device(iface)->id - PtrToUlong(context); } -static NTSTATUS sdl_device_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS sdl_device_start(struct unix_device *iface) { struct platform_private *ext = impl_from_unix_device(iface); if (ext->sdl_controller) return build_mapped_report_descriptor(ext); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b94af8db71c..23b649ff511 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -616,7 +616,7 @@ static int udev_device_compare(struct unix_device *iface, void *platform_dev) return strcmp(udev_device_get_syspath(dev1), udev_device_get_syspath(dev2)); } -static NTSTATUS hidraw_device_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS hidraw_device_start(struct unix_device *iface) { EnterCriticalSection(&udev_cs); start_polling_device(iface); @@ -813,7 +813,7 @@ static void lnxev_device_destroy(struct unix_device *iface) udev_device_unref(ext->base.udev_device); } -static NTSTATUS lnxev_device_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS lnxev_device_start(struct unix_device *iface) { struct wine_input_private *ext = input_impl_from_unix_device(iface); NTSTATUS status; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 3e63a84adcc..162787c4e4a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -160,12 +160,7 @@ static int unix_device_compare(DEVICE_OBJECT *device, void *context) static NTSTATUS unix_device_start(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - struct device_start_params params = - { - .iface = ext->unix_device, - .device = device - }; - return winebus_call(device_start, &params); + return winebus_call(device_start, ext->unix_device); } static NTSTATUS unix_device_get_report_descriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 611873db17f..3f8d73d033a 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -33,7 +33,7 @@ struct unix_device_vtbl { void (*destroy)(struct unix_device *iface); int (*compare)(struct unix_device *iface, void *platform_dev); - NTSTATUS (*start)(struct unix_device *iface, DEVICE_OBJECT *device); + NTSTATUS (*start)(struct unix_device *iface); void (*stop)(struct unix_device *iface); NTSTATUS (*get_report_descriptor)(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length); void (*set_output_report)(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io); diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index b91de06e73c..87cc7de3474 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -56,7 +56,7 @@ static int mouse_compare(struct unix_device *iface, void *context) return 0; } -static NTSTATUS mouse_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS mouse_start(struct unix_device *iface) { struct mouse_device *impl = mouse_from_unix_device(iface); @@ -160,7 +160,7 @@ static int keyboard_compare(struct unix_device *iface, void *context) return 0; } -static NTSTATUS keyboard_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS keyboard_start(struct unix_device *iface) { struct keyboard_device *impl = keyboard_from_unix_device(iface); @@ -284,9 +284,8 @@ static NTSTATUS unix_device_compare(void *args) static NTSTATUS unix_device_start(void *args) { - struct device_start_params *params = args; - struct unix_device *iface = params->iface; - return iface->vtbl->start(iface, params->device); + struct unix_device *iface = args; + return iface->vtbl->start(iface); } static NTSTATUS unix_device_get_report_descriptor(void *args) diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 47256e80740..61684d0c0af 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -24,7 +24,6 @@ #include <windef.h> #include <winbase.h> #include <winternl.h> -#include <ddk/wdm.h> #include <ddk/hidclass.h> #include <hidusage.h> @@ -112,12 +111,6 @@ struct device_compare_params void *context; }; -struct device_start_params -{ - struct unix_device *iface; - DEVICE_OBJECT *device; -}; - struct device_descriptor_params { struct unix_device *iface;

1 0

Eric Pouech : dbghelp/dwarf: Separate CU handling from module handling.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: a345a1cf84e41f77306c7228a8c2f4777069d406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a345a1cf84e41f77306c7228… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:37:46 2021 +0200 dbghelp/dwarf: Separate CU handling from module handling. Move out of dwarf2_parse_context_s structure information related to the module and put them into the dwarf2_parse_module_context_s structure (actually the dwarf2_parse_context should be named dwarf2_parse_cu_context as it only related to a compilation unit). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 180 +++++++++++++++++++++++++++------------------------ 1 file changed, 95 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a345a1cf84e41f77306c…

1 0

Eric Pouech : dbghelp/dwarf: Move the symt_cache from the unit context into the module context.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: b4d0dbd70b899105a501045351a3be8633d3f087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4d0dbd70b899105a5010453… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:37:52 2021 +0200 dbghelp/dwarf: Move the symt_cache from the unit context into the module context. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e9d62404eba..4bb5bb23ac6 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -179,6 +179,7 @@ typedef struct dwarf2_parse_module_context_s const dwarf2_section_t* sections; struct module* module; const struct elf_thunk_area*thunks; + struct symt* symt_cache[sc_num]; /* void, unknown */ } dwarf2_parse_module_context_t; /* this is the context used for parsing a compilation unit @@ -193,7 +194,6 @@ typedef struct dwarf2_parse_context_s struct sparse_array abbrev_table; struct sparse_array debug_info_table; ULONG_PTR ref_offset; - struct symt* symt_cache[sc_num]; /* void, unknown */ char* cpp_name; dwarf2_cuhead_t head; } dwarf2_parse_context_t; @@ -1027,16 +1027,16 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, if (!dwarf2_find_attribute(ctx, di, DW_AT_type, &attr)) /* this is only valid if current language of CU is C or C++ */ - return ctx->symt_cache[sc_void]; + return ctx->module_ctx->symt_cache[sc_void]; if (!(type = sparse_array_find(&ctx->debug_info_table, attr.u.uvalue))) { FIXME("Unable to find back reference to type %lx\n", attr.u.uvalue); - return ctx->symt_cache[sc_unknown]; + return ctx->module_ctx->symt_cache[sc_unknown]; } if (type == di) { FIXME("Reference to itself\n"); - return ctx->symt_cache[sc_unknown]; + return ctx->module_ctx->symt_cache[sc_unknown]; } if (!type->symt) { @@ -1045,7 +1045,7 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, if (!type->symt) { FIXME("Unable to load forward reference for tag %lx\n", type->abbrev->tag); - return ctx->symt_cache[sc_unknown]; + return ctx->module_ctx->symt_cache[sc_unknown]; } } return type->symt; @@ -1339,6 +1339,7 @@ static struct symt* dwarf2_parse_array_type(dwarf2_parse_context_t* ctx, else for (i = 0; i < vector_length(children); i++) { child = *(dwarf2_debug_info_t**)vector_at(children, i); + if (child->symt == ctx->module_ctx->symt_cache[sc_unknown]) continue; switch (child->abbrev->tag) { case DW_TAG_subrange_type: @@ -2121,7 +2122,7 @@ static void dwarf2_parse_namespace(dwarf2_parse_context_t* ctx, TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - di->symt = ctx->symt_cache[sc_void]; + di->symt = ctx->module_ctx->symt_cache[sc_void]; children = dwarf2_get_di_children(ctx, di); if (children) for (i = 0; i < vector_length(children); i++) @@ -2491,9 +2492,6 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_module_context_t* module_ pool_init(&ctx.pool, 65536); ctx.section = section_debug; ctx.ref_offset = comp_unit_start - module_ctx->sections[section_debug].address; - memset(ctx.symt_cache, 0, sizeof(ctx.symt_cache)); - ctx.symt_cache[sc_void] = &symt_new_basic(module_ctx->module, btVoid, "void", 0)->symt; - ctx.symt_cache[sc_unknown] = &symt_new_basic(module_ctx->module, btNoType, "# unknown", 0)->symt; ctx.cpp_name = NULL; ctx.module_ctx = module_ctx; @@ -3666,6 +3664,9 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, module_ctx.module = dwarf2_modfmt->module; module_ctx.thunks = thunks; module_ctx.load_offset = load_offset; + memset(module_ctx.symt_cache, 0, sizeof(module_ctx.symt_cache)); + module_ctx.symt_cache[sc_void] = &symt_new_basic(module_ctx.module, btVoid, "void", 0)->symt; + module_ctx.symt_cache[sc_unknown] = &symt_new_basic(module_ctx.module, btNoType, "# unknown", 0)->symt; while (mod_ctx.data < mod_ctx.end_data) {

1 0

Eric Pouech : dbghelp/dwarf: Keep open and keep track of parse_context_t inside a module_context_t.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: f7244dc1a8de235ffb3dad02a94e1fd3ce3f22e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7244dc1a8de235ffb3dad02… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:37:58 2021 +0200 dbghelp/dwarf: Keep open and keep track of parse_context_t inside a module_context_t. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 97 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 39 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4bb5bb23ac6..e64fcbb822e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -180,8 +180,16 @@ typedef struct dwarf2_parse_module_context_s struct module* module; const struct elf_thunk_area*thunks; struct symt* symt_cache[sc_num]; /* void, unknown */ + struct vector unit_contexts; } dwarf2_parse_module_context_t; +enum unit_status +{ + UNIT_ERROR, + UNIT_NOTLOADED, + UNIT_LOADED, +}; + /* this is the context used for parsing a compilation unit * inside an ELF/PE section (likely .debug_info) */ @@ -196,6 +204,7 @@ typedef struct dwarf2_parse_context_s ULONG_PTR ref_offset; char* cpp_name; dwarf2_cuhead_t head; + enum unit_status status; } dwarf2_parse_context_t; /* stored in the dbghelp's module internal structure for later reuse */ @@ -2440,10 +2449,9 @@ unsigned dwarf2_cache_cuhead(struct dwarf2_module_info_s* module, struct symt_co return TRUE; } -static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_module_context_t* module_ctx, +static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx, dwarf2_traverse_context_t* mod_ctx) { - dwarf2_parse_context_t ctx; dwarf2_traverse_context_t abbrev_ctx; dwarf2_debug_info_t* di; dwarf2_traverse_context_t cu_ctx; @@ -2454,22 +2462,23 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_module_context_t* module_ /* FIXME this is a temporary configuration while adding support for dwarf3&4 bits */ static LONG max_supported_dwarf_version = 0; - cu_length = dwarf2_parse_3264(mod_ctx, &ctx.head.offset_size); + cu_length = dwarf2_parse_3264(mod_ctx, &ctx->head.offset_size); cu_ctx.data = mod_ctx->data; cu_ctx.end_data = mod_ctx->data + cu_length; mod_ctx->data += cu_length; - ctx.head.version = dwarf2_parse_u2(&cu_ctx); - cu_abbrev_offset = dwarf2_parse_offset(&cu_ctx, ctx.head.offset_size); - ctx.head.word_size = dwarf2_parse_byte(&cu_ctx); + ctx->head.version = dwarf2_parse_u2(&cu_ctx); + cu_abbrev_offset = dwarf2_parse_offset(&cu_ctx, ctx->head.offset_size); + ctx->head.word_size = dwarf2_parse_byte(&cu_ctx); + ctx->status = UNIT_ERROR; TRACE("Compilation Unit Header found at 0x%x:\n", - (int)(comp_unit_start - module_ctx->sections[section_debug].address)); + (int)(comp_unit_start - ctx->module_ctx->sections[section_debug].address)); TRACE("- length: %lu\n", cu_length); - TRACE("- version: %u\n", ctx.head.version); + TRACE("- version: %u\n", ctx->head.version); TRACE("- abbrev_offset: %lu\n", cu_abbrev_offset); - TRACE("- word_size: %u\n", ctx.head.word_size); - TRACE("- offset_size: %u\n", ctx.head.offset_size); + TRACE("- word_size: %u\n", ctx->head.word_size); + TRACE("- offset_size: %u\n", ctx->head.offset_size); if (max_supported_dwarf_version == 0) { @@ -2478,30 +2487,30 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_module_context_t* module_ max_supported_dwarf_version = (v >= 2 && v <= 4) ? v : 2; } - if (ctx.head.version < 2 || ctx.head.version > max_supported_dwarf_version) + if (ctx->head.version < 2 || ctx->head.version > max_supported_dwarf_version) { if (max_supported_dwarf_version > 2) WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2 up to %u.\n", - ctx.head.version, max_supported_dwarf_version); + ctx->head.version, max_supported_dwarf_version); else WARN("%u DWARF version unsupported. Wine dbghelp only support DWARF 2.\n", - ctx.head.version); + ctx->head.version); return FALSE; } - pool_init(&ctx.pool, 65536); - ctx.section = section_debug; - ctx.ref_offset = comp_unit_start - module_ctx->sections[section_debug].address; - ctx.cpp_name = NULL; - ctx.module_ctx = module_ctx; + pool_init(&ctx->pool, 65536); + ctx->section = section_debug; + ctx->ref_offset = comp_unit_start - ctx->module_ctx->sections[section_debug].address; + ctx->cpp_name = NULL; + ctx->status = UNIT_NOTLOADED; - abbrev_ctx.data = module_ctx->sections[section_abbrev].address + cu_abbrev_offset; - abbrev_ctx.end_data = module_ctx->sections[section_abbrev].address + module_ctx->sections[section_abbrev].size; - dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx.abbrev_table, &ctx.pool); + abbrev_ctx.data = ctx->module_ctx->sections[section_abbrev].address + cu_abbrev_offset; + abbrev_ctx.end_data = ctx->module_ctx->sections[section_abbrev].address + ctx->module_ctx->sections[section_abbrev].size; + dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx->abbrev_table, &ctx->pool); - sparse_array_init(&ctx.debug_info_table, sizeof(dwarf2_debug_info_t), 128); + sparse_array_init(&ctx->debug_info_table, sizeof(dwarf2_debug_info_t), 128); - if (dwarf2_read_one_debug_info(&ctx, &cu_ctx, NULL, &di)) + if (dwarf2_read_one_debug_info(ctx, &cu_ctx, NULL, &di)) { if (di->abbrev->tag == DW_TAG_compile_unit) { @@ -2512,37 +2521,35 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_module_context_t* module_ struct attribute stmt_list, low_pc; struct attribute comp_dir; - if (!dwarf2_find_attribute(&ctx, di, DW_AT_name, &name)) + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; /* get working directory of current compilation unit */ - if (!dwarf2_find_attribute(&ctx, di, DW_AT_comp_dir, &comp_dir)) + if (!dwarf2_find_attribute(ctx, di, DW_AT_comp_dir, &comp_dir)) comp_dir.u.string = NULL; - if (!dwarf2_find_attribute(&ctx, di, DW_AT_low_pc, &low_pc)) + if (!dwarf2_find_attribute(ctx, di, DW_AT_low_pc, &low_pc)) low_pc.u.uvalue = 0; - - ctx.compiland = symt_new_compiland(module_ctx->module, module_ctx->load_offset + low_pc.u.uvalue, - source_new(module_ctx->module, comp_dir.u.string, name.u.string)); - dwarf2_cache_cuhead(module_ctx->module->format_info[DFI_DWARF]->u.dwarf2_info, ctx.compiland, &ctx.head); - - di->symt = &ctx.compiland->symt; - children = dwarf2_get_di_children(&ctx, di); + ctx->compiland = symt_new_compiland(ctx->module_ctx->module, ctx->module_ctx->load_offset + low_pc.u.uvalue, + source_new(ctx->module_ctx->module, comp_dir.u.string, name.u.string)); + dwarf2_cache_cuhead(ctx->module_ctx->module->format_info[DFI_DWARF]->u.dwarf2_info, ctx->compiland, &ctx->head); + di->symt = &ctx->compiland->symt; + children = dwarf2_get_di_children(ctx, di); if (children) for (i = 0; i < vector_length(children); i++) { child = *(dwarf2_debug_info_t**)vector_at(children, i); - dwarf2_load_one_entry(&ctx, child); + dwarf2_load_one_entry(ctx, child); } - if (dwarf2_find_attribute(&ctx, di, DW_AT_stmt_list, &stmt_list)) + if (dwarf2_find_attribute(ctx, di, DW_AT_stmt_list, &stmt_list)) { - if (dwarf2_parse_line_numbers(&ctx, comp_dir.u.string, stmt_list.u.uvalue)) - module_ctx->module->module.LineNumbers = TRUE; + if (dwarf2_parse_line_numbers(ctx, comp_dir.u.string, stmt_list.u.uvalue)) + ctx->module_ctx->module->module.LineNumbers = TRUE; } + ctx->status = UNIT_LOADED; ret = TRUE; } else FIXME("Should have a compilation unit here\n"); } - pool_destroy(&ctx.pool); return ret; } @@ -3605,6 +3612,7 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, BOOL ret = TRUE; struct module_format* dwarf2_modfmt; dwarf2_parse_module_context_t module_ctx; + unsigned i; if (!dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect)) /* lld produces .eh_fram to avoid generating a long name */ @@ -3667,10 +3675,14 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, memset(module_ctx.symt_cache, 0, sizeof(module_ctx.symt_cache)); module_ctx.symt_cache[sc_void] = &symt_new_basic(module_ctx.module, btVoid, "void", 0)->symt; module_ctx.symt_cache[sc_unknown] = &symt_new_basic(module_ctx.module, btNoType, "# unknown", 0)->symt; + vector_init(&module_ctx.unit_contexts, sizeof(dwarf2_parse_context_t), 16); while (mod_ctx.data < mod_ctx.end_data) { - dwarf2_parse_compilation_unit(&module_ctx, &mod_ctx); + dwarf2_parse_context_t* unit_ctx = vector_add(&module_ctx.unit_contexts, &module_ctx.module->pool); + + unit_ctx->module_ctx = &module_ctx; + dwarf2_parse_compilation_unit(unit_ctx, &mod_ctx); } dwarf2_modfmt->module->module.SymType = SymDia; dwarf2_modfmt->module->module.CVSig = 'D' | ('W' << 8) | ('A' << 16) | ('R' << 24); @@ -3680,6 +3692,13 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->module->module.SourceIndexed = TRUE; dwarf2_modfmt->module->module.Publics = TRUE; + for (i = 0; i < module_ctx.unit_contexts.num_elts; ++i) + { + dwarf2_parse_context_t* unit = vector_at(&module_ctx.unit_contexts, i); + if (unit->status != UNIT_ERROR) + pool_destroy(&unit->pool); + } + leave: dwarf2_fini_section(&section[section_debug]); dwarf2_fini_section(&section[section_abbrev]);

1 0

Eric Pouech : dbghelp: Split the parsing of a dwarf compilation unit in two phases.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 5e74e2b919729854196bdcbb4c20af30e49c9561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e74e2b919729854196bdcbb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:38:04 2021 +0200 dbghelp: Split the parsing of a dwarf compilation unit in two phases. - first phase just parse the header and do elementary checks - second phase, actually load all DIEs in CU Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e64fcbb822e..855168a6085 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -205,6 +205,7 @@ typedef struct dwarf2_parse_context_s char* cpp_name; dwarf2_cuhead_t head; enum unit_status status; + dwarf2_traverse_context_t traverse_DIE; } dwarf2_parse_context_t; /* stored in the dbghelp's module internal structure for later reuse */ @@ -2449,27 +2450,24 @@ unsigned dwarf2_cache_cuhead(struct dwarf2_module_info_s* module, struct symt_co return TRUE; } -static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx, - dwarf2_traverse_context_t* mod_ctx) +static BOOL dwarf2_parse_compilation_unit_head(dwarf2_parse_context_t* ctx, + dwarf2_traverse_context_t* mod_ctx) { dwarf2_traverse_context_t abbrev_ctx; - dwarf2_debug_info_t* di; - dwarf2_traverse_context_t cu_ctx; const unsigned char* comp_unit_start = mod_ctx->data; ULONG_PTR cu_length; ULONG_PTR cu_abbrev_offset; - BOOL ret = FALSE; /* FIXME this is a temporary configuration while adding support for dwarf3&4 bits */ static LONG max_supported_dwarf_version = 0; cu_length = dwarf2_parse_3264(mod_ctx, &ctx->head.offset_size); - cu_ctx.data = mod_ctx->data; - cu_ctx.end_data = mod_ctx->data + cu_length; + ctx->traverse_DIE.data = mod_ctx->data; + ctx->traverse_DIE.end_data = mod_ctx->data + cu_length; mod_ctx->data += cu_length; - ctx->head.version = dwarf2_parse_u2(&cu_ctx); - cu_abbrev_offset = dwarf2_parse_offset(&cu_ctx, ctx->head.offset_size); - ctx->head.word_size = dwarf2_parse_byte(&cu_ctx); + ctx->head.version = dwarf2_parse_u2(&ctx->traverse_DIE); + cu_abbrev_offset = dwarf2_parse_offset(&ctx->traverse_DIE, ctx->head.offset_size); + ctx->head.word_size = dwarf2_parse_byte(&ctx->traverse_DIE); ctx->status = UNIT_ERROR; TRACE("Compilation Unit Header found at 0x%x:\n", @@ -2509,6 +2507,16 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx, dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx->abbrev_table, &ctx->pool); sparse_array_init(&ctx->debug_info_table, sizeof(dwarf2_debug_info_t), 128); + return TRUE; +} + +static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) +{ + dwarf2_debug_info_t* di; + dwarf2_traverse_context_t cu_ctx = ctx->traverse_DIE; + BOOL ret = FALSE; + + if (ctx->status == UNIT_ERROR) return FALSE; if (dwarf2_read_one_debug_info(ctx, &cu_ctx, NULL, &di)) { @@ -3642,9 +3650,6 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, TRACE("Loading Dwarf2 information for %s\n", debugstr_w(module->modulename)); - mod_ctx.data = section[section_debug].address; - mod_ctx.end_data = mod_ctx.data + section[section_debug].size; - dwarf2_modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(*dwarf2_modfmt) + sizeof(*dwarf2_modfmt->u.dwarf2_info)); if (!dwarf2_modfmt) @@ -3677,13 +3682,21 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, module_ctx.symt_cache[sc_unknown] = &symt_new_basic(module_ctx.module, btNoType, "# unknown", 0)->symt; vector_init(&module_ctx.unit_contexts, sizeof(dwarf2_parse_context_t), 16); + /* phase I: parse all CU heads */ + mod_ctx.data = section[section_debug].address; + mod_ctx.end_data = mod_ctx.data + section[section_debug].size; while (mod_ctx.data < mod_ctx.end_data) { dwarf2_parse_context_t* unit_ctx = vector_add(&module_ctx.unit_contexts, &module_ctx.module->pool); unit_ctx->module_ctx = &module_ctx; - dwarf2_parse_compilation_unit(unit_ctx, &mod_ctx); + dwarf2_parse_compilation_unit_head(unit_ctx, &mod_ctx); } + + /* phase2: load content of all CU */ + for (i = 0; i < module_ctx.unit_contexts.num_elts; ++i) + dwarf2_parse_compilation_unit((dwarf2_parse_context_t*)vector_at(&module_ctx.unit_contexts, i)); + dwarf2_modfmt->module->module.SymType = SymDia; dwarf2_modfmt->module->module.CVSig = 'D' | ('W' << 8) | ('A' << 16) | ('R' << 24); /* FIXME: we could have a finer grain here */

1 0