ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dbghelp/dwarf: Store a potential link to an external DWZ file in the dwarf2 module's information. 

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Eric Pouech 2021-09-16 11:09:57 +02:00 committed by Alexandre Julliard
parent e5dbf5f74e
commit 16d6656163
1 changed files with 55 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
dlls/dbghelp/dwarf.c
View File

@ -182,9 +182,17 @@ typedef struct dwarf2_parse_module_context_s
const struct elf_thunk_area*thunks; const struct elf_thunk_area*thunks;
struct symt* symt_cache[sc_num]; /* void, unknown */ struct symt* symt_cache[sc_num]; /* void, unknown */
struct vector unit_contexts; struct vector unit_contexts;
struct dwarf2_dwz_alternate_s* dwz;
DWORD cu_versions; DWORD cu_versions;
} dwarf2_parse_module_context_t; } dwarf2_parse_module_context_t;
typedef struct dwarf2_dwz_alternate_s
{
struct image_file_map* fmap;
dwarf2_section_t sections[section_max];
struct image_section_map sectmap[section_max];
} dwarf2_dwz_alternate_t;
enum unit_status enum unit_status
{ {
UNIT_ERROR, UNIT_ERROR,
@ -3663,6 +3671,49 @@ static void dwarf2_module_remove(struct process* pcs, struct module_format* modf
HeapFree(GetProcessHeap(), 0, modfmt); HeapFree(GetProcessHeap(), 0, modfmt);
} }
static dwarf2_dwz_alternate_t* dwarf2_load_dwz(struct image_file_map* fmap, struct module* module)
{
struct image_file_map* fmap_dwz;
dwarf2_dwz_alternate_t* dwz;
fmap_dwz = image_load_debugaltlink(fmap, module);
if (!fmap_dwz) return NULL;
if (!(dwz = HeapAlloc(GetProcessHeap(), 0, sizeof(*dwz))))
{
image_unmap_file(fmap_dwz);
HeapFree(GetProcessHeap(), 0, fmap_dwz);
return NULL;
}
dwz->fmap = fmap_dwz;
dwarf2_init_section(&dwz->sections[section_debug], fmap_dwz, ".debug_info", ".zdebug_info", &dwz->sectmap[section_debug]);
dwarf2_init_section(&dwz->sections[section_abbrev], fmap_dwz, ".debug_abbrev", ".zdebug_abbrev", &dwz->sectmap[section_abbrev]);
dwarf2_init_section(&dwz->sections[section_string], fmap_dwz, ".debug_str", ".zdebug_str", &dwz->sectmap[section_string]);
dwarf2_init_section(&dwz->sections[section_line], fmap_dwz, ".debug_line", ".zdebug_line", &dwz->sectmap[section_line]);
dwarf2_init_section(&dwz->sections[section_ranges], fmap_dwz, ".debug_ranges", ".zdebug_ranges", &dwz->sectmap[section_ranges]);
return dwz;
}
static void dwarf2_unload_dwz(dwarf2_dwz_alternate_t* dwz)
{
if (!dwz) return;
dwarf2_fini_section(&dwz->sections[section_debug]);
dwarf2_fini_section(&dwz->sections[section_abbrev]);
dwarf2_fini_section(&dwz->sections[section_string]);
dwarf2_fini_section(&dwz->sections[section_line]);
dwarf2_fini_section(&dwz->sections[section_ranges]);
image_unmap_section(&dwz->sectmap[section_debug]);
image_unmap_section(&dwz->sectmap[section_abbrev]);
image_unmap_section(&dwz->sectmap[section_string]);
image_unmap_section(&dwz->sectmap[section_line]);
image_unmap_section(&dwz->sectmap[section_ranges]);
image_unmap_file(dwz->fmap);
HeapFree(GetProcessHeap(), 0, dwz);
}
BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset,
const struct elf_thunk_area* thunks, const struct elf_thunk_area* thunks,
struct image_file_map* fmap) struct image_file_map* fmap)
@ -3676,6 +3727,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset,
dwarf2_parse_module_context_t module_ctx; dwarf2_parse_module_context_t module_ctx;
unsigned i; unsigned i;
module_ctx.dwz = dwarf2_load_dwz(fmap, module);
if (!dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect)) if (!dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect))
/* lld produces .eh_fram to avoid generating a long name */ /* lld produces .eh_fram to avoid generating a long name */
dwarf2_init_section(&eh_frame, fmap, ".eh_fram", NULL, &eh_frame_sect); dwarf2_init_section(&eh_frame, fmap, ".eh_fram", NULL, &eh_frame_sect);
@ -3772,6 +3825,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset,
} }
leave: leave:
dwarf2_unload_dwz(module_ctx.dwz);
dwarf2_fini_section(&section[section_debug]); dwarf2_fini_section(&section[section_debug]);
dwarf2_fini_section(&section[section_abbrev]); dwarf2_fini_section(&section[section_abbrev]);
dwarf2_fini_section(&section[section_string]); dwarf2_fini_section(&section[section_string]);