November 2006 - Wine-Commits

Eric Pouech : winedbg: Various information printing issues.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 62f16d3cd4452a00670e77834ae927425ef8e9de URL: http://source.winehq.org/git/wine.git/?a=commit;h=62f16d3cd4452a00670e77834… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:18:42 2006 +0100 winedbg: Various information printing issues. - in backtraces, (void) functions should be listed with '()' as arguments instead of '' - factorized code for diplaying information about a local/parameter - fixed a couple of bugs here - rewrote format specifiers for print commands (do no waste space for padding data) - added support for new wine's dbghelp extension for local/parameter variables being out of scope --- programs/winedbg/debugger.h | 1 + programs/winedbg/memory.c | 26 ++++++++++--- programs/winedbg/stack.c | 32 +++------------ programs/winedbg/symbol.c | 89 ++++++++++++++++++++++++++++++------------- 4 files changed, 89 insertions(+), 59 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index fad77f3..e436956 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -370,6 +370,7 @@ extern void symbol_read_symt extern enum dbg_line_status symbol_get_function_line_status(const ADDRESS64* addr); extern BOOL symbol_get_line(const char* filename, const char* func, IMAGEHLP_LINE* ret); extern void symbol_info(const char* str); +extern void symbol_print_local(const SYMBOL_INFO* sym, ULONG base, BOOL detailed); extern int symbol_info_locals(void); extern BOOL symbol_is_local(const char* name); diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index cea30e9..42866da 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -221,7 +221,7 @@ void memory_examine(const struct dbg_lva #define DO_DUMP(_t,_l,_f) DO_DUMP2(_t,_l,_f,_v) case 'x': DO_DUMP(int, 4, " %8.8x"); - case 'd': DO_DUMP(unsigned int, 4, " %10d"); + case 'd': DO_DUMP(unsigned int, 4, " %4.4d"); case 'w': DO_DUMP(unsigned short, 8, " %04x"); case 'c': DO_DUMP2(char, 32, " %c", (_v < 0x20) ? ' ' : _v); case 'b': DO_DUMP2(char, 16, " %02x", (_v) & 0xff); @@ -482,11 +482,7 @@ void print_basic(const struct dbg_lvalue switch (format) { case 'x': - if (lvalue->addr.Mode == AddrMode1616 || - lvalue->addr.Mode == AddrModeReal) - dbg_printf("0x%04lx", res); - else - dbg_printf("0x%08lx", res); + dbg_printf("0x%lx", res); break; case 'd': @@ -620,6 +616,24 @@ BOOL memory_get_register(DWORD regno, DW { const struct dbg_internal_var* div; + /* negative register values are wine's dbghelp hacks + * see dlls/dbghelp/dbghelp_internal.h for the details + */ + switch (regno) + { + case -1: + if (buffer) snprintf(buffer, len, "<internal error>"); + return FALSE; + case -2: + if (buffer) snprintf(buffer, len, "<couldn't compute location>"); + return FALSE; + case -3: + if (buffer) snprintf(buffer, len, "<is not available>"); + return FALSE; + case -4: + if (buffer) snprintf(buffer, len, "<couldn't read memory>"); + return FALSE; + } if (dbg_curr_thread->curr_frame != 0) { if (buffer) snprintf(buffer, len, "<register not in topmost frame>"); diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 1a28dbc..527ed03 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -184,37 +184,18 @@ unsigned stack_fetch_frames(void) struct sym_enum { - char* tmp; DWORD frame; + BOOL first; }; static BOOL WINAPI sym_enum_cb(SYMBOL_INFO* sym_info, ULONG size, void* user) { struct sym_enum* se = (struct sym_enum*)user; - char tmp[32]; if (sym_info->Flags & SYMFLAG_PARAMETER) { - if (se->tmp[0]) strcat(se->tmp, ", "); - - if (sym_info->Flags & SYMFLAG_REGREL) - { - unsigned val; - DWORD addr = se->frame + sym_info->Address; - - if (!dbg_read_memory((char*)addr, &val, sizeof(val))) - snprintf(tmp, sizeof(tmp), "<*** cannot read at 0x%lx ***>", addr); - else - snprintf(tmp, sizeof(tmp), "0x%x", val); - } - else if (sym_info->Flags & SYMFLAG_REGISTER) - { - DWORD* pval; - - if (memory_get_register(sym_info->Register, &pval, tmp, sizeof(tmp))) - snprintf(tmp, sizeof(tmp), "0x%lx", *pval); - } - sprintf(se->tmp + strlen(se->tmp), "%s=%s", sym_info->Name, tmp); + if (!se->first) dbg_printf(", "); else se->first = FALSE; + symbol_print_local(sym_info, se->frame, FALSE); } return TRUE; } @@ -242,18 +223,17 @@ static void stack_print_addr_and_args(in if (SymFromAddr(dbg_curr_process->handle, ihsf.InstructionOffset, &disp64, si)) { struct sym_enum se; - char tmp[1024]; DWORD disp; dbg_printf(" %s", si->Name); if (disp64) dbg_printf("+0x%lx", (DWORD_PTR)disp64); SymSetContext(dbg_curr_process->handle, &ihsf, NULL); - se.tmp = tmp; + se.first = TRUE; se.frame = ihsf.FrameOffset; - tmp[0] = '\0'; + dbg_printf("("); SymEnumSymbols(dbg_curr_process->handle, 0, NULL, sym_enum_cb, &se); - if (tmp[0]) dbg_printf("(%s)", tmp); + dbg_printf(")"); il.SizeOfStruct = sizeof(il); if (SymGetLineFromAddr(dbg_curr_process->handle, ihsf.InstructionOffset, diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 23f59a6..d8d7cc4 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -518,46 +518,81 @@ BOOL symbol_get_line(const char* filenam return TRUE; } -static BOOL CALLBACK info_locals_cb(SYMBOL_INFO* sym, ULONG size, void* ctx) +/****************************************************************** + * symbol_print_local + * + * Overall format is: + * <name>=<value> in non detailed form + * <name>=<value> (local|pmt <where>) in detailed form + * Note <value> can be an error message in case of error + */ +void symbol_print_local(const SYMBOL_INFO* sym, ULONG base, + BOOL detailed) { - ULONG v, val; - char buf[128]; - struct dbg_type type; - - dbg_printf("\t"); - type.module = sym->ModBase; - type.id = sym->TypeIndex; - types_print_type(&type, FALSE); + struct dbg_lvalue lvalue; + BOOL valtodo = FALSE; + char buffer[64]; - buf[0] = '\0'; + dbg_printf("%s=", sym->Name); if (sym->Flags & SYMFLAG_REGISTER) { - char tmp[32]; DWORD* pval; - if (!memory_get_register(sym->Register, &pval, tmp, sizeof(tmp))) + + if (memory_get_register(sym->Register, &pval, buffer + 13, sizeof(buffer) - 13)) { - dbg_printf(" %s (register): %s\n", sym->Name, tmp); - return TRUE; + lvalue.cookie = DLV_HOST; + lvalue.addr.Mode = AddrModeFlat; + lvalue.addr.Offset = (DWORD_PTR)pval; + valtodo = TRUE; + memcpy(buffer, " in register ", 13); + } + else + { + dbg_printf(buffer + 13); + buffer[0] = '\0'; } - sprintf(buf, " in register %s", tmp); - val = *pval; } else if (sym->Flags & SYMFLAG_LOCAL) { - type.id = sym->TypeIndex; - v = (ULONG)ctx + sym->Address; + lvalue.cookie = DLV_TARGET; + lvalue.addr.Mode = AddrModeFlat; + lvalue.addr.Offset = base + sym->Address; + valtodo = TRUE; + buffer[0] = '\0'; + } + else + { + dbg_printf("<unexpected symbol flags %lx>\n", sym->Flags); + buffer[0] = '\0'; + } + + if (valtodo) + { + lvalue.type.module = sym->ModBase; + lvalue.type.id = sym->TypeIndex; + print_value(&lvalue, 'x', 1); + } - if (!dbg_read_memory((void*)v, &val, sizeof(val))) - { - dbg_printf(" %s (%s) *** cannot read at 0x%08lx\n", - sym->Name, (sym->Flags & SYMFLAG_PARAMETER) ? "parameter" : "local", - v); - return TRUE; - } + if (detailed) + { + dbg_printf(" (%s%s)", + (sym->Flags & SYMFLAG_PARAMETER) ? "parameter" : "local", buffer); } - dbg_printf(" %s = 0x%8.8lx (%s%s)\n", sym->Name, val, - (sym->Flags & SYMFLAG_PARAMETER) ? "parameter" : "local", buf); +} + +static BOOL CALLBACK info_locals_cb(SYMBOL_INFO* sym, ULONG size, void* ctx) +{ + struct dbg_type type; + + dbg_printf("\t"); + type.module = sym->ModBase; + type.id = sym->TypeIndex; + types_print_type(&type, FALSE); + + dbg_printf(" "); + symbol_print_local(sym, (ULONG)ctx, TRUE); + dbg_printf("\n"); return TRUE; }

1 0

Eric Pouech : dbghelp: Removed the alpha status FIXME for the dwarf code.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 0dd7c44669cc706fd0d3158669a1a45e977aeb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dd7c44669cc706fd0d315866… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:18:39 2006 +0100 dbghelp: Removed the alpha status FIXME for the dwarf code. --- dlls/dbghelp/elf_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 8ba2287..ae0de5f 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -908,7 +908,7 @@ static BOOL elf_load_debug_info_from_map const BYTE* dw2_debug_line; const BYTE* dw2_debug_loclist; - FIXME("Alpha-support for Dwarf2 information for %s\n", module->module.ModuleName); + TRACE("Loading 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);

1 0

Eric Pouech : dbghelp: Correctly store the addresses of blocks.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 5b61db4161adbf3f13d981b52c2612bf68c79cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b61db4161adbf3f13d981b52… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:18:35 2006 +0100 dbghelp: Correctly store the addresses of blocks. They are stored internally as offsets to the start of the function which embeds the block. --- dlls/dbghelp/dwarf.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index bf77335..bcd07c3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1354,7 +1354,8 @@ static void dwarf2_parse_inlined_subrout if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_high_pc, &high_pc)) high_pc.u.uvalue = 0; block = symt_open_func_block(subpgm->ctx->module, subpgm->func, parent_block, - low_pc.u.uvalue, high_pc.u.uvalue - low_pc.u.uvalue); + subpgm->ctx->module->module.BaseOfImage + low_pc.u.uvalue - subpgm->func->address, + high_pc.u.uvalue - low_pc.u.uvalue); if (di->abbrev->have_child) /** any interest to not have child ? */ { @@ -1406,7 +1407,8 @@ static void dwarf2_parse_subprogram_bloc high_pc.u.uvalue = 0; block = symt_open_func_block(subpgm->ctx->module, subpgm->func, parent_block, - low_pc.u.uvalue, high_pc.u.uvalue - low_pc.u.uvalue); + subpgm->ctx->module->module.BaseOfImage + low_pc.u.uvalue - subpgm->func->address, + high_pc.u.uvalue - low_pc.u.uvalue); if (di->abbrev->have_child) /** any interest to not have child ? */ {

1 0

Eric Pouech : dbghelp: Properly handle the void type in some declarations.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 31f4f1b00369a7be1431a0af7835d130836d0fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f4f1b00369a7be1431a0af7… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:18:31 2006 +0100 dbghelp: Properly handle the void type in some declarations. --- dlls/dbghelp/dwarf.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5d81d95..bf77335 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -979,7 +979,8 @@ static struct symt* dwarf2_parse_pointer TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = 0; - ref_type = dwarf2_lookup_type(ctx, di); + if (!(ref_type = dwarf2_lookup_type(ctx, di))) + ref_type = &symt_new_basic(ctx->module, btVoid, "void", 0)->symt; di->symt = &symt_new_pointer(ctx->module, ref_type)->symt; if (di->abbrev->have_child) FIXME("Unsupported children\n"); @@ -1496,7 +1497,8 @@ static struct symt* dwarf2_parse_subprog if (!dwarf2_find_attribute(ctx, di, DW_AT_declaration, &is_decl)) is_decl.u.uvalue = 0; - ret_type = dwarf2_lookup_type(ctx, di); + if (!(ret_type = dwarf2_lookup_type(ctx, di))) + ret_type = &symt_new_basic(ctx->module, btVoid, "void", 0)->symt; /* FIXME: assuming C source code */ sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C); @@ -1588,7 +1590,8 @@ static struct symt* dwarf2_parse_subrout TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - ret_type = dwarf2_lookup_type(ctx, di); + if (!(ret_type = dwarf2_lookup_type(ctx, di))) + ret_type = &symt_new_basic(ctx->module, btVoid, "void", 0)->symt; /* FIXME: assuming C source code */ sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C);

1 0

Eric Pouech : dbghelp: We can now remove the default name prefix as all the non conforming cases have been eliminated .
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: cfd9013317633241c8315fe3e54b2ac9aeb7e388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd9013317633241c8315fe3e… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:18:26 2006 +0100 dbghelp: We can now remove the default name prefix as all the non conforming cases have been eliminated. Got rid of dwarf2_find_name which is now useless. --- dlls/dbghelp/dwarf.c | 45 +++++++++++++++------------------------------ 1 files changed, 15 insertions(+), 30 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index fa543c8..5d81d95 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -583,24 +583,6 @@ static BOOL dwarf2_find_attribute(const return FALSE; } -static void dwarf2_find_name(dwarf2_parse_context_t* ctx, - const dwarf2_debug_info_t* di, - struct attribute* attr, const char* pfx) -{ - static int index; - - if (!dwarf2_find_attribute(ctx, di, DW_AT_name, attr)) - { - if (pfx) - { - char* tmp = pool_alloc(&ctx->pool, strlen(pfx) + 16); - if (tmp) sprintf(tmp, "%s_%d", pfx, index++); - attr->u.string = tmp; - } - else attr->u.string = NULL; - } -} - static void dwarf2_load_one_entry(dwarf2_parse_context_t*, dwarf2_debug_info_t*, struct symt_compiland*); @@ -944,7 +926,8 @@ static struct symt* dwarf2_parse_base_ty TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - dwarf2_find_name(ctx, di, &name, NULL); + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) + name.u.string = NULL; if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = 0; if (!dwarf2_find_attribute(ctx, di, DW_AT_encoding, &encoding)) encoding.u.uvalue = DW_ATE_void; @@ -976,7 +959,7 @@ static struct symt* dwarf2_parse_typedef TRACE("%s, for %lu\n", dwarf2_debug_ctx(ctx), di->abbrev->entry_code); - dwarf2_find_name(ctx, di, &name, NULL); + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; ref_type = dwarf2_lookup_type(ctx, di); if (name.u.string) @@ -1111,7 +1094,7 @@ static void dwarf2_parse_udt_member(dwar TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - dwarf2_find_name(ctx, di, &name, NULL); + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; elt_type = dwarf2_lookup_type(ctx, di); if (dwarf2_compute_location_attr(ctx, di, DW_AT_data_member_location, &loc, NULL)) { @@ -1160,7 +1143,7 @@ static struct symt* dwarf2_parse_udt_typ TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - dwarf2_find_name(ctx, di, &name, NULL); + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = 0; di->symt = &symt_new_udt(ctx->module, name.u.string, size.u.uvalue, udt)->symt; @@ -1208,7 +1191,7 @@ static void dwarf2_parse_enumerator(dwar TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - dwarf2_find_name(ctx, di, &name, NULL); + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; if (!dwarf2_find_attribute(ctx, di, DW_AT_const_value, &value)) value.u.svalue = 0; symt_add_enum_element(ctx->module, parent, name.u.string, value.u.svalue); @@ -1225,7 +1208,7 @@ static struct symt* dwarf2_parse_enumera TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - dwarf2_find_name(ctx, di, &name, NULL); + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = 0; di->symt = &symt_new_enum(ctx->module, name.u.string)->symt; @@ -1283,7 +1266,8 @@ static void dwarf2_parse_variable(dwarf2 is_pmt = !block && di->abbrev->tag == DW_TAG_formal_parameter; param_type = dwarf2_lookup_type(subpgm->ctx, di); - dwarf2_find_name(subpgm->ctx, di, &name, NULL); + if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_name, &name)) + name.u.string = NULL; if (dwarf2_compute_location_attr(subpgm->ctx, di, DW_AT_location, &loc, &subpgm->frame)) { @@ -1342,7 +1326,8 @@ static void dwarf2_parse_subprogram_labe TRACE("%s, for %s\n", dwarf2_debug_ctx(subpgm->ctx), dwarf2_debug_di(di)); if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_low_pc, &low_pc)) low_pc.u.uvalue = 0; - dwarf2_find_name(subpgm->ctx, di, &name, NULL); + if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_name, &name)) + name.u.string = NULL; loc.kind = loc_absolute; loc.offset = subpgm->ctx->module->module.BaseOfImage + low_pc.u.uvalue, @@ -1488,14 +1473,14 @@ static struct symt* dwarf2_parse_subprog TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); + if (!dwarf2_find_attribute(ctx, di, DW_AT_name, &name)) name.u.string = NULL; /* if it's an abstract representation of an inline function, there should be * a concrete object that we'll handle */ if (dwarf2_find_attribute(ctx, di, DW_AT_inline, &inline_flags)) { - dwarf2_find_name(ctx, di, &name, "subprogram"); TRACE("Function %s declared as inlined (%ld)... skipping\n", - name.u.string, inline_flags.u.uvalue); + name.u.string ? name.u.string : "(null)", inline_flags.u.uvalue); return NULL; } @@ -1511,7 +1496,6 @@ static struct symt* dwarf2_parse_subprog if (!dwarf2_find_attribute(ctx, di, DW_AT_declaration, &is_decl)) is_decl.u.uvalue = 0; - dwarf2_find_name(ctx, di, &name, NULL); ret_type = dwarf2_lookup_type(ctx, di); /* FIXME: assuming C source code */ @@ -1945,7 +1929,8 @@ static BOOL dwarf2_parse_compilation_uni struct attribute stmt_list, low_pc; struct attribute comp_dir; - dwarf2_find_name(&ctx, di, &name, NULL); + 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))

1 0

Eric Pouech : dbghelp: Extend support for inlined functions and handle them as generic blocks inside functions
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 305621d5cf214bc1fbefc72e0880f3474966f6c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305621d5cf214bc1fbefc72e0… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:18:20 2006 +0100 dbghelp: Extend support for inlined functions and handle them as generic blocks inside functions (except for parameters which are converted into local variables). Rewrote dwarf2_find_attribute so that it takes into account the abstract origin information when available. A+ --- dlls/dbghelp/dwarf.c | 285 ++++++++++++++++++++++++++++---------------------- 1 files changed, 162 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=305621d5cf214bc1fbefc…

1 0

Eric Pouech : dbghelp: Be a bit more strict on where we do actually expect default names to be generated
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 497b2e4ea5f1107c2f90494305f67aeb36c4c743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=497b2e4ea5f1107c2f9049430… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:18:16 2006 +0100 dbghelp: Be a bit more strict on where we do actually expect default names to be generated (removed this feature for UDTs, structures' fields, enums, typedefs, compilands) --- dlls/dbghelp/dwarf.c | 26 ++++++++++++++------------ dlls/dbghelp/type.c | 19 +++++++++++-------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index d0ea3c5..08fbe2c 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -566,9 +566,13 @@ static void dwarf2_find_name(dwarf2_pars if (!dwarf2_find_attribute(ctx, di, DW_AT_name, attr)) { - char* tmp = pool_alloc(&ctx->pool, strlen(pfx) + 16); - if (tmp) sprintf(tmp, "%s_%d", pfx, index++); - attr->u.string = tmp; + if (pfx) + { + char* tmp = pool_alloc(&ctx->pool, strlen(pfx) + 16); + if (tmp) sprintf(tmp, "%s_%d", pfx, index++); + attr->u.string = tmp; + } + else attr->u.string = NULL; } } @@ -915,7 +919,7 @@ static struct symt* dwarf2_parse_base_ty TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - dwarf2_find_name(ctx, di, &name, "base_type"); + dwarf2_find_name(ctx, di, &name, NULL); if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = 0; if (!dwarf2_find_attribute(ctx, di, DW_AT_encoding, &encoding)) encoding.u.uvalue = DW_ATE_void; @@ -947,13 +951,11 @@ static struct symt* dwarf2_parse_typedef TRACE("%s, for %lu\n", dwarf2_debug_ctx(ctx), di->abbrev->entry_code); - dwarf2_find_name(ctx, di, &name, "typedef"); + dwarf2_find_name(ctx, di, &name, NULL); ref_type = dwarf2_lookup_type(ctx, di); if (name.u.string) - { di->symt = &symt_new_typedef(ctx->module, ref_type, name.u.string)->symt; - } if (di->abbrev->have_child) FIXME("Unsupported children\n"); return di->symt; } @@ -1084,7 +1086,7 @@ static void dwarf2_parse_udt_member(dwar TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - dwarf2_find_name(ctx, di, &name, "udt_member"); + dwarf2_find_name(ctx, di, &name, NULL); elt_type = dwarf2_lookup_type(ctx, di); if (dwarf2_compute_location_attr(ctx, di, DW_AT_data_member_location, &loc, NULL)) { @@ -1132,7 +1134,7 @@ static struct symt* dwarf2_parse_udt_typ TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - dwarf2_find_name(ctx, di, &name, "udt"); + dwarf2_find_name(ctx, di, &name, NULL); if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = 0; di->symt = &symt_new_udt(ctx->module, name.u.string, size.u.uvalue, udt)->symt; @@ -1180,7 +1182,7 @@ static void dwarf2_parse_enumerator(dwar TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - dwarf2_find_name(ctx, di, &name, "enum_value"); + dwarf2_find_name(ctx, di, &name, NULL); if (!dwarf2_find_attribute(ctx, di, DW_AT_const_value, &value)) value.u.svalue = 0; symt_add_enum_element(ctx->module, parent, name.u.string, value.u.svalue); @@ -1197,7 +1199,7 @@ static struct symt* dwarf2_parse_enumera TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); - dwarf2_find_name(ctx, di, &name, "enum"); + dwarf2_find_name(ctx, di, &name, NULL); if (!dwarf2_find_attribute(ctx, di, DW_AT_byte_size, &size)) size.u.uvalue = 0; di->symt = &symt_new_enum(ctx->module, name.u.string)->symt; @@ -1904,7 +1906,7 @@ static BOOL dwarf2_parse_compilation_uni struct attribute stmt_list, low_pc; struct attribute comp_dir; - dwarf2_find_name(&ctx, di, &name, "compiland"); + dwarf2_find_name(&ctx, di, &name, NULL); /* get working directory of current compilation unit */ if (!dwarf2_find_attribute(&ctx, di, DW_AT_comp_dir, &comp_dir)) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index e112ce9..d520414 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -213,20 +213,23 @@ BOOL symt_add_udt_element(struct module* assert(udt_type->symt.tag == SymTagUDT); TRACE_(dbghelp_symt)("Adding %s to UDT %s\n", name, udt_type->hash_elt.name); - p = NULL; - while ((p = vector_iter_up(&udt_type->vchildren, p))) + if (name) { - m = (struct symt_data*)*p; - assert(m); - assert(m->symt.tag == SymTagData); - if (m->hash_elt.name[0] == name[0] && strcmp(m->hash_elt.name, name) == 0) - return TRUE; + p = NULL; + while ((p = vector_iter_up(&udt_type->vchildren, p))) + { + m = (struct symt_data*)*p; + assert(m); + assert(m->symt.tag == SymTagData); + if (strcmp(m->hash_elt.name, name) == 0) + return TRUE; + } } if ((m = pool_alloc(&module->pool, sizeof(*m))) == NULL) return FALSE; memset(m, 0, sizeof(*m)); m->symt.tag = SymTagData; - m->hash_elt.name = pool_strdup(&module->pool, name); + m->hash_elt.name = name ? pool_strdup(&module->pool, name) : ""; m->hash_elt.next = NULL; m->kind = DataIsMember;

1 0

Eric Pouech : dbghelp: Add support for a label in a subprogram block.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 96bfe9d0568fcfe797dc0fee4c4f361dcfba87a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96bfe9d0568fcfe797dc0fee4… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:18:12 2006 +0100 dbghelp: Add support for a label in a subprogram block. --- dlls/dbghelp/dwarf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4ae3562..d0ea3c5 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1423,6 +1423,9 @@ static void dwarf2_parse_subprogram_bloc * Skip it for now */ break; + case DW_TAG_label: + dwarf2_parse_subprogram_label(subpgm, child); + break; case DW_TAG_class_type: case DW_TAG_structure_type: case DW_TAG_union_type:

1 0

Eric Pouech : dbghelp: Register numbers in OP_piece don' t need to be next to each other.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 8eef2de3eb4a4d6d357360b1b2f9df4b6541f708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8eef2de3eb4a4d6d357360b1b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:18:08 2006 +0100 dbghelp: Register numbers in OP_piece don't need to be next to each other. --- dlls/dbghelp/dwarf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 93c011f..4ae3562 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -674,7 +674,7 @@ compute_location(dwarf2_traverse_context * (for example 'long long' stored in two registers) * FIXME: We should tell winedbg how to deal with it (sigh) */ - if (!piece_found || (op - DW_OP_reg0 != loc->reg + 1)) + if (!piece_found) { if (loc->reg != Wine_DW_no_register) FIXME("Only supporting one reg (%d -> %d)\n", @@ -716,7 +716,7 @@ compute_location(dwarf2_traverse_context case DW_OP_piece: { unsigned sz = dwarf2_leb128_as_unsigned(ctx); - WARN("Not handling OP_piece directly (size=%d)\n", sz); + WARN("Not handling OP_piece (size=%d)\n", sz); piece_found = TRUE; } break;

1 0

Eric Pouech : dbghelp: Add support for deref operation in location computation.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 4202a49b75846392c370674f6816897b29bb2ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4202a49b75846392c370674f6… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:18:04 2006 +0100 dbghelp: Add support for deref operation in location computation. --- dlls/dbghelp/dwarf.c | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index b8b05c4..93c011f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -626,7 +626,7 @@ reg: fop 31 static enum location_error compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, - const struct location* frame) + HANDLE hproc, const struct location* frame) { unsigned long stack[64]; unsigned stk; @@ -720,6 +720,34 @@ compute_location(dwarf2_traverse_context piece_found = TRUE; } break; + case DW_OP_deref: + if (!stk) + { + FIXME("Unexpected empty stack\n"); + return loc_err_internal; + } + if (loc->reg != Wine_DW_no_register) + { + WARN("Too complex expression for deref\n"); + return loc_err_too_complex; + } + if (hproc) + { + DWORD addr = stack[stk--]; + DWORD deref; + + if (!ReadProcessMemory(hproc, (void*)addr, &deref, sizeof(deref), NULL)) + { + WARN("Couldn't read memory at %lx\n", addr); + return loc_err_cant_read; + } + stack[++stk] = deref; + } + else + { + loc->kind = loc_dwarf2_block; + } + break; default: FIXME("Unhandled attr op: %x\n", op); return loc_err_internal; @@ -765,7 +793,7 @@ static BOOL dwarf2_compute_location_attr lctx.end_data = xloc.u.block.ptr + xloc.u.block.size; lctx.word_size = ctx->word_size; - err = compute_location(&lctx, loc, frame); + err = compute_location(&lctx, loc, NULL, frame); if (err < 0) { loc->kind = loc_error; @@ -1932,7 +1960,8 @@ static BOOL dwarf2_lookup_loclist(const return FALSE; } -static enum location_error loc_compute_frame(const struct module* module, +static enum location_error loc_compute_frame(struct process* pcs, + const struct module* module, const struct symt_function* func, DWORD ip, struct location* frame) { @@ -1960,7 +1989,7 @@ static enum location_error loc_compute_f module->dwarf2_info->debug_loc.address + pframe->offset, ip, &lctx)) return loc_err_out_of_scope; - if ((err = compute_location(&lctx, frame, NULL)) < 0) return err; + if ((err = compute_location(&lctx, frame, pcs->handle, NULL)) < 0) return err; if (frame->kind >= loc_user) { WARN("Couldn't compute runtime frame location\n"); @@ -1998,7 +2027,7 @@ static void dwarf2_location_compute(stru /* instruction pointer relative to compiland's start */ ip = pcs->ctx_frame.InstructionOffset - ((struct symt_compiland*)func->container)->address; - if ((err = loc_compute_frame(module, func, ip, &frame)) == 0) + if ((err = loc_compute_frame(pcs, module, func, ip, &frame)) == 0) { switch (loc->kind) { @@ -2021,7 +2050,7 @@ static void dwarf2_location_compute(stru } do_compute: /* now get the variable */ - err = compute_location(&lctx, loc, &frame); + err = compute_location(&lctx, loc, pcs->handle, &frame); break; case loc_register: case loc_regrel:

1 0