June 2006 - Wine-commits - list.winehq.org

Eric Pouech : dbghelp: dwarf: Tidy up leb128 reading.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 797acdf436ae098244c3415c795b128a366ce204 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=797acdf436ae098244c3415… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:32:33 2006 +0200 dbghelp: dwarf: Tidy up leb128 reading. --- dlls/dbghelp/dwarf.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index be23e3e..18bf253 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -207,13 +207,13 @@ static unsigned long dwarf2_leb128_as_un assert( NULL != ctx ); - while (1) + do { byte = dwarf2_parse_byte(ctx); ret |= (byte & 0x7f) << shift; shift += 7; - if (0 == (byte & 0x80)) { break ; } - } + } while (byte & 0x80); + return ret; } @@ -226,13 +226,13 @@ static long dwarf2_leb128_as_signed(dwar assert( NULL != ctx ); - while (1) + do { byte = dwarf2_parse_byte(ctx); ret |= (byte & 0x7f) << shift; shift += 7; - if (0 == (byte & 0x80)) { break ; } - } + } while (byte & 0x80); + /* as spec: sign bit of byte is 2nd high order bit (80x40) * -> 0x80 is used as flag. */

1 0

Eric Pouech : dbghelp: Indent the code as the rest of dbghelp module.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 54d6f8cc4552e83200e0bf3a80b21e431f76ce4c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=54d6f8cc4552e83200e0bf3… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:32:30 2006 +0200 dbghelp: Indent the code as the rest of dbghelp module. --- dlls/dbghelp/dwarf.c | 122 +++++++++++++++++++++++++------------------------- 1 files changed, 62 insertions(+), 60 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f385544..be23e3e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -66,27 +66,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_dwarf #if 0 static void dump(const void* ptr, unsigned len) { - int i, j; - BYTE msg[128]; - static const char hexof[] = "0123456789abcdef"; - const BYTE* x = (const BYTE*)ptr; - - for (i = 0; i < len; i += 16) - { - sprintf(msg, "%08x: ", i); - memset(msg + 10, ' ', 3 * 16 + 1 + 16); - for (j = 0; j < min(16, len - i); j++) + int i, j; + BYTE msg[128]; + static const char hexof[] = "0123456789abcdef"; + const BYTE* x = (const BYTE*)ptr; + + for (i = 0; i < len; i += 16) { - msg[10 + 3 * j + 0] = hexof[x[i + j] >> 4]; - msg[10 + 3 * j + 1] = hexof[x[i + j] & 15]; - msg[10 + 3 * j + 2] = ' '; - msg[10 + 3 * 16 + 1 + j] = (x[i + j] >= 0x20 && x[i + j] < 0x7f) ? - x[i + j] : '.'; + sprintf(msg, "%08x: ", i); + memset(msg + 10, ' ', 3 * 16 + 1 + 16); + for (j = 0; j < min(16, len - i); j++) + { + msg[10 + 3 * j + 0] = hexof[x[i + j] >> 4]; + msg[10 + 3 * j + 1] = hexof[x[i + j] & 15]; + msg[10 + 3 * j + 2] = ' '; + msg[10 + 3 * 16 + 1 + j] = (x[i + j] >= 0x20 && x[i + j] < 0x7f) ? + x[i + j] : '.'; + } + msg[10 + 3 * 16] = ' '; + msg[10 + 3 * 16 + 1 + 16] = '\0'; + TRACE("%s\n", msg); } - msg[10 + 3 * 16] = ' '; - msg[10 + 3 * 16 + 1 + 16] = '\0'; - TRACE("%s\n", msg); - } } #endif @@ -180,65 +180,67 @@ static struct symt* dwarf2_parse_enumera static unsigned char dwarf2_parse_byte(dwarf2_traverse_context_t* ctx) { - unsigned char uvalue = *(const unsigned char*) ctx->data; - ctx->data += 1; - return uvalue; + unsigned char uvalue = *(const unsigned char*) ctx->data; + ctx->data += 1; + return uvalue; } static unsigned short dwarf2_parse_u2(dwarf2_traverse_context_t* ctx) { - unsigned short uvalue = *(const unsigned short*) ctx->data; - ctx->data += 2; - return uvalue; + unsigned short uvalue = *(const unsigned short*) ctx->data; + ctx->data += 2; + return uvalue; } static unsigned long dwarf2_parse_u4(dwarf2_traverse_context_t* ctx) { - unsigned long uvalue = *(const unsigned int*) ctx->data; - ctx->data += 4; - return uvalue; + unsigned long uvalue = *(const unsigned int*) ctx->data; + ctx->data += 4; + return uvalue; } static unsigned long dwarf2_leb128_as_unsigned(dwarf2_traverse_context_t* ctx) { - unsigned long ret = 0; - unsigned char byte; - unsigned shift = 0; - - assert( NULL != ctx ); + unsigned long ret = 0; + unsigned char byte; + unsigned shift = 0; - while (1) { - byte = dwarf2_parse_byte(ctx); - ret |= (byte & 0x7f) << shift; - shift += 7; - if (0 == (byte & 0x80)) { break ; } - } + assert( NULL != ctx ); - return ret; + while (1) + { + byte = dwarf2_parse_byte(ctx); + ret |= (byte & 0x7f) << shift; + shift += 7; + if (0 == (byte & 0x80)) { break ; } + } + return ret; } static long dwarf2_leb128_as_signed(dwarf2_traverse_context_t* ctx) { - long ret = 0; - unsigned char byte; - unsigned shift = 0; - const unsigned size = sizeof(int) * 8; - - assert( NULL != ctx ); - - while (1) { - byte = dwarf2_parse_byte(ctx); - ret |= (byte & 0x7f) << shift; - shift += 7; - if (0 == (byte & 0x80)) { break ; } - } - /* as spec: sign bit of byte is 2nd high order bit (80x40) - * -> 0x80 is used as flag. - */ - if ((shift < size) && (byte & 0x40)) { - ret |= - (1 << shift); - } - return ret; + long ret = 0; + unsigned char byte; + unsigned shift = 0; + const unsigned size = sizeof(int) * 8; + + assert( NULL != ctx ); + + while (1) + { + byte = dwarf2_parse_byte(ctx); + ret |= (byte & 0x7f) << shift; + shift += 7; + if (0 == (byte & 0x80)) { break ; } + } + /* as spec: sign bit of byte is 2nd high order bit (80x40) + * -> 0x80 is used as flag. + */ + if ((shift < size) && (byte & 0x40)) + { + ret |= - (1 << shift); + } + return ret; } static unsigned long dwarf2_parse_addr(dwarf2_traverse_context_t* ctx)

1 0

Eric Pouech : dbghelp: Added the ability to define a source file by dir+filename instead of only filename .
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 7af4097d802834a91bfc010870e7a9a1a7061342 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7af4097d802834a91bfc010… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:32:20 2006 +0200 dbghelp: Added the ability to define a source file by dir+filename instead of only filename. --- dlls/dbghelp/coff.c | 2 +- dlls/dbghelp/dbghelp_private.h | 5 ++--- dlls/dbghelp/dwarf.c | 11 +++++------ dlls/dbghelp/elf_module.c | 2 +- dlls/dbghelp/msc.c | 8 +++++--- dlls/dbghelp/source.c | 23 +++++++++++++++++++---- dlls/dbghelp/stabs.c | 23 ++++------------------- dlls/dbghelp/symbol.c | 6 +++--- 8 files changed, 40 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7af4097d802834a91bf…

1 0

Eric Pouech : dbghelp: dwarf: Generate the current source file and store it in dbghelp's internals.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 8a92d9ae497149f1ab9165e5f1a854f38d84c5b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8a92d9ae497149f1ab9165e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:32:24 2006 +0200 dbghelp: dwarf: Generate the current source file and store it in dbghelp's internals. --- dlls/dbghelp/dwarf.c | 49 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 41 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 701fd5c..f385544 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -57,7 +57,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_dwarf * - Functions: * o unspecified parameters * o inlined functions - * o line numbers * o Debug{Start|End}Point * o CFA * - Udt @@ -527,7 +526,7 @@ static unsigned long dwarf2_compute_loca { case DW_OP_addr: loc[++stk] = dwarf2_parse_addr(&lctx); break; case DW_OP_const1u: loc[++stk] = dwarf2_parse_byte(&lctx); break; - case DW_OP_const1s: loc[++stk] = (long)(char)dwarf2_parse_byte(&lctx); break; + case DW_OP_const1s: loc[++stk] = (long)(signed char)dwarf2_parse_byte(&lctx); break; case DW_OP_const2u: loc[++stk] = dwarf2_parse_u2(&lctx); break; case DW_OP_const2s: loc[++stk] = (long)(short)dwarf2_parse_u2(&lctx); break; case DW_OP_const4u: loc[++stk] = dwarf2_parse_u4(&lctx); break; @@ -1380,6 +1379,22 @@ static void dwarf2_load_one_entry(dwarf2 } } +static void dwarf2_set_line_number(struct module* module, unsigned long address, + struct vector* v, unsigned file, unsigned line) +{ + struct symt_function* func; + int idx; + unsigned* psrc; + + if (!file || !(psrc = vector_at(v, file - 1))) return; + + TRACE("%s %lx %s %u\n", module->module.ModuleName, address, source_get(module, *psrc), line); + if ((idx = symt_find_nearest(module, address)) == -1 || + module->addr_sorttab[idx]->symt.tag != SymTagFunction) return; + func = (struct symt_function*)module->addr_sorttab[idx]; + symt_add_func_line(module, func, *psrc, line, address - func->address); +} + static void dwarf2_parse_line_numbers(const dwarf2_section_t* sections, dwarf2_parse_context_t* ctx, unsigned long offset) @@ -1390,6 +1405,9 @@ static void dwarf2_parse_line_numbers(co unsigned line_range, opcode_base; int line_base; const unsigned char* opcode_len; + struct vector dirs; + struct vector files; + const char** p; traverse.sections = sections; traverse.section = section_line; @@ -1406,31 +1424,42 @@ static void dwarf2_parse_line_numbers(co header_len = dwarf2_parse_u4(&traverse); insn_size = dwarf2_parse_byte(&traverse); default_stmt = dwarf2_parse_byte(&traverse); - line_base = (char)dwarf2_parse_byte(&traverse); + line_base = (signed char)dwarf2_parse_byte(&traverse); line_range = dwarf2_parse_byte(&traverse); opcode_base = dwarf2_parse_byte(&traverse); opcode_len = traverse.data; - traverse.data += opcode_base; + traverse.data += opcode_base - 1; + vector_init(&dirs, sizeof(const char*), 4); + p = vector_add(&dirs, &ctx->pool); + *p = "."; while (*traverse.data) { TRACE("Got include %s\n", (const char*)traverse.data); + p = vector_add(&dirs, &ctx->pool); + *p = (const char *)traverse.data; traverse.data += strlen((const char *)traverse.data) + 1; } traverse.data++; + + vector_init(&files, sizeof(unsigned), 16); while (*traverse.data) { - unsigned int dir_index, mod_time, length; - const char* name; + unsigned int dir_index, mod_time, length; + const char* name; + const char* dir; + unsigned* psrc; name = (const char*)traverse.data; traverse.data += strlen(name) + 1; dir_index = dwarf2_leb128_as_unsigned(&traverse); mod_time = dwarf2_leb128_as_unsigned(&traverse); length = dwarf2_leb128_as_unsigned(&traverse); - TRACE("Got file %s (%u,%u,%u)\n", - name, dir_index, mod_time, length); + dir = *(const char**)vector_at(&dirs, dir_index); + TRACE("Got file %s/%s (%u,%u)\n", dir, name, mod_time, length); + psrc = vector_add(&files, &ctx->pool); + *psrc = source_new(ctx->module, dir, name); } traverse.data++; @@ -1455,6 +1484,7 @@ static void dwarf2_parse_line_numbers(co address += (delta / line_range) * insn_size; line += line_base + (delta % line_range); basic_block = TRUE; + dwarf2_set_line_number(ctx->module, address, &files, file, line); } else { @@ -1462,6 +1492,7 @@ static void dwarf2_parse_line_numbers(co { case DW_LNS_copy: basic_block = FALSE; + dwarf2_set_line_number(ctx->module, address, &files, file, line); break; case DW_LNS_advance_pc: address += insn_size * dwarf2_leb128_as_unsigned(&traverse); @@ -1493,12 +1524,14 @@ static void dwarf2_parse_line_numbers(co switch (extopcode) { case DW_LNE_end_sequence: + dwarf2_set_line_number(ctx->module, address, &files, file, line); end_sequence = TRUE; break; case DW_LNE_set_address: address = ctx->module->module.BaseOfImage + dwarf2_parse_addr(&traverse); break; case DW_LNE_define_file: + FIXME("not handled %s\n", traverse.data); traverse.data += strlen((const char *)traverse.data) + 1; dwarf2_leb128_as_unsigned(&traverse); dwarf2_leb128_as_unsigned(&traverse);

1 0

Eric Pouech : dbghelp: Support multiple debug formats.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: cca3d1ad0c638cf1d0585adb5d6f8723438631e4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cca3d1ad0c638cf1d0585ad… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:32:27 2006 +0200 dbghelp: Support multiple debug formats. When several debug formats (eg stabs & dwarf2) exist in the same module, allow to load them all (this is needed when different compilation units are compiled with different debug options). --- dlls/dbghelp/elf_module.c | 51 ++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index f8b57f5..508c89c 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -756,7 +756,7 @@ static BOOL elf_load_debug_info_from_map struct pool* pool, struct hash_table* ht_symtab) { - BOOL ret = FALSE; + BOOL ret = FALSE, lret; const char* shstrtab; int i; int symtab_sect, dynsym_sect, stab_sect, stabstr_sect; @@ -846,22 +846,22 @@ static BOOL elf_load_debug_info_from_map if (stab != NO_MAP && stabstr != NO_MAP) { /* OK, now just parse all of the stabs. */ - ret = stabs_parse(module, module->elf_info->elf_addr, - stab, fmap->sect[stab_sect].shdr.sh_size, - stabstr, fmap->sect[stabstr_sect].shdr.sh_size); + lret = stabs_parse(module, module->elf_info->elf_addr, + stab, fmap->sect[stab_sect].shdr.sh_size, + stabstr, fmap->sect[stabstr_sect].shdr.sh_size); + if (lret) + /* and fill in the missing information for stabs */ + elf_finish_stabs_info(module, ht_symtab); + else + WARN("Couldn't correctly read stabs\n"); + ret = ret || lret; } + else lret = FALSE; elf_unmap_section(fmap, stab_sect); elf_unmap_section(fmap, stabstr_sect); - if (!ret) - { - WARN("Couldn't correctly read stabs\n"); - return FALSE; - } - /* and fill in the missing information for stabs */ - elf_finish_stabs_info(module, ht_symtab); } - else if (debug_sect != -1) + if (debug_sect != -1) { /* Dwarf 2 debug information */ const BYTE* dw2_debug; @@ -878,23 +878,21 @@ static BOOL elf_load_debug_info_from_map if (dw2_debug != NO_MAP && NO_MAP != dw2_debug_abbrev && dw2_debug_str != NO_MAP) { /* OK, now just parse dwarf2 debug infos. */ - ret = dwarf2_parse(module, module->elf_info->elf_addr, - dw2_debug, fmap->sect[debug_sect].shdr.sh_size, - dw2_debug_abbrev, fmap->sect[debug_abbrev_sect].shdr.sh_size, - dw2_debug_str, fmap->sect[debug_str_sect].shdr.sh_size, - dw2_debug_line, fmap->sect[debug_line_sect].shdr.sh_size); + lret = dwarf2_parse(module, module->elf_info->elf_addr, + dw2_debug, fmap->sect[debug_sect].shdr.sh_size, + dw2_debug_abbrev, fmap->sect[debug_abbrev_sect].shdr.sh_size, + dw2_debug_str, fmap->sect[debug_str_sect].shdr.sh_size, + dw2_debug_line, fmap->sect[debug_line_sect].shdr.sh_size); + if (!lret) + WARN("Couldn't correctly read stabs\n"); + ret = ret || lret; } elf_unmap_section(fmap, debug_sect); elf_unmap_section(fmap, debug_abbrev_sect); elf_unmap_section(fmap, debug_str_sect); elf_unmap_section(fmap, debug_line_sect); - if (!ret) - { - WARN("Couldn't correctly read stabs\n"); - return FALSE; - } } - else if (debuglink_sect != -1) + if (debuglink_sect != -1) { const char* dbg_link; struct elf_file_map fmap_link; @@ -910,10 +908,11 @@ static BOOL elf_load_debug_info_from_map { fmap_link.crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); fmap_link.with_crc = 1; - ret = elf_load_debug_info_from_map(module, &fmap_link, pool, - ht_symtab); - if (!ret) + lret = elf_load_debug_info_from_map(module, &fmap_link, pool, + ht_symtab); + if (!lret) WARN("Couldn't load debug information from %s\n", dbg_link); + ret = ret || lret; } else WARN("Couldn't load linked debug file for %s\n",

1 0

Eric Pouech : dbghelp: dwarf: Started parsing the attributes for lines ( in compilation unit).
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 52db5c094e6c9c7a883c71d996d3aaafa325f0a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=52db5c094e6c9c7a883c71d… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:32:17 2006 +0200 dbghelp: dwarf: Started parsing the attributes for lines (in compilation unit). Walking the whole lot, not doing anything interesting apart from traversing the data. --- dlls/dbghelp/dwarf.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/dwarf.h | 15 +++++ 2 files changed, 161 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 12d0226..c7eabdd 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1380,6 +1380,147 @@ static void dwarf2_load_one_entry(dwarf2 } } +static void dwarf2_parse_line_numbers(const dwarf2_section_t* sections, + dwarf2_parse_context_t* ctx, + unsigned long offset) +{ + dwarf2_traverse_context_t traverse; + unsigned long length; + unsigned version, header_len, insn_size, default_stmt; + unsigned line_range, opcode_base; + int line_base; + const unsigned char* opcode_len; + + traverse.sections = sections; + traverse.section = section_line; + traverse.data = sections[section_line].address + offset; + traverse.start_data = traverse.data; + traverse.end_data = traverse.data + 4; + traverse.offset = offset; + traverse.word_size = ctx->word_size; + + length = dwarf2_parse_u4(&traverse); + traverse.end_data = traverse.start_data + length; + + version = dwarf2_parse_u2(&traverse); + header_len = dwarf2_parse_u4(&traverse); + insn_size = dwarf2_parse_byte(&traverse); + default_stmt = dwarf2_parse_byte(&traverse); + line_base = (char)dwarf2_parse_byte(&traverse); + line_range = dwarf2_parse_byte(&traverse); + opcode_base = dwarf2_parse_byte(&traverse); + + opcode_len = traverse.data; + traverse.data += opcode_base; + + while (*traverse.data) + { + TRACE("Got include %s\n", (const char*)traverse.data); + traverse.data += strlen((const char *)traverse.data) + 1; + } + traverse.data++; + while (*traverse.data) + { + unsigned int dir_index, mod_time, length; + const char* name; + + name = (const char*)traverse.data; + traverse.data += strlen(name) + 1; + dir_index = dwarf2_leb128_as_unsigned(&traverse); + mod_time = dwarf2_leb128_as_unsigned(&traverse); + length = dwarf2_leb128_as_unsigned(&traverse); + TRACE("Got file %s (%u,%u,%u)\n", + name, dir_index, mod_time, length); + } + traverse.data++; + + while (traverse.data < traverse.end_data) + { + unsigned long address; + unsigned file = 1; + unsigned line = 1; + unsigned is_stmt = default_stmt; + BOOL basic_block = FALSE, end_sequence = FALSE; + unsigned opcode, extopcode, i; + + while (!end_sequence) + { + opcode = dwarf2_parse_byte(&traverse); + TRACE("Got opcode %x\n", opcode); + + if (opcode >= opcode_base) + { + unsigned delta = opcode - opcode_base; + + address += (delta / line_range) * insn_size; + line += line_base + (delta % line_range); + basic_block = TRUE; + } + else + { + switch (opcode) + { + case DW_LNS_copy: + basic_block = FALSE; + break; + case DW_LNS_advance_pc: + address += insn_size * dwarf2_leb128_as_unsigned(&traverse); + break; + case DW_LNS_advance_line: + line += dwarf2_leb128_as_unsigned(&traverse); + break; + case DW_LNS_set_file: + file = dwarf2_leb128_as_signed(&traverse); + break; + case DW_LNS_set_column: + dwarf2_leb128_as_unsigned(&traverse); + break; + case DW_LNS_negate_stmt: + is_stmt = !is_stmt; + break; + case DW_LNS_set_basic_block: + basic_block = 1; + break; + case DW_LNS_const_add_pc: + address += ((255 - opcode_base) / line_range) * insn_size; + break; + case DW_LNS_fixed_advance_pc: + address += dwarf2_parse_u2(&traverse); + break; + case DW_LNS_extended_op: + dwarf2_leb128_as_unsigned(&traverse); + extopcode = dwarf2_parse_byte(&traverse); + switch (extopcode) + { + case DW_LNE_end_sequence: + end_sequence = TRUE; + break; + case DW_LNE_set_address: + address = dwarf2_parse_addr(&traverse); + address += ctx->module->module.BaseOfImage; + break; + case DW_LNE_define_file: + traverse.data += strlen((const char *)traverse.data) + 1; + dwarf2_leb128_as_unsigned(&traverse); + dwarf2_leb128_as_unsigned(&traverse); + dwarf2_leb128_as_unsigned(&traverse); + break; + default: + FIXME("Unsupported extended opcode %x\n", extopcode); + break; + } + break; + default: + WARN("Unsupported opcode %x\n", opcode); + for (i = 0; i < opcode_len[opcode]; i++) + dwarf2_leb128_as_unsigned(&traverse); + break; + } + } + } + } +} + static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, const dwarf2_comp_unit_t* comp_unit, struct module* module, @@ -1433,6 +1574,7 @@ static BOOL dwarf2_parse_compilation_uni { union attribute name; dwarf2_debug_info_t** pdi = NULL; + union attribute stmt_list; TRACE("beginning at 0x%lx, for %lu\n", di->offset, di->abbrev->entry_code); @@ -1446,6 +1588,10 @@ static BOOL dwarf2_parse_compilation_uni dwarf2_load_one_entry(&ctx, *pdi, (struct symt_compiland*)di->symt); } } + if (dwarf2_find_attribute(di, DW_AT_stmt_list, &stmt_list)) + { + dwarf2_parse_line_numbers(sections, &ctx, stmt_list.uvalue); + } ret = TRUE; } else FIXME("Should have a compilation unit here\n"); diff --git a/dlls/dbghelp/dwarf.h b/dlls/dbghelp/dwarf.h index 4307720..c03799e 100644 --- a/dlls/dbghelp/dwarf.h +++ b/dlls/dbghelp/dwarf.h @@ -386,3 +386,18 @@ enum dwarf_calling_convention #define DW_CC_lo_user 0x40 #define DW_CC_hi_user 0xff + +#define DW_LNS_extended_op 0x00 +#define DW_LNS_copy 0x01 +#define DW_LNS_advance_pc 0x02 +#define DW_LNS_advance_line 0x03 +#define DW_LNS_set_file 0x04 +#define DW_LNS_set_column 0x05 +#define DW_LNS_negate_stmt 0x06 +#define DW_LNS_set_basic_block 0x07 +#define DW_LNS_const_add_pc 0x08 +#define DW_LNS_fixed_advance_pc 0x09 + +#define DW_LNE_end_sequence 0x01 +#define DW_LNE_set_address 0x02 +#define DW_LNE_define_file 0x03

1 0

Eric Pouech : dbghelp: Dwarf & parse context.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: d6bd8661ffeab62f003fb6cfee409fb593db8f74 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d6bd8661ffeab62f003fb6c… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:32:09 2006 +0200 dbghelp: Dwarf & parse context. - split the data structures for walking through the data (abbrev, cu... -> traverse_ctx) and data manipulation/loading (-> parse_ctx) - created dwarf2_parse_compilation_unit() for clarity - added section structure to gather information about all ELF sections related to all dwarf2 sections (more to come) --- dlls/dbghelp/dwarf.c | 223 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 135 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d6bd8661ffeab62f003…

1 0

Eric Pouech : dbghelp: Pass .debug_loc section information to dwarf.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: a655b143401f1c8d5d0d6097028b52221a3367b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a655b143401f1c8d5d0d609… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:32:13 2006 +0200 dbghelp: Pass .debug_loc section information to dwarf. --- dlls/dbghelp/dbghelp_private.h | 3 ++- dlls/dbghelp/dwarf.c | 7 +++++-- dlls/dbghelp/elf_module.c | 6 +++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 1095843..62ef4a6 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -434,7 +434,8 @@ extern BOOL stabs_parse(struct m extern BOOL dwarf2_parse(struct module* module, unsigned long load_offset, const unsigned char* debug, unsigned int debug_size, const unsigned char* abbrev, unsigned int abbrev_size, - const unsigned char* str, unsigned int str_sz); + const unsigned char* str, unsigned int str_size, + const unsigned char* line, unsigned int line_size); /* symbol.c */ extern const char* symt_get_name(const struct symt* sym); diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 426bf28..12d0226 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -154,7 +154,7 @@ typedef struct dwarf2_section_s unsigned size; } dwarf2_section_t; -enum dwarf2_sections {section_debug, section_string, section_abbrev, section_max}; +enum dwarf2_sections {section_debug, section_string, section_abbrev, section_line, section_max}; typedef struct dwarf2_traverse_context_s { @@ -1456,7 +1456,8 @@ static BOOL dwarf2_parse_compilation_uni BOOL dwarf2_parse(struct module* module, unsigned long load_offset, const unsigned char* debug, unsigned int debug_size, const unsigned char* abbrev, unsigned int abbrev_size, - const unsigned char* str, unsigned int str_size) + const unsigned char* str, unsigned int str_size, + const unsigned char* line, unsigned int line_size) { dwarf2_section_t section[section_max]; const unsigned char*comp_unit_cursor = debug; @@ -1468,6 +1469,8 @@ BOOL dwarf2_parse(struct module* module, section[section_abbrev].size = abbrev_size; section[section_string].address = str; section[section_string].size = str_size; + section[section_line].address = line; + section[section_line].size = line_size; while (comp_unit_cursor < end_debug) { diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index cb56e23..33e78bd 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -867,23 +867,27 @@ static BOOL elf_load_debug_info_from_map const BYTE* dw2_debug; const BYTE* dw2_debug_abbrev; const BYTE* dw2_debug_str; + const BYTE* dw2_debug_line; FIXME("Alpha-support for Dwarf2 information for %s\n", module->module.ModuleName); dw2_debug = (const BYTE*) elf_map_section(fmap, debug_sect); dw2_debug_abbrev = (const BYTE*) elf_map_section(fmap, debug_abbrev_sect); dw2_debug_str = (const BYTE*) elf_map_section(fmap, debug_str_sect); + dw2_debug_line = (const BYTE*) elf_map_section(fmap, debug_line_sect); if (dw2_debug != NO_MAP && NO_MAP != dw2_debug_abbrev && dw2_debug_str != NO_MAP) { /* OK, now just parse dwarf2 debug infos. */ ret = dwarf2_parse(module, module->elf_info->elf_addr, dw2_debug, fmap->sect[debug_sect].shdr.sh_size, dw2_debug_abbrev, fmap->sect[debug_abbrev_sect].shdr.sh_size, - dw2_debug_str, fmap->sect[debug_str_sect].shdr.sh_size); + dw2_debug_str, fmap->sect[debug_str_sect].shdr.sh_size, + dw2_debug_line, fmap->sect[debug_line_sect].shdr.sh_size); } elf_unmap_section(fmap, debug_sect); elf_unmap_section(fmap, debug_abbrev_sect); elf_unmap_section(fmap, debug_str_sect); + elf_unmap_section(fmap, debug_line_sect); if (!ret) { WARN("Couldn't correctly read stabs\n");

1 0

Eric Pouech : dbghelp: Dwarf & function blocks.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: a2b443210723f84f428206432dba08561a45bf98 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2b443210723f84f4282064… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:32:03 2006 +0200 dbghelp: Dwarf & function blocks. - properly handling function blocks - handling of variables inside of blocks (either on stack, or in a register, or relative to the frame register if any) - added dwarf2_subprogram_t structure so that we can pass around relevant information for function parsing --- dlls/dbghelp/dwarf.c | 201 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 127 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a2b443210723f84f428…

1 0

Eric Pouech : dbghelp: Dwarf & udt members.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 298198c3182bf8803d1246a80f54c3eb432cfccb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=298198c3182bf8803d1246a… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:32:06 2006 +0200 dbghelp: Dwarf & udt members. - correctly set size & offsets for regular udt members - first shot at bitfields for udt members --- dlls/dbghelp/dwarf.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 6618513..347ab3e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -61,7 +61,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_dwarf * o Debug{Start|End}Point * o CFA * - Udt - * o proper types loading (addresses, bitfield, nesting) + * o proper types loading (nesting) */ #if 0 @@ -817,6 +817,8 @@ static void dwarf2_parse_udt_member(dwar union attribute name; union attribute loc; unsigned long offset = 0; + union attribute bit_size; + union attribute bit_offset; assert(parent); @@ -830,8 +832,23 @@ static void dwarf2_parse_udt_member(dwar offset = dwarf2_compute_location(ctx, loc.block, NULL); TRACE("found offset:%lu\n", offset); } - - symt_add_udt_element(ctx->module, parent, name.string, elt_type, offset, 0); + if (!dwarf2_find_attribute(di, DW_AT_bit_size, &bit_size)) bit_size.uvalue = 0; + if (dwarf2_find_attribute(di, DW_AT_bit_offset, &bit_offset)) + { + /* FIXME: we should only do this when implementation is LSB (which is + * the case on i386 processors) + */ + union attribute nbytes; + if (!dwarf2_find_attribute(di, DW_AT_byte_size, &nbytes)) + { + DWORD64 size; + nbytes.uvalue = symt_get_info(elt_type, TI_GET_LENGTH, &size) ? (unsigned long)size : 0; + } + bit_offset.uvalue = nbytes.uvalue * 8 - bit_offset.uvalue - bit_size.uvalue; + } + else bit_offset.uvalue = 0; + symt_add_udt_element(ctx->module, parent, name.string, elt_type, + (offset << 3) + bit_offset.uvalue, bit_size.uvalue); if (di->abbrev->have_child) FIXME("Unsupported children\n"); }

1 0