Skip to content

W
wine-cw
Commit 25203bd8 authored by Peter Oberndorfer's avatar Peter Oberndorfer Committed by Alexandre Julliard
Browse files
Options

dbghelp: Fix up load_offset to work in case the load offset is different for…

dbghelp: Fix up load_offset to work in case the load offset is different for real binary and debug link file.
parent 7bbb2120
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
dlls/dbghelp/elf_module.c
View file @ 25203bd8
...@@ -1060,6 +1060,13 @@ static BOOL elf_load_debug_info_from_map(struct module* module, ...@@ -1060,6 +1060,13 @@ static BOOL elf_load_debug_info_from_map(struct module* module,
const BYTE* dw2_debug_line; const BYTE* dw2_debug_line;
const BYTE* dw2_debug_loclist; const BYTE* dw2_debug_loclist;
/* debug info might have a different base address than .so file
* when elf file is prelinked after splitting off debug info
* adjust symbol base addresses accordingly
*/
unsigned long load_offset = module->elf_info->elf_addr +
fmap->elf_start - debug_sect.fmap->elf_start;
TRACE("Loading Dwarf2 information for %s\n", debugstr_w(module->module.ModuleName)); TRACE("Loading Dwarf2 information for %s\n", debugstr_w(module->module.ModuleName));
elf_find_section(fmap, ".debug_str", SHT_NULL, &debug_str_sect); elf_find_section(fmap, ".debug_str", SHT_NULL, &debug_str_sect);
...@@ -1075,7 +1082,7 @@ static BOOL elf_load_debug_info_from_map(struct module* module, ...@@ -1075,7 +1082,7 @@ static BOOL elf_load_debug_info_from_map(struct module* module,
if (dw2_debug != ELF_NO_MAP && dw2_debug_abbrev != ELF_NO_MAP && dw2_debug_str != ELF_NO_MAP) if (dw2_debug != ELF_NO_MAP && dw2_debug_abbrev != ELF_NO_MAP && dw2_debug_str != ELF_NO_MAP)
{ {
/* OK, now just parse dwarf2 debug infos. */ /* OK, now just parse dwarf2 debug infos. */
lret = dwarf2_parse(module, module->elf_info->elf_addr, thunks, lret = dwarf2_parse(module, load_offset, thunks,
dw2_debug, elf_get_map_size(&debug_sect), dw2_debug, elf_get_map_size(&debug_sect),
dw2_debug_abbrev, elf_get_map_size(&debug_abbrev_sect), dw2_debug_abbrev, elf_get_map_size(&debug_abbrev_sect),
dw2_debug_str, elf_get_map_size(&debug_str_sect), dw2_debug_str, elf_get_map_size(&debug_str_sect),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment