November 2006 - Wine-Commits

Eric Pouech : dbghelp: Add ability to add a SymTagCustom element to a function.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: e48a46b2b5bf0bb4d02c18dce5b03dfbda14556d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48a46b2b5bf0bb4d02c18dce… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:17:59 2006 +0100 dbghelp: Add ability to add a SymTagCustom element to a function. Make use of it to store the frame information for a dwarf function (either because frame's location is a location list, or because one of the function's variables is not properly computed at parse time). --- dlls/dbghelp/dwarf.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 148 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f99c844..b8b05c4 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -624,8 +624,9 @@ reg: fop 31 return reg; } -static BOOL compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, - const struct location* frame) +static enum location_error +compute_location(dwarf2_traverse_context_t* ctx, struct location* loc, + const struct location* frame) { unsigned long stack[64]; unsigned stk; @@ -721,11 +722,11 @@ static BOOL compute_location(dwarf2_trav break; default: FIXME("Unhandled attr op: %x\n", op); - return FALSE; + return loc_err_internal; } } loc->offset = stack[stk]; - return TRUE; + return 0; } static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, @@ -757,16 +758,18 @@ static BOOL dwarf2_compute_location_attr if (xloc.u.block.size) { - dwarf2_traverse_context_t lctx; + dwarf2_traverse_context_t lctx; + enum location_error err; lctx.data = xloc.u.block.ptr; lctx.end_data = xloc.u.block.ptr + xloc.u.block.size; lctx.word_size = ctx->word_size; - if (!compute_location(&lctx, loc, frame)) + err = compute_location(&lctx, loc, frame); + if (err < 0) { loc->kind = loc_error; - loc->reg = loc_err_too_complex; + loc->reg = err; } else if (loc->kind == loc_dwarf2_block) { @@ -1201,6 +1204,7 @@ typedef struct dwarf2_subprogram_s dwarf2_parse_context_t* ctx; struct symt_compiland* compiland; struct symt_function* func; + BOOL non_computed_variable; struct location frame; } dwarf2_subprogram_t; @@ -1235,7 +1239,7 @@ static void dwarf2_parse_variable(dwarf2 { case loc_absolute: /* it's a global variable */ - /* FIXME: we don't handle it's scope yet */ + /* FIXME: we don't handle its scope yet */ if (!dwarf2_find_attribute(subpgm->ctx, di, DW_AT_external, &ext)) ext.u.uvalue = 0; symt_new_global_variable(subpgm->ctx->module, subpgm->compiland, @@ -1244,6 +1248,7 @@ static void dwarf2_parse_variable(dwarf2 0, param_type); break; default: + subpgm->non_computed_variable = TRUE; /* fall through */ case loc_register: case loc_regrel: @@ -1459,6 +1464,7 @@ static struct symt* dwarf2_parse_subprog subpgm.frame.reg = 0; subpgm.frame.offset = 0; } + subpgm.non_computed_variable = FALSE; if (di->abbrev->have_child) /** any interest to not have child ? */ { @@ -1506,6 +1512,11 @@ static struct symt* dwarf2_parse_subprog } } + if (subpgm.non_computed_variable || subpgm.frame.kind >= loc_user) + { + symt_add_function_point(ctx->module, subpgm.func, SymTagCustom, + &subpgm.frame, NULL); + } symt_normalize_function(subpgm.ctx->module, subpgm.func); return di->symt; @@ -1893,15 +1904,140 @@ static BOOL dwarf2_parse_compilation_uni return ret; } +static BOOL dwarf2_lookup_loclist(const struct module* module, const BYTE* start, + unsigned long ip, + dwarf2_traverse_context_t* lctx) +{ + DWORD beg, end; + const BYTE* ptr = start; + DWORD len; + + while (ptr < module->dwarf2_info->debug_loc.address + module->dwarf2_info->debug_loc.size) + { + beg = dwarf2_get_u4(ptr); ptr += 4; + end = dwarf2_get_u4(ptr); ptr += 4; + if (!beg && !end) break; + len = dwarf2_get_u2(ptr); ptr += 2; + + if (beg <= ip && ip < end) + { + lctx->data = ptr; + lctx->end_data = ptr + len; + lctx->word_size = 4; /* FIXME word size !!! */ + return TRUE; + } + ptr += len; + } + WARN("Couldn't find ip in location list\n"); + return FALSE; +} + +static enum location_error loc_compute_frame(const struct module* module, + const struct symt_function* func, + DWORD ip, struct location* frame) +{ + struct symt** psym = NULL; + struct location* pframe; + dwarf2_traverse_context_t lctx; + enum location_error err; + + while ((psym = vector_iter_up(&func->vchildren, psym))) + { + if ((*psym)->tag == SymTagCustom) + { + pframe = &((struct symt_function_point*)*psym)->loc; + + /* First, recompute the frame information, if needed */ + switch (pframe->kind) + { + case loc_regrel: + case loc_register: + *frame = *pframe; + break; + case loc_dwarf2_location_list: + WARN("Searching loclist for %s\n", func->hash_elt.name); + if (!dwarf2_lookup_loclist(module, + 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 (frame->kind >= loc_user) + { + WARN("Couldn't compute runtime frame location\n"); + return loc_err_too_complex; + } + break; + default: + WARN("Unsupported frame kind %d\n", pframe->kind); + return loc_err_internal; + } + return 0; + } + } + WARN("Couldn't find Custom function point, whilst location list offset is searched\n"); + return loc_err_internal; +} + static void dwarf2_location_compute(struct process* pcs, const struct module* module, const struct symt_function* func, struct location* loc) { - FIXME("Not implemented yet\n"); - loc->kind = loc_register; - loc->reg = -1; - loc->offset = 0; + struct location frame; + DWORD ip; + int err; + dwarf2_traverse_context_t lctx; + + if (!func->container || func->container->tag != SymTagCompiland) + { + WARN("We'd expect function %s's container to exist and be a compiland\n", func->hash_elt.name); + err = loc_err_internal; + } + else + { + /* 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) + { + switch (loc->kind) + { + case loc_dwarf2_location_list: + /* Then, if the variable has a location list, find it !! */ + if (dwarf2_lookup_loclist(module, + module->dwarf2_info->debug_loc.address + loc->offset, + ip, &lctx)) + goto do_compute; + err = loc_err_out_of_scope; + break; + case loc_dwarf2_block: + /* or if we have a copy of an existing block, get ready for it */ + { + unsigned* ptr = (unsigned*)loc->offset; + + lctx.data = (const BYTE*)(ptr + 1); + lctx.end_data = lctx.data + *ptr; + lctx.word_size = 4; /* FIXME !! */ + } + do_compute: + /* now get the variable */ + err = compute_location(&lctx, loc, &frame); + break; + case loc_register: + case loc_regrel: + /* nothing to do */ + break; + default: + WARN("Unsupported local kind %d\n", loc->kind); + err = loc_err_internal; + } + } + } + if (err < 0) + { + loc->kind = loc_register; + loc->reg = err; + } } BOOL dwarf2_parse(struct module* module, unsigned long load_offset,

1 0

Eric Pouech : dbghelp: Function points location is now expressed as a struct location.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 0d942b3aaac3a165e83c2b8edd4cfb2af8adfa81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d942b3aaac3a165e83c2b8ed… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:17:54 2006 +0100 dbghelp: Function points location is now expressed as a struct location. --- dlls/dbghelp/dbghelp_private.h | 5 +++-- dlls/dbghelp/dwarf.c | 6 ++++-- dlls/dbghelp/msc.c | 31 +++++++++++++++++++++---------- dlls/dbghelp/stabs.c | 7 +++++-- dlls/dbghelp/symbol.c | 6 ++++-- dlls/dbghelp/type.c | 2 +- 6 files changed, 38 insertions(+), 19 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index fbf9879..19864db 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -210,7 +210,7 @@ struct symt_function_point { struct symt symt; /* either SymTagFunctionDebugStart, SymTagFunctionDebugEnd, SymTagLabel */ struct symt_function* parent; - unsigned long offset; + struct location loc; const char* name; /* for labels */ }; @@ -532,7 +532,8 @@ extern struct symt_function_point* symt_add_function_point(struct module* module, struct symt_function* func, enum SymTagEnum point, - unsigned offset, const char* name); + const struct location* loc, + const char* name); extern BOOL symt_fill_func_line_info(struct module* module, struct symt_function* func, DWORD addr, IMAGEHLP_LINE* line); diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5583413..f99c844 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1274,15 +1274,17 @@ static void dwarf2_parse_subprogram_labe { struct attribute name; struct attribute low_pc; + struct location loc; 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, "label"); + loc.kind = loc_absolute; + loc.offset = subpgm->ctx->module->module.BaseOfImage + low_pc.u.uvalue, symt_add_function_point(subpgm->ctx->module, subpgm->func, SymTagLabel, - subpgm->ctx->module->module.BaseOfImage + low_pc.u.uvalue, - name.u.string); + &loc, name.u.string); } static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 9554d97..f336609 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1338,8 +1338,11 @@ static int codeview_snarf(const struct m codeview_get_type(sym->proc_v1.proctype, FALSE)); codeview_add_func_linenum(msc_dbg->module, curr_func, flt, sym->proc_v1.offset, sym->proc_v1.proc_len); - symt_add_function_point(msc_dbg->module, curr_func, SymTagFuncDebugStart, sym->proc_v1.debug_start, NULL); - symt_add_function_point(msc_dbg->module, curr_func, SymTagFuncDebugEnd, sym->proc_v1.debug_end, NULL); + loc.kind = loc_absolute; + loc.offset = sym->proc_v1.debug_start; + symt_add_function_point(msc_dbg->module, curr_func, SymTagFuncDebugStart, &loc, NULL); + loc.offset = sym->proc_v1.debug_end; + symt_add_function_point(msc_dbg->module, curr_func, SymTagFuncDebugEnd, &loc, NULL); break; case S_GPROC_V2: case S_LPROC_V2: @@ -1352,8 +1355,11 @@ static int codeview_snarf(const struct m codeview_get_type(sym->proc_v2.proctype, FALSE)); codeview_add_func_linenum(msc_dbg->module, curr_func, flt, sym->proc_v2.offset, sym->proc_v2.proc_len); - symt_add_function_point(msc_dbg->module, curr_func, SymTagFuncDebugStart, sym->proc_v2.debug_start, NULL); - symt_add_function_point(msc_dbg->module, curr_func, SymTagFuncDebugEnd, sym->proc_v2.debug_end, NULL); + loc.kind = loc_absolute; + loc.offset = sym->proc_v2.debug_start; + symt_add_function_point(msc_dbg->module, curr_func, SymTagFuncDebugStart, &loc, NULL); + loc.offset = sym->proc_v2.debug_end; + symt_add_function_point(msc_dbg->module, curr_func, SymTagFuncDebugEnd, &loc, NULL); break; case S_GPROC_V3: case S_LPROC_V3: @@ -1366,8 +1372,11 @@ static int codeview_snarf(const struct m codeview_get_type(sym->proc_v3.proctype, FALSE)); codeview_add_func_linenum(msc_dbg->module, curr_func, flt, sym->proc_v3.offset, sym->proc_v3.proc_len); - symt_add_function_point(msc_dbg->module, curr_func, SymTagFuncDebugStart, sym->proc_v3.debug_start, NULL); - symt_add_function_point(msc_dbg->module, curr_func, SymTagFuncDebugEnd, sym->proc_v3.debug_end, NULL); + loc.kind = loc_absolute; + loc.offset = sym->proc_v3.debug_start; + symt_add_function_point(msc_dbg->module, curr_func, SymTagFuncDebugStart, &loc, NULL); + loc.offset = sym->proc_v3.debug_end; + symt_add_function_point(msc_dbg->module, curr_func, SymTagFuncDebugEnd, &loc, NULL); break; /* * Function parameters and stack variables. @@ -1489,8 +1498,9 @@ static int codeview_snarf(const struct m case S_LABEL_V1: if (curr_func) { - symt_add_function_point(msc_dbg->module, curr_func, SymTagLabel, - codeview_get_address(msc_dbg, sym->label_v1.segment, sym->label_v1.offset) - curr_func->address, + loc.kind = loc_absolute; + loc.offset = codeview_get_address(msc_dbg, sym->label_v1.segment, sym->label_v1.offset) - curr_func->address; + symt_add_function_point(msc_dbg->module, curr_func, SymTagLabel, &loc, terminate_string(&sym->label_v1.p_name)); } else @@ -1500,9 +1510,10 @@ static int codeview_snarf(const struct m case S_LABEL_V3: if (curr_func) { + loc.kind = loc_absolute; + loc.offset = codeview_get_address(msc_dbg, sym->label_v3.segment, sym->label_v3.offset) - curr_func->address; symt_add_function_point(msc_dbg->module, curr_func, SymTagLabel, - codeview_get_address(msc_dbg, sym->label_v3.segment, sym->label_v3.offset) - curr_func->address, - sym->label_v3.name); + &loc, sym->label_v3.name); } else FIXME("No current function for label %s\n", sym->label_v3.name); diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 6f6c851..7693ff7 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1153,7 +1153,8 @@ static void stabs_finalize_function(stru unsigned long size) { IMAGEHLP_LINE il; - + struct location loc; + if (!func) return; symt_normalize_function(module, func); /* To define the debug-start of the function, we use the second line number. @@ -1162,8 +1163,10 @@ static void stabs_finalize_function(stru if (symt_fill_func_line_info(module, func, func->address, &il) && symt_get_func_line_next(module, &il)) { + loc.kind = loc_absolute; + loc.offset = il.Address - func->address; symt_add_function_point(module, func, SymTagFuncDebugStart, - il.Address - func->address, NULL); + &loc, NULL); } if (size) func->size = size; } diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 8e1cdf4..0f62889 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -376,7 +376,8 @@ struct symt_block* symt_close_func_block struct symt_function_point* symt_add_function_point(struct module* module, struct symt_function* func, enum SymTagEnum point, - unsigned offset, const char* name) + const struct location* loc, + const char* name) { struct symt_function_point* sym; struct symt** p; @@ -385,7 +386,7 @@ struct symt_function_point* symt_add_fun { sym->symt.tag = point; sym->parent = func; - sym->offset = offset; + sym->loc = *loc; sym->name = name ? pool_strdup(&module->pool, name) : NULL; p = vector_add(&func->vchildren, &module->pool); *p = &sym->symt; @@ -741,6 +742,7 @@ static BOOL symt_enum_locals_helper(stru case SymTagLabel: case SymTagFuncDebugStart: case SymTagFuncDebugEnd: + case SymTagCustom: break; default: FIXME("Unknown type: %u (%x)\n", lsym->tag, lsym->tag); diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 83db9eb..e112ce9 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -484,7 +484,7 @@ BOOL symt_get_info(const struct symt* ty case SymTagFuncDebugEnd: case SymTagLabel: X(ULONG64) = ((const struct symt_function_point*)type)->parent->address + - ((const struct symt_function_point*)type)->offset; + ((const struct symt_function_point*)type)->loc.offset; break; case SymTagThunk: X(ULONG64) = ((const struct symt_thunk*)type)->address;

1 0

Eric Pouech : dbghelp: Added infrastructure to compute variable location at runtime ( as opposed to debug info parse time).
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: d812f8b42ccd319615c9961595cf756449bd1288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d812f8b42ccd319615c996159… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:17:47 2006 +0100 dbghelp: Added infrastructure to compute variable location at runtime (as opposed to debug info parse time). Use it to send the variables depending on not known frame register at parse time. Made just a stub for the location computation function for dwarf2. --- dlls/dbghelp/dbghelp_private.h | 8 +++++- dlls/dbghelp/dwarf.c | 51 ++++++++++++++++++++++++--------------- dlls/dbghelp/symbol.c | 39 +++++++++++++++++++++--------- 3 files changed, 65 insertions(+), 33 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index d6081bd..fbf9879 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -305,6 +305,8 @@ enum module_type DMT_PDB, /* PDB file */ }; +struct process; + struct module { IMAGEHLP_MODULE64 module; @@ -317,10 +319,14 @@ struct module /* memory allocation pool */ struct pool pool; - /* symbol tables */ + /* symbols & symbol tables */ int sortlist_valid; struct symt_ht** addr_sorttab; struct hash_table ht_symbols; + void (*loc_compute)(struct process* pcs, + const struct module* module, + const struct symt_function* func, + struct location* loc); /* types */ struct hash_table ht_types; diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 2a40493..5583413 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -721,7 +721,6 @@ static BOOL compute_location(dwarf2_trav break; default: FIXME("Unhandled attr op: %x\n", op); - loc->offset = 0; return FALSE; } } @@ -764,7 +763,19 @@ static BOOL dwarf2_compute_location_attr lctx.end_data = xloc.u.block.ptr + xloc.u.block.size; lctx.word_size = ctx->word_size; - compute_location(&lctx, loc, frame); + if (!compute_location(&lctx, loc, frame)) + { + loc->kind = loc_error; + loc->reg = loc_err_too_complex; + } + else if (loc->kind == loc_dwarf2_block) + { + unsigned* ptr = pool_alloc(&ctx->module->pool, + sizeof(unsigned) + xloc.u.block.size); + *ptr = xloc.u.block.size; + memcpy(ptr + 1, xloc.u.block.ptr, xloc.u.block.size); + loc->offset = (unsigned long)ptr; + } } return TRUE; } @@ -1216,23 +1227,10 @@ static void dwarf2_parse_variable(dwarf2 { struct attribute ext; - if (loc.kind >= loc_user) - { - FIXME("Unsupported yet location list in %s on variable %s\n", - subpgm->func->hash_elt.name, name.u.string); - return; - } - - if (subpgm->frame.kind >= loc_user) - { - FIXME("Unsupported yet location list in %s on frame for var %s\n", - subpgm->func->hash_elt.name, name.u.string); - return; - } - - TRACE("found parameter %s/%ld (reg=%d) at %s\n", - name.u.string, loc.offset, loc.reg, + TRACE("found parameter %s (kind=%d, offset=%ld, reg=%d) at %s\n", + name.u.string, loc.kind, loc.offset, loc.reg, dwarf2_debug_ctx(subpgm->ctx)); + switch (loc.kind) { case loc_absolute: @@ -1245,6 +1243,8 @@ static void dwarf2_parse_variable(dwarf2 subpgm->ctx->module->module.BaseOfImage + loc.offset, 0, param_type); break; + default: + /* fall through */ case loc_register: case loc_regrel: /* either a pmt/variable relative to frame pointer or @@ -1255,8 +1255,6 @@ static void dwarf2_parse_variable(dwarf2 is_pmt ? DataIsParam : DataIsLocal, &loc, block, param_type, name.u.string); break; - default: - FIXME("Unsupported\n"); } } if (dwarf2_find_attribute(subpgm->ctx, di, DW_AT_const_value, &value)) @@ -1893,6 +1891,17 @@ static BOOL dwarf2_parse_compilation_uni return ret; } +static void dwarf2_location_compute(struct process* pcs, + const struct module* module, + const struct symt_function* func, + struct location* loc) +{ + FIXME("Not implemented yet\n"); + loc->kind = loc_register; + loc->reg = -1; + loc->offset = 0; +} + BOOL dwarf2_parse(struct module* module, unsigned long load_offset, const struct elf_thunk_area* thunks, const unsigned char* debug, unsigned int debug_size, @@ -1906,6 +1915,8 @@ BOOL dwarf2_parse(struct module* module, const unsigned char*comp_unit_cursor = debug; const unsigned char*end_debug = debug + debug_size; + module->loc_compute = dwarf2_location_compute; + section[section_debug].address = debug; section[section_debug].size = debug_size; section[section_abbrev].address = abbrev; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index c6a44c9..8e1cdf4 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -477,19 +477,34 @@ static void symt_fill_sym_info(const str case DataIsParam: sym_info->Flags |= SYMFLAG_PARAMETER; /* fall through */ - case DataIsLocal: - if (data->u.var.kind == loc_register) + case DataIsLocal: { - sym_info->Flags |= SYMFLAG_REGISTER; - sym_info->Register = data->u.var.reg; - sym_info->Address = 0; - } - else - { - sym_info->Flags |= SYMFLAG_LOCAL | SYMFLAG_REGREL; - /* FIXME: it's i386 dependent !!! */ - sym_info->Register = data->u.var.reg ? data->u.var.reg : CV_REG_EBP; - sym_info->Address = data->u.var.offset; + struct location loc = data->u.var; + + if (loc.kind >= loc_user) + pair->effective->loc_compute(pair->pcs, pair->effective, func, &loc); + + switch (loc.kind) + { + case loc_error: + /* for now we report error cases as a negative register number */ + sym_info->Flags |= SYMFLAG_LOCAL; + /* fall through */ + case loc_register: + sym_info->Flags |= SYMFLAG_REGISTER; + sym_info->Register = loc.reg; + sym_info->Address = 0; + break; + case loc_regrel: + sym_info->Flags |= SYMFLAG_LOCAL | SYMFLAG_REGREL; + /* FIXME: it's i386 dependent !!! */ + sym_info->Register = loc.reg ? loc.reg : CV_REG_EBP; + sym_info->Address = loc.offset; + break; + default: + FIXME("Shouldn't happen (kind=%d), debug reader backend is broken\n", loc.kind); + assert(0); + } } break; case DataIsGlobal:

1 0

Eric Pouech : dbghelp: Use the location info structure thoughout the code to handle the location of a data variable .
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 20fc25bc552ce8dc905b93a5bccff715e5cf0513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20fc25bc552ce8dc905b93a5b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:17:38 2006 +0100 dbghelp: Use the location info structure thoughout the code to handle the location of a data variable. --- dlls/dbghelp/dbghelp_private.h | 26 +++++++++++++------ dlls/dbghelp/dwarf.c | 3 +- dlls/dbghelp/elf_module.c | 8 +++--- dlls/dbghelp/msc.c | 26 ++++++++++++++++---- dlls/dbghelp/stabs.c | 53 +++++++++++++++++++++------------------- dlls/dbghelp/symbol.c | 17 +++++------- dlls/dbghelp/type.c | 31 ++++++++++++----------- 7 files changed, 95 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20fc25bc552ce8dc905b9…

1 0

Eric Pouech : dbghelp: Added struct location to help computing a location.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: d5c4e55d3684fb40048bc1eaadb976680a9dfcd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c4e55d3684fb40048bc1eaa… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:17:31 2006 +0100 dbghelp: Added struct location to help computing a location. Make use of it in dwarf.c to handle correctly variable location computation. Split code to handle both location with parse time computation (current code) and yet to come run-time computation --- dlls/dbghelp/dbghelp_private.h | 21 ++ dlls/dbghelp/dwarf.c | 403 ++++++++++++++++++++++------------------ 2 files changed, 246 insertions(+), 178 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5c4e55d3684fb40048bc…

1 0

Eric Pouech : dbghelp: Pass . debug_loc section info from the ELF loader to the dwarf parser.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 848f8c41c0e7917c39880081f68c599511c612b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=848f8c41c0e7917c39880081f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:17:26 2006 +0100 dbghelp: Pass .debug_loc section info from the ELF loader to the dwarf parser. --- dlls/dbghelp/dbghelp_private.h | 4 +++- dlls/dbghelp/dwarf.c | 24 +++++++++++++++++++++++- dlls/dbghelp/elf_module.c | 17 +++++++++++++---- dlls/dbghelp/module.c | 1 + 4 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 5eae51a..c2082e5 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -281,6 +281,7 @@ struct module enum module_type type : 16; unsigned short is_virtual : 1; struct elf_module_info* elf_info; + struct dwarf2_module_info_s*dwarf2_info; /* memory allocation pool */ struct pool pool; @@ -441,7 +442,8 @@ extern BOOL dwarf2_parse(struct 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* line, unsigned int line_size); + const unsigned char* line, unsigned int line_size, + const unsigned char* loclist, unsigned int loclist_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 9c08bb5..8dbe200 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -179,6 +179,12 @@ typedef struct dwarf2_parse_context_s unsigned char word_size; } dwarf2_parse_context_t; +/* stored in the dbghelp's module internal structure for later reuse */ +struct dwarf2_module_info_s +{ + dwarf2_section_t debug_loc; +}; + /* forward declarations */ static struct symt* dwarf2_parse_enumeration_type(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* entry); @@ -1846,9 +1852,11 @@ BOOL dwarf2_parse(struct module* module, 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* line, unsigned int line_size) + const unsigned char* line, unsigned int line_size, + const unsigned char* loclist, unsigned int loclist_size) { dwarf2_section_t section[section_max]; + char* ptr; const unsigned char*comp_unit_cursor = debug; const unsigned char*end_debug = debug + debug_size; @@ -1861,6 +1869,20 @@ BOOL dwarf2_parse(struct module* module, section[section_line].address = line; section[section_line].size = line_size; + if (loclist_size) + { + /* initialize the dwarf2 specific info block for this module. + * As we'll need later on the .debug_loc section content, we copy it in + * the module structure for later reuse + */ + module->dwarf2_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*module->dwarf2_info) + loclist_size); + if (!module->dwarf2_info) return FALSE; + ptr = (char*)(module->dwarf2_info + 1); + memcpy(ptr, loclist, loclist_size); + module->dwarf2_info->debug_loc.address = ptr; + module->dwarf2_info->debug_loc.size = loclist_size; + } + while (comp_unit_cursor < end_debug) { const dwarf2_comp_unit_stream_t* comp_unit_stream; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index a9a3bf3..2920ace 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -794,7 +794,8 @@ static BOOL elf_load_debug_info_from_map const char* shstrtab; int i; int symtab_sect, dynsym_sect, stab_sect, stabstr_sect; - int debug_sect, debug_str_sect, debug_abbrev_sect, debug_line_sect; + int debug_sect, debug_str_sect, debug_abbrev_sect; + int debug_line_sect, debug_loclist_sect; int debuglink_sect; struct elf_thunk_area thunks[] = { @@ -824,7 +825,8 @@ static BOOL elf_load_debug_info_from_map if (shstrtab == ELF_NO_MAP) return FALSE; symtab_sect = dynsym_sect = stab_sect = stabstr_sect = -1; - debug_sect = debug_str_sect = debug_abbrev_sect = debug_line_sect = -1; + debug_sect = debug_str_sect = debug_abbrev_sect = -1; + debug_line_sect = debug_loclist_sect = -1; debuglink_sect = -1; for (i = 0; i < fmap->elfhdr.e_shnum; i++) @@ -841,6 +843,8 @@ static BOOL elf_load_debug_info_from_map debug_abbrev_sect = i; if (strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".debug_line") == 0) debug_line_sect = i; + if (strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".debug_loc") == 0) + debug_loclist_sect = i; if (strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".gnu_debuglink") == 0) debuglink_sect = i; if ((strcmp(shstrtab + fmap->sect[i].shdr.sh_name, ".symtab") == 0) && @@ -902,6 +906,7 @@ static BOOL elf_load_debug_info_from_map const BYTE* dw2_debug_abbrev; const BYTE* dw2_debug_str; const BYTE* dw2_debug_line; + const BYTE* dw2_debug_loclist; FIXME("Alpha-support for Dwarf2 information for %s\n", module->module.ModuleName); @@ -909,14 +914,17 @@ static BOOL elf_load_debug_info_from_map 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 != ELF_NO_MAP && ELF_NO_MAP != dw2_debug_abbrev && dw2_debug_str != ELF_NO_MAP) + dw2_debug_loclist = (const BYTE*) elf_map_section(fmap, debug_loclist_sect); + if (dw2_debug != ELF_NO_MAP && dw2_debug_abbrev != ELF_NO_MAP && dw2_debug_str != ELF_NO_MAP) { /* OK, now just parse dwarf2 debug infos. */ lret = dwarf2_parse(module, module->elf_info->elf_addr, thunks, dw2_debug, elf_get_map_size(fmap, debug_sect), dw2_debug_abbrev, elf_get_map_size(fmap, debug_abbrev_sect), dw2_debug_str, elf_get_map_size(fmap, debug_str_sect), - dw2_debug_line, elf_get_map_size(fmap, debug_line_sect)); + dw2_debug_line, elf_get_map_size(fmap, debug_line_sect), + dw2_debug_loclist, elf_get_map_size(fmap, debug_loclist_sect)); + if (!lret) WARN("Couldn't correctly read stabs\n"); ret = ret || lret; @@ -925,6 +933,7 @@ static BOOL elf_load_debug_info_from_map elf_unmap_section(fmap, debug_abbrev_sect); elf_unmap_section(fmap, debug_str_sect); elf_unmap_section(fmap, debug_line_sect); + elf_unmap_section(fmap, debug_loclist_sect); } if (debuglink_sect != -1) { diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index eecf66b..25baec1 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -532,6 +532,7 @@ BOOL module_remove(struct process* pcs, hash_table_destroy(&module->ht_types); HeapFree(GetProcessHeap(), 0, (char*)module->sources); HeapFree(GetProcessHeap(), 0, module->addr_sorttab); + HeapFree(GetProcessHeap(), 0, module->dwarf2_info); pool_destroy(&module->pool); /* native dbghelp doesn't invoke registered callback(,CBA_SYMBOLS_UNLOADED,) here * so do we

1 0

Eric Pouech : dbghelp: Store compiland's address in internal structures.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 1a723f237c2b11534ceac8fa8db7b511db4a017b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a723f237c2b11534ceac8fa8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:17:21 2006 +0100 dbghelp: Store compiland's address in internal structures. --- dlls/dbghelp/coff.c | 3 ++- dlls/dbghelp/dbghelp_private.h | 4 +++- dlls/dbghelp/dwarf.c | 8 ++++++-- dlls/dbghelp/elf_module.c | 6 +++++- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/stabs.c | 2 +- dlls/dbghelp/symbol.c | 4 +++- dlls/dbghelp/type.c | 3 +++ 8 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c index a344ac9..9bdf0bf 100644 --- a/dlls/dbghelp/coff.c +++ b/dlls/dbghelp/coff.c @@ -120,7 +120,8 @@ static int coff_add_file(struct CoffFile file = coff_files->files + coff_files->nfiles; file->startaddr = 0xffffffff; file->endaddr = 0; - file->compiland = symt_new_compiland(module, source_new(module, NULL, filename)); + file->compiland = symt_new_compiland(module, 0, + source_new(module, NULL, filename)); file->linetab_offset = -1; file->linecnt = 0; file->entries = NULL; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index ee1f711..5eae51a 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -137,6 +137,7 @@ struct symt_block struct symt_compiland { struct symt symt; + unsigned long address; unsigned source; struct vector vchildren; /* global variables & functions */ }; @@ -447,7 +448,8 @@ extern const char* symt_get_name(const extern int symt_cmp_addr(const void* p1, const void* p2); extern int symt_find_nearest(struct module* module, DWORD addr); extern struct symt_compiland* - symt_new_compiland(struct module* module, unsigned src_idx); + symt_new_compiland(struct module* module, unsigned long address, + unsigned src_idx); extern struct symt_public* symt_new_public(struct module* module, struct symt_compiland* parent, diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index aa5aa89..9c08bb5 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1807,7 +1807,7 @@ static BOOL dwarf2_parse_compilation_uni { struct attribute name; dwarf2_debug_info_t** pdi = NULL; - struct attribute stmt_list; + struct attribute stmt_list, low_pc; struct attribute comp_dir; dwarf2_find_name(&ctx, di, &name, "compiland"); @@ -1816,7 +1816,11 @@ static BOOL dwarf2_parse_compilation_uni if (!dwarf2_find_attribute(&ctx, di, DW_AT_comp_dir, &comp_dir)) comp_dir.u.string = NULL; - di->symt = &symt_new_compiland(module, source_new(module, comp_dir.u.string, name.u.string))->symt; + if (!dwarf2_find_attribute(&ctx, di, DW_AT_low_pc, &low_pc)) + low_pc.u.uvalue = 0; + di->symt = &symt_new_compiland(module, + module->module.BaseOfImage + low_pc.u.uvalue, + source_new(module, comp_dir.u.string, name.u.string))->symt; if (di->abbrev->have_child) { diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 171dd5a..a9a3bf3 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -325,7 +325,11 @@ static void elf_hash_symtab(struct modul switch (ELF32_ST_TYPE(symp->st_info)) { case STT_FILE: - compiland = symname ? symt_new_compiland(module, source_new(module, NULL, symname)) : NULL; + if (symname) + compiland = symt_new_compiland(module, symp->st_value, + source_new(module, NULL, symname)); + else + compiland = NULL; continue; case STT_NOTYPE: /* we are only interested in wine markers inserted by winebuild */ diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a0b4960..de83b9e 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1465,7 +1465,7 @@ static int codeview_snarf(const struct m case S_OBJNAME_V1: TRACE("S-ObjName %s\n", terminate_string(&sym->objname_v1.p_name)); - compiland = symt_new_compiland(msc_dbg->module, + compiland = symt_new_compiland(msc_dbg->module, 0 /* FIXME */, source_new(msc_dbg->module, NULL, terminate_string(&sym->objname_v1.p_name))); break; diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index e8fec4b..f90c62a 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1451,7 +1451,7 @@ BOOL stabs_parse(struct module* module, { stabs_reset_includes(); source_idx = source_new(module, srcpath, ptr); - compiland = symt_new_compiland(module, source_idx); + compiland = symt_new_compiland(module, 0 /* FIXME */, source_idx); } else strcpy(srcpath, ptr); diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index a575ffe..a3cd0c7 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -125,7 +125,8 @@ static void compile_regex(const char* st HeapFree(GetProcessHeap(), 0, mask); } -struct symt_compiland* symt_new_compiland(struct module* module, unsigned src_idx) +struct symt_compiland* symt_new_compiland(struct module* module, + unsigned long address, unsigned src_idx) { struct symt_compiland* sym; @@ -134,6 +135,7 @@ struct symt_compiland* symt_new_compilan if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) { sym->symt.tag = SymTagCompiland; + sym->address = address; sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); } diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index da8d679..a50448b 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -490,6 +490,9 @@ BOOL symt_get_info(const struct symt* ty case SymTagThunk: X(ULONG64) = ((const struct symt_thunk*)type)->address; break; + case SymTagCompiland: + X(ULONG64) = ((const struct symt_compiland*)type)->address; + break; default: FIXME("Unsupported sym-tag %s for get-address\n", symt_get_tag_str(type->tag));

1 0

Eric Pouech : dbghelp: When looking up for a local variable (or parameter), pass the function pointer.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 4bcca691d163b42eb789126e9a8d2814bcb61cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bcca691d163b42eb789126e9… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:17:16 2006 +0100 dbghelp: When looking up for a local variable (or parameter), pass the function pointer. --- dlls/dbghelp/symbol.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 0705ff6..a575ffe 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -449,6 +449,7 @@ struct symt_thunk* symt_new_thunk(struct /* expect sym_info->MaxNameLen to be set before being called */ static void symt_fill_sym_info(const struct module_pair* pair, + const struct symt_function* func, const struct symt* sym, SYMBOL_INFO* sym_info) { const char* name; @@ -564,9 +565,9 @@ struct sym_enum }; static BOOL send_symbol(const struct sym_enum* se, struct module_pair* pair, - const struct symt* sym) + const struct symt_function* func, const struct symt* sym) { - symt_fill_sym_info(pair, sym, se->sym_info); + symt_fill_sym_info(pair, func, sym, se->sym_info); if (se->index && se->sym_info->info != se->index) return FALSE; if (se->tag && se->sym_info->Tag != se->tag) return FALSE; if (se->addr && !(se->addr >= se->sym_info->Address && se->addr < se->sym_info->Address + se->sym_info->Size)) return FALSE; @@ -589,7 +590,7 @@ static BOOL symt_enum_module(struct modu { se->sym_info->SizeOfStruct = sizeof(SYMBOL_INFO); se->sym_info->MaxNameLen = sizeof(se->buffer) - sizeof(SYMBOL_INFO); - if (send_symbol(se, pair, &sym->symt)) return TRUE; + if (send_symbol(se, pair, NULL, &sym->symt)) return TRUE; } } return FALSE; @@ -697,7 +698,7 @@ int symt_find_nearest(struct module* mod static BOOL symt_enum_locals_helper(struct module_pair* pair, regex_t* preg, const struct sym_enum* se, - struct vector* v) + struct symt_function* func, struct vector* v) { struct symt** plsym = NULL; struct symt* lsym = NULL; @@ -713,14 +714,14 @@ static BOOL symt_enum_locals_helper(stru struct symt_block* block = (struct symt_block*)lsym; if (pc < block->address || block->address + block->size <= pc) continue; - if (!symt_enum_locals_helper(pair, preg, se, &block->vchildren)) + if (!symt_enum_locals_helper(pair, preg, se, func, &block->vchildren)) return FALSE; } break; case SymTagData: if (regexec(preg, symt_get_name(lsym), 0, NULL, 0) == 0) { - if (send_symbol(se, pair, lsym)) return FALSE; + if (send_symbol(se, pair, func, lsym)) return FALSE; } break; case SymTagLabel: @@ -759,13 +760,13 @@ static BOOL symt_enum_locals(struct proc compile_regex(mask ? mask : "*", -1, &preg, dbghelp_options & SYMOPT_CASE_INSENSITIVE); - ret = symt_enum_locals_helper(&pair, &preg, se, + ret = symt_enum_locals_helper(&pair, &preg, se, (struct symt_function*)sym, &((struct symt_function*)sym)->vchildren); regfree(&preg); return ret; } - return send_symbol(se, &pair, &sym->symt); + return send_symbol(se, &pair, NULL, &sym->symt); } /****************************************************************** @@ -991,7 +992,7 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, sym = pair.effective->addr_sorttab[idx]; - symt_fill_sym_info(&pair, &sym->symt, Symbol); + symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol); *Displacement = Address - Symbol->Address; return TRUE; } @@ -1096,7 +1097,7 @@ static BOOL find_name(struct process* pc if (!strcmp(sym->hash_elt.name, name)) { - symt_fill_sym_info(&pair, &sym->symt, symbol); + symt_fill_sym_info(&pair, NULL, &sym->symt, symbol); return TRUE; } }

1 0

Eric Pouech : dbghelp: Added a process field to the modules pair structure.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 32c96adddd14494ce51d7d75410f15ea80fa0acb URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c96adddd14494ce51d7d754… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:17:10 2006 +0100 dbghelp: Added a process field to the modules pair structure. This makes the code simpler to read, a bit more efficient, and furthermore it'll be needed in future patches. --- dlls/dbghelp/dbghelp_private.h | 3 +- dlls/dbghelp/module.c | 10 +++--- dlls/dbghelp/source.c | 22 ++++++------- dlls/dbghelp/symbol.c | 66 ++++++++++++++++++++------------------- dlls/dbghelp/type.c | 15 ++++----- 5 files changed, 58 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=32c96adddd14494ce51d7…

1 0

Eric Pouech : dbghelp: Simplify code with function to get section size.
by Alexandre Julliard Nov. 27, 2006

Nov. 27, 2006

Module: wine Branch: master Commit: 04c7c203fc5725d2cac40b5df7010bfa1c68a52b URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c7c203fc5725d2cac40b5df… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Nov 24 22:17:04 2006 +0100 dbghelp: Simplify code with function to get section size. --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/dwarf.c | 4 +-- dlls/dbghelp/elf_module.c | 49 ++++++++++++++++++++++++--------------- 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 2dff1f0..3d9647c 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -367,6 +367,7 @@ extern BOOL pcs_callback(const s extern void* fetch_buffer(struct process* pcs, unsigned size); /* elf_module.c */ +#define ELF_NO_MAP ((const void*)0xffffffff) typedef BOOL (*elf_enum_modules_cb)(const char*, unsigned long addr, void* user); extern BOOL elf_enum_modules(HANDLE hProc, elf_enum_modules_cb, void*); extern BOOL elf_fetch_file_info(const char* name, DWORD* base, DWORD* size, DWORD* checksum); diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 4253413..aa5aa89 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -150,8 +150,6 @@ typedef struct dwarf2_debug_info_s struct vector children; } dwarf2_debug_info_t; -#define NO_MAP ((const void*)0xffffffff) - typedef struct dwarf2_section_s { const unsigned char* address; @@ -1597,7 +1595,7 @@ static BOOL dwarf2_parse_line_numbers(co const char** p; /* section with line numbers stripped */ - if (sections[section_line].address == NO_MAP) + if (sections[section_line].address == ELF_NO_MAP) return FALSE; traverse.data = sections[section_line].address + offset; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 86b5c7a..171dd5a 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -98,7 +98,6 @@ struct elf_info const char* module_name; /* OUT found module name (if ELF_INFO_NAME is set) */ }; -#define NO_MAP ((const void*)0xffffffff) /* structure holding information while handling an ELF image * allows one by one section mapping for memory savings */ @@ -145,13 +144,13 @@ static const char* elf_map_section(struc if (sidx < 0 || sidx >= fmap->elfhdr.e_shnum || fmap->sect[sidx].shdr.sh_type == SHT_NOBITS) - return NO_MAP; + return ELF_NO_MAP; /* align required information on page size (we assume pagesize is a power of 2) */ ofst = fmap->sect[sidx].shdr.sh_offset & ~(pgsz - 1); size = (fmap->sect[sidx].shdr.sh_offset + fmap->sect[sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1); fmap->sect[sidx].mapped = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fmap->fd, ofst); - if (fmap->sect[sidx].mapped == NO_MAP) return NO_MAP; + if (fmap->sect[sidx].mapped == ELF_NO_MAP) return ELF_NO_MAP; return fmap->sect[sidx].mapped + (fmap->sect[sidx].shdr.sh_offset & (pgsz - 1)); } @@ -162,14 +161,26 @@ static const char* elf_map_section(struc */ static void elf_unmap_section(struct elf_file_map* fmap, int sidx) { - if (sidx >= 0 && sidx < fmap->elfhdr.e_shnum && fmap->sect[sidx].mapped != NO_MAP) + if (sidx >= 0 && sidx < fmap->elfhdr.e_shnum && fmap->sect[sidx].mapped != ELF_NO_MAP) { munmap((char*)fmap->sect[sidx].mapped, fmap->sect[sidx].shdr.sh_size); - fmap->sect[sidx].mapped = NO_MAP; + fmap->sect[sidx].mapped = ELF_NO_MAP; } } /****************************************************************** + * elf_get_map_size + * + * Get the size of an ELF section + */ +static inline unsigned elf_get_map_size(struct elf_file_map* fmap, int sidx) +{ + if (sidx < 0 || sidx >= fmap->elfhdr.e_shnum) + return 0; + return fmap->sect[sidx].shdr.sh_size; +} + +/****************************************************************** * elf_map_file * * Maps an ELF file into memory (and checks it's a real ELF file) @@ -206,7 +217,7 @@ static BOOL elf_map_file(const char* fil for (i = 0; i < fmap->elfhdr.e_shnum; i++) { read(fmap->fd, &fmap->sect[i].shdr, sizeof(fmap->sect[i].shdr)); - fmap->sect[i].mapped = NO_MAP; + fmap->sect[i].mapped = ELF_NO_MAP; } /* grab size of module once loaded in memory */ @@ -287,9 +298,9 @@ static void elf_hash_symtab(struct modul symp = (const Elf32_Sym*)elf_map_section(fmap, symtab_idx); strp = elf_map_section(fmap, fmap->sect[symtab_idx].shdr.sh_link); - if (symp == NO_MAP || strp == NO_MAP) return; + if (symp == ELF_NO_MAP || strp == ELF_NO_MAP) return; - nsym = fmap->sect[symtab_idx].shdr.sh_size / sizeof(*symp); + nsym = elf_get_map_size(fmap, symtab_idx) / sizeof(*symp); for (j = 0; thunks[j].symname; j++) thunks[j].rva_start = thunks[j].rva_end = 0; @@ -806,7 +817,7 @@ static BOOL elf_load_debug_info_from_map * table. */ shstrtab = elf_map_section(fmap, fmap->elfhdr.e_shstrndx); - if (shstrtab == NO_MAP) return FALSE; + if (shstrtab == ELF_NO_MAP) return FALSE; symtab_sect = dynsym_sect = stab_sect = stabstr_sect = -1; debug_sect = debug_str_sect = debug_abbrev_sect = debug_line_sect = -1; @@ -862,12 +873,12 @@ static BOOL elf_load_debug_info_from_map stab = elf_map_section(fmap, stab_sect); stabstr = elf_map_section(fmap, stabstr_sect); - if (stab != NO_MAP && stabstr != NO_MAP) + if (stab != ELF_NO_MAP && stabstr != ELF_NO_MAP) { /* OK, now just parse all of the stabs. */ 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); + stab, elf_get_map_size(fmap, stab_sect), + stabstr, elf_get_map_size(fmap, stabstr_sect)); if (lret) /* and fill in the missing information for stabs */ elf_finish_stabs_info(module, ht_symtab); @@ -894,14 +905,14 @@ static BOOL elf_load_debug_info_from_map 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) + if (dw2_debug != ELF_NO_MAP && ELF_NO_MAP != dw2_debug_abbrev && dw2_debug_str != ELF_NO_MAP) { /* OK, now just parse dwarf2 debug infos. */ lret = dwarf2_parse(module, module->elf_info->elf_addr, thunks, - 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, dw2_debug_line != NO_MAP ? fmap->sect[debug_line_sect].shdr.sh_size : 0); + dw2_debug, elf_get_map_size(fmap, debug_sect), + dw2_debug_abbrev, elf_get_map_size(fmap, debug_abbrev_sect), + dw2_debug_str, elf_get_map_size(fmap, debug_str_sect), + dw2_debug_line, elf_get_map_size(fmap, debug_line_sect)); if (!lret) WARN("Couldn't correctly read stabs\n"); ret = ret || lret; @@ -923,7 +934,7 @@ static BOOL elf_load_debug_info_from_map * 2/ padding on 4 byte boundary * 3/ CRC of the linked ELF file */ - if (dbg_link != NO_MAP && elf_map_file(dbg_link, &fmap_link)) + if (dbg_link != ELF_NO_MAP && elf_map_file(dbg_link, &fmap_link)) { fmap_link.crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); fmap_link.with_crc = 1; @@ -1066,7 +1077,7 @@ static BOOL elf_load_file(struct process if (elf_info->flags & ELF_INFO_DEBUG_HEADER) { const char* shstrtab = elf_map_section(&fmap, fmap.elfhdr.e_shstrndx); - if (shstrtab == NO_MAP) goto leave; + if (shstrtab == ELF_NO_MAP) goto leave; for (i = 0; i < fmap.elfhdr.e_shnum; i++) { if (strcmp(shstrtab + fmap.sect[i].shdr.sh_name, ".dynamic") == 0 &&

1 0