September 2006 - Wine-commits

Eric Pouech : winedbg: Fixed regression in gdb startup ( especially gdb proxy).
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: 588a4422b01b146ce17f875b61bb8d76107869e2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=588a4422b01b146ce17f875… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Sep 25 22:45:24 2006 +0200 winedbg: Fixed regression in gdb startup (especially gdb proxy). --- programs/winedbg/dbg.y | 2 + programs/winedbg/debugger.h | 6 +++- programs/winedbg/stack.c | 3 +- programs/winedbg/tgt_active.c | 59 +++++++++++++++-------------------------- programs/winedbg/winedbg.c | 7 +++++ 5 files changed, 35 insertions(+), 42 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index ea28b54..0c225e1 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -139,7 +139,7 @@ command: | tSYMBOLFILE pathname { symbol_read_symtable($2, 0); } | tSYMBOLFILE pathname expr_rvalue { symbol_read_symtable($2, $3); } | tWHATIS expr_lvalue { dbg_printf("type = "); types_print_type(&$2.type, FALSE); dbg_printf("\n"); } - | tATTACH tNUM { dbg_attach_debuggee($2, FALSE, TRUE); } + | tATTACH tNUM { dbg_attach_debuggee($2, FALSE); dbg_active_wait_for_first_exception(); } | tDETACH { dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); } | tMINIDUMP pathname { minidump_write($2, (dbg_curr_thread && dbg_curr_thread->in_exception) ? &dbg_curr_thread->excpt_record : NULL);} | tECHO tSTRING { dbg_printf("%s\n", $2); } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ac9d4de..fad77f3 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -205,7 +205,8 @@ struct dbg_process void* pio_data; const char* imageName; struct dbg_thread* threads; - unsigned continue_on_first_exception; + unsigned continue_on_first_exception : 1, + active_debuggee : 1; struct dbg_breakpoint bp[MAX_BREAKPOINTS]; unsigned next_bp; struct dbg_delayed_bp* delayed_bp; @@ -378,7 +379,8 @@ extern void dbg_wait_next_ex extern enum dbg_start dbg_active_attach(int argc, char* argv[]); extern enum dbg_start dbg_active_launch(int argc, char* argv[]); extern enum dbg_start dbg_active_auto(int argc, char* argv[]); -extern BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe, BOOL wfe); +extern void dbg_active_wait_for_first_exception(void); +extern BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe); /* tgt_minidump.c */ extern void minidump_write(const char*, const EXCEPTION_RECORD*); diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 14d4df5..8a6bbd6 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -364,13 +364,14 @@ static void backtrace_all(void) if (entry.th32OwnerProcessID != dbg_curr_pid) { - if (!dbg_attach_debuggee(entry.th32OwnerProcessID, FALSE, TRUE)) + if (!dbg_attach_debuggee(entry.th32OwnerProcessID, FALSE)) { dbg_printf("\nwarning: could not attach to 0x%lx\n", entry.th32OwnerProcessID); continue; } dbg_curr_pid = dbg_curr_process->pid; + dbg_active_wait_for_first_exception(); } dbg_printf("\nBacktracing for thread 0x%lx in process 0x%lx (%s):\n", diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 7636b16..af619a0 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -70,10 +70,8 @@ static unsigned dbg_handle_debug_event(D * wfe is set to TRUE if dbg_attach_debuggee should also proceed with all debug events * until the first exception is received (aka: attach to an already running process) */ -BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe, BOOL wfe) +BOOL dbg_attach_debuggee(DWORD pid, BOOL cofe) { - DEBUG_EVENT de; - if (!(dbg_curr_process = dbg_add_process(&be_process_active_io, pid, 0))) return FALSE; if (!DebugActiveProcess(pid)) @@ -86,15 +84,7 @@ BOOL dbg_attach_debuggee(DWORD pid, BOOL SetEnvironmentVariableA("DBGHELP_NOLIVE", NULL); - if (wfe) /* shall we proceed all debug events until we get an exception ? */ - { - dbg_interactiveP = FALSE; - while (dbg_curr_process && WaitForDebugEvent(&de, INFINITE)) - { - if (dbg_handle_debug_event(&de)) break; - } - if (dbg_curr_process) dbg_interactiveP = TRUE; - } + dbg_curr_process->active_debuggee = TRUE; return TRUE; } @@ -667,9 +657,19 @@ static void dbg_resume_debuggee(DWORD co dbg_printf("Cannot continue on %lu (%lu)\n", dbg_curr_tid, cont); } +static void wait_exception(void) +{ + DEBUG_EVENT de; + + while (dbg_curr_process && WaitForDebugEvent(&de, INFINITE)) + { + if (dbg_handle_debug_event(&de)) break; + } + dbg_interactiveP = TRUE; +} + void dbg_wait_next_exception(DWORD cont, int count, int mode) { - DEBUG_EVENT de; ADDRESS64 addr; char hexbuf[MAX_OFFSET_TO_STR_LEN]; @@ -680,12 +680,8 @@ void dbg_wait_next_exception(DWORD cont, } dbg_resume_debuggee(cont); - while (dbg_curr_process && WaitForDebugEvent(&de, INFINITE)) - { - if (dbg_handle_debug_event(&de)) break; - } + wait_exception(); if (!dbg_curr_process) return; - dbg_interactiveP = TRUE; memory_get_current_pc(&addr); WINE_TRACE("Entering debugger PC=%s mode=%d count=%d\n", @@ -694,18 +690,11 @@ void dbg_wait_next_exception(DWORD cont, dbg_curr_thread->exec_count); } -static void dbg_wait_for_first_exception(void) +void dbg_active_wait_for_first_exception(void) { - DEBUG_EVENT de; - - if (dbg_curr_process) - dbg_printf("WineDbg starting on pid 0x%lx\n", dbg_curr_pid); - + dbg_interactiveP = FALSE; /* wait for first exception */ - while (WaitForDebugEvent(&de, INFINITE)) - { - if (dbg_handle_debug_event(&de)) break; - } + wait_exception(); } static unsigned dbg_start_debuggee(LPSTR cmdLine) @@ -749,7 +738,7 @@ static unsigned dbg_start_debuggee(LPSTR } dbg_curr_pid = info.dwProcessId; if (!(dbg_curr_process = dbg_add_process(&be_process_active_io, dbg_curr_pid, 0))) return FALSE; - dbg_wait_for_first_exception(); + dbg_curr_process->active_debuggee = TRUE; return TRUE; } @@ -763,18 +752,13 @@ void dbg_run_debuggee(const char* args) } else { - DEBUG_EVENT de; - if (!dbg_last_cmd_line) { dbg_printf("Cannot find previously used command line.\n"); return; } dbg_start_debuggee(dbg_last_cmd_line); - while (dbg_curr_process && WaitForDebugEvent(&de, INFINITE)) - { - if (dbg_handle_debug_event(&de)) break; - } + dbg_active_wait_for_first_exception(); source_list_from_addr(NULL, 0); } } @@ -801,14 +785,14 @@ enum dbg_start dbg_active_attach(int ar /* try the form <myself> pid */ if (argc == 1 && str2int(argv[0], &pid) && pid != 0) { - if (!dbg_attach_debuggee(pid, FALSE, FALSE)) + if (!dbg_attach_debuggee(pid, FALSE)) return start_error_init; } /* try the form <myself> pid evt (Win32 JIT debugger) */ else if (argc == 2 && str2int(argv[0], &pid) && pid != 0 && str2int(argv[1], &evt) && evt != 0) { - if (!dbg_attach_debuggee(pid, TRUE, FALSE)) + if (!dbg_attach_debuggee(pid, TRUE)) { /* don't care about result */ SetEvent((HANDLE)evt); @@ -824,7 +808,6 @@ enum dbg_start dbg_active_attach(int ar else return start_error_parse; dbg_curr_pid = pid; - dbg_wait_for_first_exception(); return start_ok; } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 5810c78..d206d3b 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -287,6 +287,7 @@ struct dbg_process* dbg_add_process(cons p->imageName = NULL; p->threads = NULL; p->continue_on_first_exception = FALSE; + p->active_debuggee = FALSE; p->next_bp = 1; /* breakpoint 0 is reserved for step-over */ memset(p->bp, 0, sizeof(p->bp)); p->delayed_bp = NULL; @@ -583,6 +584,12 @@ #endif case start_error_init: return -1; } + if (dbg_curr_process) + { + dbg_printf("WineDbg starting on pid 0x%lx\n", dbg_curr_pid); + if (dbg_curr_process->active_debuggee) dbg_active_wait_for_first_exception(); + } + dbg_interactiveP = TRUE; parser_handle(hFile);

1 0

Eric Pouech : dbghelp: Added support for a couple of compiland's children.
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: 7c92e801aa7baa6c7c9499cba438fd594f5e968e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7c92e801aa7baa6c7c9499c… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Sep 25 22:41:42 2006 +0200 dbghelp: Added support for a couple of compiland's children. --- dlls/dbghelp/dwarf.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index af4bfd0..b1c8572 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -911,6 +911,22 @@ static struct symt* dwarf2_parse_const_t return ref_type; } +static struct symt* dwarf2_parse_volatile_type(dwarf2_parse_context_t* ctx, + dwarf2_debug_info_t* di) +{ + struct symt* ref_type; + + if (di->symt) return di->symt; + + TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); + + ref_type = dwarf2_lookup_type(ctx, di); + if (di->abbrev->have_child) FIXME("Unsupported children\n"); + di->symt = ref_type; + + return ref_type; +} + static struct symt* dwarf2_parse_reference_type(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di) { @@ -1177,6 +1193,7 @@ static void dwarf2_parse_variable(dwarf2 /* either a pmt/variable relative to frame pointer or * pmt/variable in a register */ + assert(subpgm->func); symt_add_func_local(subpgm->ctx->module, subpgm->func, is_pmt ? DataIsParam : DataIsLocal, dwarf2_map_register(in_reg & ~Wine_DW_register_deref), @@ -1436,6 +1453,46 @@ static struct symt* dwarf2_parse_subprog return di->symt; } +static struct symt* dwarf2_parse_subroutine_type(dwarf2_parse_context_t* ctx, + dwarf2_debug_info_t* di) +{ + struct symt* ret_type; + struct symt_function_signature* sig_type; + + if (di->symt) return di->symt; + + TRACE("%s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_di(di)); + + ret_type = dwarf2_lookup_type(ctx, di); + + /* FIXME: assuming C source code */ + sig_type = symt_new_function_signature(ctx->module, ret_type, CV_CALL_FAR_C); + + if (di->abbrev->have_child) /** any interest to not have child ? */ + { + dwarf2_debug_info_t** pchild = NULL; + dwarf2_debug_info_t* child; + + while ((pchild = vector_iter_up(&di->children, pchild))) + { + child = *pchild; + + switch (child->abbrev->tag) + { + case DW_TAG_formal_parameter: + symt_add_function_signature_parameter(ctx->module, sig_type, + dwarf2_lookup_type(ctx, child)); + break; + case DW_TAG_unspecified_parameters: + WARN("Unsupported unspecified parameters\n"); + break; + } + } + } + + return di->symt = &sig_type->symt; +} + static void dwarf2_load_one_entry(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di, struct symt_compiland* compiland) @@ -1466,6 +1523,9 @@ static void dwarf2_load_one_entry(dwarf2 case DW_TAG_const_type: dwarf2_parse_const_type(ctx, di); break; + case DW_TAG_volatile_type: + dwarf2_parse_volatile_type(ctx, di); + break; case DW_TAG_reference_type: dwarf2_parse_reference_type(ctx, di); break; @@ -1475,9 +1535,24 @@ static void dwarf2_load_one_entry(dwarf2 case DW_TAG_subprogram: dwarf2_parse_subprogram(ctx, di, compiland); break; + case DW_TAG_subroutine_type: + dwarf2_parse_subroutine_type(ctx, di); + break; + case DW_TAG_variable: + { + dwarf2_subprogram_t subpgm; + + subpgm.ctx = ctx; + subpgm.compiland = compiland; + subpgm.func = NULL; + subpgm.frame_offset = 0; + subpgm.frame_reg = 0; + dwarf2_parse_variable(&subpgm, NULL, di); + } + break; default: - WARN("Unhandled Tag type 0x%lx at %s, for %lu\n", - di->abbrev->tag, dwarf2_debug_ctx(ctx), di->abbrev->entry_code); + FIXME("Unhandled Tag type 0x%lx at %s, for %lu\n", + di->abbrev->tag, dwarf2_debug_ctx(ctx), di->abbrev->entry_code); } }

1 0

Eric Pouech : winedbg: Put back the %d format for printing integral values even for
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: e3f8799a4226d5a27ba92ada7e4012aaa6135258 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e3f8799a4226d5a27ba92ad… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Sep 25 22:45:39 2006 +0200 winedbg: Put back the %d format for printing integral values even for 64bit internal values as the default format in winebdg command imposes. --- programs/winedbg/memory.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/memory.c b/programs/winedbg/memory.c index cab1327..cea30e9 100644 --- a/programs/winedbg/memory.c +++ b/programs/winedbg/memory.c @@ -299,6 +299,20 @@ #endif return str; } +static void dbg_print_longlong(LONGLONG sv, BOOL is_signed) +{ + char tmp[24], *ptr = tmp + sizeof(tmp) - 1; + ULONGLONG uv, div; + *ptr = '\0'; + if (is_signed && sv < 0) uv = -sv; + else { uv = sv; is_signed = FALSE; } + for (div = 10; uv; div *= 10, uv /= 10) + *--ptr = '0' + (uv % 10); + if (ptr == tmp + sizeof(tmp) - 1) *--ptr = '0'; + if (is_signed) *--ptr = '-'; + dbg_printf("%s", ptr); +} + static void print_typed_basic(const struct dbg_lvalue* lvalue) { LONGLONG val_int; @@ -326,12 +340,12 @@ static void print_typed_basic(const stru case btInt: case btLong: if (!be_cpu->fetch_integer(lvalue, size, TRUE, &val_int)) return; - dbg_printf("%s", wine_dbgstr_longlong(val_int)); + dbg_print_longlong(val_int, TRUE); break; case btUInt: case btULong: if (!be_cpu->fetch_integer(lvalue, size, FALSE, &val_int)) return; - dbg_printf("%s", wine_dbgstr_longlong(val_int)); + dbg_print_longlong(val_int, FALSE); break; case btFloat: if (!be_cpu->fetch_float(lvalue, size, &val_real)) return; @@ -438,7 +452,7 @@ static void print_typed_basic(const stru count -= min(count, 256); fcp->Start += 256; } - if (!ok) dbg_printf("%s", wine_dbgstr_longlong(val_int)); + if (!ok) dbg_print_longlong(val_int, TRUE); } break; default:

1 0

Eric Pouech : dbghelp: Change the definition of an attribute so that we can pass around the form.
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: 4432a1fa91c455eae39c7eb4690e8386147452b0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4432a1fa91c455eae39c7eb… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Sep 25 22:41:10 2006 +0200 dbghelp: Change the definition of an attribute so that we can pass around the form. --- dlls/dbghelp/dwarf.c | 419 ++++++++++++++++++++++++++++---------------------- 1 files changed, 238 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4432a1fa91c455eae39…

1 0

Eric Pouech : dbghelp: Fix location computation when attribute has a constant form instead of a block form .
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: baf8dfd8c8ca4410c0e23e10bd120e9e1eb0c9f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=baf8dfd8c8ca4410c0e23e1… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Sep 25 22:41:27 2006 +0200 dbghelp: Fix location computation when attribute has a constant form instead of a block form. --- dlls/dbghelp/dwarf.c | 56 ++++++++++++++++++++++++++++---------------------- 1 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4ddc6ab..af4bfd0 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -571,24 +571,39 @@ #define Wine_DW_no_register 0x7FFFFF #define Wine_DW_frame_register 0x7FFFFFFE #define Wine_DW_register_deref 0x80000000 -static unsigned long dwarf2_compute_location(dwarf2_parse_context_t* ctx, - struct dwarf2_block* block, - int* in_register) +static BOOL dwarf2_compute_location(dwarf2_parse_context_t* ctx, + dwarf2_debug_info_t* di, + unsigned long dw, + unsigned long* offset, int* in_register) { unsigned long loc[64]; unsigned stk; + struct attribute xloc; + + if (!dwarf2_find_attribute(ctx, di, dw, &xloc)) return FALSE; if (in_register) *in_register = Wine_DW_no_register; + + switch (xloc.form) + { + case DW_FORM_data1: case DW_FORM_data2: + case DW_FORM_data4: case DW_FORM_data8: + case DW_FORM_udata: case DW_FORM_sdata: + /* we've got a constant */ + *offset = xloc.u.uvalue; + return TRUE; + } + /* assume we have a block form */ loc[stk = 0] = 0; - if (block->size) + if (xloc.u.block.size) { dwarf2_traverse_context_t lctx; unsigned char op; BOOL piece_found = FALSE; - lctx.data = block->ptr; - lctx.end_data = block->ptr + block->size; + lctx.data = xloc.u.block.ptr; + lctx.end_data = xloc.u.block.ptr + xloc.u.block.size; lctx.word_size = ctx->word_size; while (lctx.data < lctx.end_data) @@ -667,7 +682,8 @@ static unsigned long dwarf2_compute_loca } } } - return loc[stk]; + *offset = loc[stk]; + return TRUE; } static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, @@ -919,7 +935,6 @@ static void dwarf2_parse_udt_member(dwar { struct symt* elt_type; struct attribute name; - struct attribute loc; unsigned long offset = 0; struct attribute bit_size; struct attribute bit_offset; @@ -930,12 +945,8 @@ static void dwarf2_parse_udt_member(dwar dwarf2_find_name(ctx, di, &name, "udt_member"); elt_type = dwarf2_lookup_type(ctx, di); - if (dwarf2_find_attribute(ctx, di, DW_AT_data_member_location, &loc)) - { - TRACE("found member_location at %s\n", dwarf2_debug_ctx(ctx)); - offset = dwarf2_compute_location(ctx, &loc.u.block, NULL); - TRACE("found offset:%lu\n", offset); - } + if (dwarf2_compute_location(ctx, di, DW_AT_data_member_location, &offset, NULL)) + TRACE("found member_location at %s -> %lu\n", dwarf2_debug_ctx(ctx), offset); if (!dwarf2_find_attribute(ctx, di, DW_AT_bit_size, &bit_size)) bit_size.u.uvalue = 0; if (dwarf2_find_attribute(ctx, di, DW_AT_bit_offset, &bit_offset)) { @@ -1117,7 +1128,7 @@ typedef struct dwarf2_subprogram_s dwarf2_parse_context_t* ctx; struct symt_compiland* compiland; struct symt_function* func; - long frame_offset; + unsigned long frame_offset; int frame_reg; } dwarf2_subprogram_t; @@ -1131,20 +1142,19 @@ static void dwarf2_parse_variable(dwarf2 dwarf2_debug_info_t* di) { struct symt* param_type; - struct attribute name, loc, value; + struct attribute name, value; + unsigned long offset; + int in_reg; BOOL is_pmt = di->abbrev->tag == DW_TAG_formal_parameter; TRACE("%s, for %s\n", dwarf2_debug_ctx(subpgm->ctx), dwarf2_debug_di(di)); param_type = dwarf2_lookup_type(subpgm->ctx, di); dwarf2_find_name(subpgm->ctx, di, &name, "parameter"); - if (dwarf2_find_attribute(subpgm->ctx, di, DW_AT_location, &loc)) + if (dwarf2_compute_location(subpgm->ctx, di, DW_AT_location, &offset, &in_reg)) { struct attribute ext; - long offset; - int in_reg; - offset = dwarf2_compute_location(subpgm->ctx, &loc.u.block, &in_reg); TRACE("found parameter %s/%ld (reg=%d) at %s\n", name.u.string, offset, in_reg, dwarf2_debug_ctx(subpgm->ctx)); switch (in_reg & ~Wine_DW_register_deref) @@ -1331,7 +1341,6 @@ static struct symt* dwarf2_parse_subprog struct attribute high_pc; struct attribute is_decl; struct attribute inline_flags; - struct attribute frame; struct symt* ret_type; struct symt_function_signature* sig_type; dwarf2_subprogram_t subpgm; @@ -1368,11 +1377,8 @@ static struct symt* dwarf2_parse_subprog subpgm.ctx = ctx; subpgm.compiland = compiland; - if (dwarf2_find_attribute(ctx, di, DW_AT_frame_base, &frame)) - { - subpgm.frame_offset = dwarf2_compute_location(ctx, &frame.u.block, &subpgm.frame_reg); + if (dwarf2_compute_location(ctx, di, DW_AT_frame_base, &subpgm.frame_offset, &subpgm.frame_reg)) TRACE("For %s got %ld/%d\n", name.u.string, subpgm.frame_offset, subpgm.frame_reg); - } else /* on stack !! */ { subpgm.frame_reg = 0;

1 0

Eric Pouech : dbghelp: Added support for DW_OP_breg* operations in location computation.
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: fa7332fd270ff558ca3d2869bd312e77c41d455e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa7332fd270ff558ca3d286… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Sep 25 22:40:50 2006 +0200 dbghelp: Added support for DW_OP_breg* operations in location computation. --- dlls/dbghelp/dwarf.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 114f781..2e0ef76 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -547,6 +547,14 @@ static unsigned long dwarf2_compute_loca case DW_OP_reg20: case DW_OP_reg21: case DW_OP_reg22: case DW_OP_reg23: case DW_OP_reg24: case DW_OP_reg25: case DW_OP_reg26: case DW_OP_reg27: case DW_OP_reg28: case DW_OP_reg29: case DW_OP_reg30: case DW_OP_reg31: + case DW_OP_breg0: case DW_OP_breg1: case DW_OP_breg2: case DW_OP_breg3: + case DW_OP_breg4: case DW_OP_breg5: case DW_OP_breg6: case DW_OP_breg7: + case DW_OP_breg8: case DW_OP_breg9: case DW_OP_breg10: case DW_OP_breg11: + case DW_OP_breg12: case DW_OP_breg13: case DW_OP_breg14: case DW_OP_breg15: + case DW_OP_breg16: case DW_OP_breg17: case DW_OP_breg18: case DW_OP_breg19: + case DW_OP_breg20: case DW_OP_breg21: case DW_OP_breg22: case DW_OP_breg23: + case DW_OP_breg24: case DW_OP_breg25: case DW_OP_breg26: case DW_OP_breg27: + case DW_OP_breg28: case DW_OP_breg29: case DW_OP_breg30: case DW_OP_breg31: if (in_register) { /* dbghelp APIs don't know how to cope with this anyway @@ -562,6 +570,11 @@ static unsigned long dwarf2_compute_loca } } else FIXME("Found register, while not expecting it\n"); + if (op >= DW_OP_breg0 && op <= DW_OP_breg31) + { + loc[++stk] = dwarf2_leb128_as_signed(&lctx); + if (in_register) *in_register |= Wine_DW_register_deref; + } break; case DW_OP_fbreg: if (in_register)

1 0

Eric Pouech : dbghelp: Move the attribute union (now nameless) into a structure called attribute.
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: f8e06dd6135398c4be7a7cee6bd3a4c68b192ec0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8e06dd6135398c4be7a7ce… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Sep 25 22:40:58 2006 +0200 dbghelp: Move the attribute union (now nameless) into a structure called attribute. --- dlls/dbghelp/dwarf.c | 285 +++++++++++++++++++++++++------------------------- 1 files changed, 144 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f8e06dd6135398c4be7…

1 0

Eric Pouech : dbghelp: Variables & registers.
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: 6c4c64265d390c03544ba256024b8582a9bacae4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c4c64265d390c03544ba25… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Sep 25 22:40:41 2006 +0200 dbghelp: Variables & registers. - more strickling differentiation variable location between a register, and the dereferenced address defined by a register (and possibly an offset) - added a parameter to symt_add_func_local (and internal symbol data struct) to help differentiate - fix all debug parsers to confer to this new scheme --- dlls/dbghelp/dbghelp_private.h | 5 +++-- dlls/dbghelp/dwarf.c | 16 +++++++++------- dlls/dbghelp/msc.c | 14 +++++++------- dlls/dbghelp/stabs.c | 20 +++++++++++--------- dlls/dbghelp/symbol.c | 9 +++++---- 5 files changed, 35 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6c4c64265d390c03544…

1 0

Saulius Krasuckas : lz32/tests: Move indirect opening of compressed files into separate functions.
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: a7129faf193989a30ed3d724fee6222140e8e361 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a7129faf193989a30ed3d72… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Mon Sep 25 21:00:39 2006 +0300 lz32/tests: Move indirect opening of compressed files into separate functions. Also rename W-string variable to get some naming consistency. --- dlls/lz32/tests/lzexpand_main.c | 201 +++++++++++++++++++++++++++------------ 1 files changed, 138 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a7129faf193989a30ed…

1 0

Saulius Krasuckas : lz32/tests: Add more cases for opening compressed files .
by Alexandre Julliard 26 Sep '06

26 Sep '06

Module: wine Branch: master Commit: 1efb87a0e9f84e1ebbbd4f8ab7d4be954a4a552f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1efb87a0e9f84e1ebbbd4f8… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Mon Sep 25 21:02:12 2006 +0300 lz32/tests: Add more cases for opening compressed files. --- dlls/lz32/tests/lzexpand_main.c | 160 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 157 insertions(+), 3 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index fcc291c..792d304 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -33,6 +33,21 @@ static char filename_[] = "testfile.xx_" static WCHAR filenameW [] = {'t','e','s','t','f','i','l','e','.','x','x','x',0}; static WCHAR filenameW_[] = {'t','e','s','t','f','i','l','e','.','x','x','_',0}; +static char dotless [] = "dotless"; +static char dotless_[] = "dotless._"; +static WCHAR dotlessW [] = {'d','o','t','l','e','s','s', 0}; +static WCHAR dotlessW_[] = {'d','o','t','l','e','s','s','.','_', 0}; + +static char extless [] = "extless."; +static char extless_[] = "extless._"; +static WCHAR extlessW [] = {'e','x','t','l','e','s','s','.', 0}; +static WCHAR extlessW_[] = {'e','x','t','l','e','s','s','.','_', 0}; + +static char _terminated [] = "_terminated.xxxx_"; +static char _terminated_[] = "_terminated.xxxx_"; +static WCHAR _terminatedW [] = {'_','t','e','r','m','i','n','a','t','e','d','.','x','x','x','x','_', 0}; +static WCHAR _terminatedW_[] = {'_','t','e','r','m','i','n','a','t','e','d','.','x','x','x','x','_', 0}; + static char filename2[] = "testfile.yyy"; /* This is the hex string representation of the file created by compressing @@ -56,15 +71,21 @@ static const DWORD uncompressed_data_siz static char *buf; -static void full_file_path_name_in_a_CWD(const char *src, char *dst) +static void full_file_path_name_in_a_CWD(const char *src, char *dst, BOOL expect_short) { DWORD retval; + char shortname[MAX_PATH]; retval = GetCurrentDirectoryA(MAX_PATH, dst); ok(retval > 0, "GetCurrentDirectoryA returned %ld, GLE=0x%lx\n", retval, GetLastError()); lstrcatA(dst, "\\"); lstrcatA(dst, src); + if(expect_short) + { + memcpy(shortname, dst, MAX_PATH); + GetShortPathName(shortname, dst, MAX_PATH-1); + } } static void create_file(char *fname) @@ -98,15 +119,20 @@ static void test_LZOpenFileA_existing_co OFSTRUCT test; INT file; char expected[MAX_PATH]; + char short_expected[MAX_PATH]; char filled_0xA5[OFS_MAXPATHNAME]; /* Try to open existing compressed files: */ create_file(filename_); + create_file(dotless_); + create_file(extless_); + create_file(_terminated_); memset(&filled_0xA5, 0xA5, OFS_MAXPATHNAME); memset(&test, 0xA5, sizeof(test)); - full_file_path_name_in_a_CWD(filename_, expected); + full_file_path_name_in_a_CWD(filename_, expected, FALSE); + /* a, using 8.3-conformant file name. */ file = LZOpenFileA(filename, &test, OF_EXIST); /* If the file "foo.xxx" does not exist, LZOpenFileA should then check for the file "foo.xx_" and open that -- at least on some @@ -131,7 +157,80 @@ static void test_LZOpenFileA_existing_co test.szPathName, filled_0xA5); } + memset(&filled_0xA5, 0xA5, OFS_MAXPATHNAME); + memset(&test, 0xA5, sizeof(test)); + full_file_path_name_in_a_CWD(dotless_, expected, FALSE); + + /* b, using dotless file name. */ + file = LZOpenFileA(dotless, &test, OF_EXIST); + if(file != LZERROR_BADINHANDLE) { + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", + test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); + LZClose(file); + } else { /* Win9x */ + todo_wine + ok(test.cBytes == 0xA5, + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_FILE_NOT_FOUND, + "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + todo_wine + ok(strncmp(test.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", + test.szPathName, filled_0xA5); + } + + memset(&filled_0xA5, 0xA5, OFS_MAXPATHNAME); + memset(&test, 0xA5, sizeof(test)); + full_file_path_name_in_a_CWD(extless_, expected, FALSE); + + /* c, using extensionless file name. */ + file = LZOpenFileA(extless, &test, OF_EXIST); + if(file != LZERROR_BADINHANDLE) { + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", + test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); + LZClose(file); + } else { /* Win9x */ + ok(test.cBytes == 0xA5, + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_FILE_NOT_FOUND, + "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); + ok(strncmp(test.szPathName, filled_0xA5, OFS_MAXPATHNAME) == 0, + "LZOpenFileA returned '%s', but was expected to return '%s'\n", + test.szPathName, filled_0xA5); + } + + memset(&filled_0xA5, 0xA5, OFS_MAXPATHNAME); + memset(&test, 0xA5, sizeof(test)); + full_file_path_name_in_a_CWD(_terminated_, expected, FALSE); + full_file_path_name_in_a_CWD(_terminated_, short_expected, TRUE); + + /* d, using underscore-terminated file name. */ + file = LZOpenFileA(_terminated, &test, OF_EXIST); + ok(file >= 0, "LZOpenFileA failed on switching to a compressed file name\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileA set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", + test.nErrCode); + ok(lstrcmpA(test.szPathName, expected) == 0 || + lstrcmpA(test.szPathName, short_expected) == 0, /* Win9x */ + "LZOpenFileA returned '%s', but was expected to return '%s' or '%s'\n", + test.szPathName, expected, short_expected); + LZClose(file); + delete_file(filename_); + delete_file(dotless_); + delete_file(extless_); + delete_file(_terminated_); } static void test_LZOpenFileA(void) @@ -302,10 +401,14 @@ static void test_LZOpenFileW_existing_co /* Try to open existing compressed files: */ create_fileW(filenameW_); + create_fileW(dotlessW_); + create_fileW(extlessW_); + create_fileW(_terminatedW_); - full_file_path_name_in_a_CWD(filename_, expected); + full_file_path_name_in_a_CWD(filename_, expected, FALSE); memset(&test, 0xA5, sizeof(test)); + /* a, using 8.3-conformant file name. */ file = LZOpenFileW(filenameW, &test, OF_EXIST); /* If the file "foo.xxx" does not exist, LZOpenFileW should then check for the file "foo.xx_" and open that. @@ -321,7 +424,58 @@ static void test_LZOpenFileW_existing_co test.szPathName, expected); LZClose(file); + memset(&test, 0xA5, sizeof(test)); + full_file_path_name_in_a_CWD(dotless_, expected, FALSE); + + /* b, using dotless file name. */ + file = LZOpenFileW(dotlessW, &test, OF_EXIST); + ok(file >= 0, "LZOpenFileW failed on switching to a compressed file name\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileW set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileW set test.nErrCode to %d\n", + test.nErrCode); + /* Note that W-function returns A-string by a OFSTRUCT.szPathName: */ + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileW returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); + LZClose(file); + + memset(&test, 0xA5, sizeof(test)); + full_file_path_name_in_a_CWD(extless_, expected, FALSE); + + /* c, using extensionless file name. */ + file = LZOpenFileW(extlessW, &test, OF_EXIST); + ok(file >= 0, "LZOpenFileW failed on switching to a compressed file name\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileW set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileW set test.nErrCode to %d\n", + test.nErrCode); + /* Note that W-function returns A-string by a OFSTRUCT.szPathName: */ + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileW returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); + LZClose(file); + + memset(&test, 0xA5, sizeof(test)); + full_file_path_name_in_a_CWD(_terminated_, expected, FALSE); + + /* d, using underscore-terminated file name. */ + file = LZOpenFileW(_terminatedW, &test, OF_EXIST); + ok(file >= 0, "LZOpenFileW failed on switching to a compressed file name\n"); + ok(test.cBytes == sizeof(OFSTRUCT), + "LZOpenFileW set test.cBytes to %d\n", test.cBytes); + ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileW set test.nErrCode to %d\n", + test.nErrCode); + /* Note that W-function returns A-string by a OFSTRUCT.szPathName: */ + ok(lstrcmpA(test.szPathName, expected) == 0, + "LZOpenFileW returned '%s', but was expected to return '%s'\n", + test.szPathName, expected); + LZClose(file); + delete_fileW(filenameW_); + delete_fileW(dotlessW_); + delete_fileW(extlessW_); + delete_fileW(_terminatedW_); } static void test_LZOpenFileW(void)

1 0