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

Eric Pouech : dbghelp: Dwarf merge parsing of UDT.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: 3bd7d2976e3c22e6e77d45bcdf7d0e07eafb97b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3bd7d2976e3c22e6e77d45b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:31:21 2006 +0200 dbghelp: Dwarf merge parsing of UDT. Merge into a single function the struct/class/union parsing. --- dlls/dbghelp/dwarf.c | 90 +++----------------------------------------------- 1 files changed, 5 insertions(+), 85 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 6630fb3..9dc0b7e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1127,7 +1127,7 @@ static void dwarf2_parse_udt_members(str } } -static struct symt_udt* dwarf2_parse_class_type(struct module* module, dwarf2_abbrev_entry_t* entry, dwarf2_parse_context_t* ctx) +static struct symt_udt* dwarf2_parse_udt_type(struct module* module, dwarf2_abbrev_entry_t* entry, dwarf2_parse_context_t* ctx, enum UdtKind udt) { struct symt_udt* symt = NULL; const char* name = NULL; @@ -1158,87 +1158,7 @@ static struct symt_udt* dwarf2_parse_cla dwarf2_parse_attr(attr, ctx); } } - symt = symt_new_udt(module, name, size, UdtClass); - dwarf2_parse_udt_members(module, entry, ctx, symt); - - /** set correct data cursor */ - dwarf2_check_sibling(ctx, next_sibling); - - return symt; -} - -static struct symt_udt* dwarf2_parse_struct_type(struct module* module, dwarf2_abbrev_entry_t* entry, dwarf2_parse_context_t* ctx) -{ - struct symt_udt* symt = NULL; - const char* name = NULL; - unsigned size = 0; - dwarf2_abbrev_entry_attr_t* attr = NULL; - unsigned long next_sibling = 0; - - TRACE("%s, for %lu\n", dwarf2_debug_ctx(ctx), entry->entry_code); - - for (attr = entry->attrs; NULL != attr; attr = attr->next) { - switch (attr->attribute) { - case DW_AT_sibling: - next_sibling = dwarf2_parse_attr_as_ref(attr, ctx); - break; - case DW_AT_name: - name = dwarf2_parse_attr_as_string(attr, ctx); - TRACE("found name %s\n", name); - break; - case DW_AT_byte_size: - size = dwarf2_parse_attr_as_data(attr, ctx); - break; - case DW_AT_decl_file: - case DW_AT_decl_line: - dwarf2_parse_attr(attr, ctx); - break; - default: - WARN("Unhandled attr at %s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_attr(attr)); - dwarf2_parse_attr(attr, ctx); - } - } - symt = symt_new_udt(module, name, size, UdtStruct); - dwarf2_parse_udt_members(module, entry, ctx, symt); - - /** set correct data cursor */ - dwarf2_check_sibling(ctx, next_sibling); - - return symt; -} - -static struct symt_udt* dwarf2_parse_union_type(struct module* module, dwarf2_abbrev_entry_t* entry, dwarf2_parse_context_t* ctx) -{ - struct symt_udt* symt = NULL; - const char* name = NULL; - unsigned size = 0; - dwarf2_abbrev_entry_attr_t* attr = NULL; - unsigned long next_sibling = 0; - - TRACE("%s, for %lu\n", dwarf2_debug_ctx(ctx), entry->entry_code); - - for (attr = entry->attrs; NULL != attr; attr = attr->next) { - switch (attr->attribute) { - case DW_AT_sibling: - next_sibling = dwarf2_parse_attr_as_ref(attr, ctx); - break; - case DW_AT_name: - name = dwarf2_parse_attr_as_string(attr, ctx); - TRACE("found name %s\n", name); - break; - case DW_AT_byte_size: - size = dwarf2_parse_attr_as_data(attr, ctx); - break; - case DW_AT_decl_file: - case DW_AT_decl_line: - dwarf2_parse_attr(attr, ctx); - break; - default: - WARN("Unhandled attr at %s, for %s\n", dwarf2_debug_ctx(ctx), dwarf2_debug_attr(attr)); - dwarf2_parse_attr(attr, ctx); - } - } - symt = symt_new_udt(module, name, size, UdtUnion); + symt = symt_new_udt(module, name, size, udt); dwarf2_parse_udt_members(module, entry, ctx, symt); /** set correct data cursor */ @@ -1794,19 +1714,19 @@ static void dwarf2_parse_compiland_conte break; case DW_TAG_class_type: { - struct symt_udt* symt = dwarf2_parse_class_type(module, entry, ctx); + struct symt_udt* symt = dwarf2_parse_udt_type(module, entry, ctx, UdtClass); if (NULL != symt) dwarf2_add_symt_ref(module, entry_ref, &symt->symt); } break; case DW_TAG_structure_type: { - struct symt_udt* symt = dwarf2_parse_struct_type(module, entry, ctx); + struct symt_udt* symt = dwarf2_parse_udt_type(module, entry, ctx, UdtStruct); if (NULL != symt) dwarf2_add_symt_ref(module, entry_ref, &symt->symt); } break; case DW_TAG_union_type: { - struct symt_udt* symt = dwarf2_parse_union_type(module, entry, ctx); + struct symt_udt* symt = dwarf2_parse_udt_type(module, entry, ctx, UdtUnion); if (NULL != symt) dwarf2_add_symt_ref(module, entry_ref, &symt->symt); } break;

1 0

Eric Pouech : dbghelp: Dwarf & debug info entries.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: c571b8506e94fd0b590f702a4ce09a4449a8a229 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c571b8506e94fd0b590f702… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:31:17 2006 +0200 dbghelp: Dwarf & debug info entries. - now loading the debug info entries into specific structures - this will help writing new functions - this will allow handling of forward references --- dlls/dbghelp/dwarf.c | 211 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 211 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1dd0f6e..6630fb3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -113,9 +113,26 @@ typedef struct dwarf2_abbrev_entry_s dwarf2_abbrev_entry_attr_t* attrs; } dwarf2_abbrev_entry_t; +union attribute +{ + unsigned long uvalue; + long svalue; + const char* string; +}; + +typedef struct dwarf2_debug_info_s +{ + unsigned long offset; + const dwarf2_abbrev_entry_t*abbrev; + struct symt* symt; + union attribute* attributes; + struct vector children; +} dwarf2_debug_info_t; + typedef struct dwarf2_parse_context_s { struct pool pool; struct sparse_array abbrev_table; + struct sparse_array debug_info_table; const unsigned char* data_stream; const unsigned char* data; const unsigned char* start_data; @@ -191,6 +208,22 @@ static long dwarf2_leb128_as_signed(dwar return ret; } +static unsigned long dwarf2_parse_addr(dwarf2_parse_context_t* ctx) +{ + unsigned long ret; + + switch (ctx->word_size) + { + case 4: + ret = dwarf2_parse_u4(ctx); + break; + default: + FIXME("Unsupported Word Size %u\n", ctx->word_size); + ret = 0; + } + return ret; +} + static const char* dwarf2_debug_ctx(dwarf2_parse_context_t* ctx) { /*return wine_dbg_sprintf("ctx(0x%x,%u)", ctx->data - ctx->start_data, ctx->level); */ @@ -471,6 +504,116 @@ static void dwarf2_parse_attr(dwarf2_abb } } +static void dwarf2_parse_attr_into_di(dwarf2_parse_context_t* ctx, + const dwarf2_abbrev_entry_attr_t* abbrev_attr, + union attribute* attr) + +{ + TRACE("(attr:0x%lx,form:0x%lx)\n", abbrev_attr->attribute, abbrev_attr->form); + + switch (abbrev_attr->form) { + case DW_FORM_ref_addr: + case DW_FORM_addr: + attr->uvalue = dwarf2_parse_addr(ctx); + TRACE("addr<0x%lx>\n", attr->uvalue); + break; + + case DW_FORM_flag: + attr->uvalue = dwarf2_parse_byte(ctx); + TRACE("flag<0x%lx>\n", attr->uvalue); + break; + + case DW_FORM_data1: + attr->uvalue = dwarf2_parse_byte(ctx); + TRACE("data1<%lu>\n", attr->uvalue); + break; + + case DW_FORM_data2: + attr->uvalue = dwarf2_parse_u2(ctx); + TRACE("data2<%lu>\n", attr->uvalue); + break; + + case DW_FORM_data4: + attr->uvalue = dwarf2_parse_u4(ctx); + TRACE("data4<%lu>\n", attr->uvalue); + break; + + case DW_FORM_data8: + FIXME("Unhandled 64bits support\n"); + ctx->data += 8; + break; + + case DW_FORM_ref1: + attr->uvalue = ctx->offset + dwarf2_parse_byte(ctx); + TRACE("ref1<0x%lx>\n", attr->uvalue); + break; + + case DW_FORM_ref2: + attr->uvalue = ctx->offset + dwarf2_parse_u2(ctx); + TRACE("ref2<0x%lx>\n", attr->uvalue); + break; + + case DW_FORM_ref4: + attr->uvalue = ctx->offset + dwarf2_parse_u4(ctx); + TRACE("ref4<0x%lx>\n", attr->uvalue); + break; + + case DW_FORM_ref8: + FIXME("Unhandled 64 bit support\n"); + ctx->data += 8; + break; + + case DW_FORM_sdata: + attr->svalue = dwarf2_leb128_as_signed(ctx); + break; + + case DW_FORM_ref_udata: + attr->uvalue = dwarf2_leb128_as_unsigned(ctx); + break; + + case DW_FORM_udata: + attr->uvalue = dwarf2_leb128_as_unsigned(ctx); + break; + + case DW_FORM_string: + attr->string = (const char*)ctx->data; + ctx->data += strlen(attr->string) + 1; + TRACE("string<%s>\n", attr->string); + break; + + case DW_FORM_strp: + { + unsigned long offset = dwarf2_parse_u4(ctx); + attr->string = (const char*)ctx->str_section + offset; + } + TRACE("strp<%s>\n", attr->string); + break; + case DW_FORM_block: + attr->uvalue = dwarf2_leb128_as_unsigned(ctx); + ctx->data += attr->uvalue; + break; + + case DW_FORM_block1: + attr->uvalue = dwarf2_parse_byte(ctx); + ctx->data += attr->uvalue; + break; + + case DW_FORM_block2: + attr->uvalue = dwarf2_parse_u2(ctx); + ctx->data += attr->uvalue; + break; + + case DW_FORM_block4: + attr->uvalue = dwarf2_parse_u4(ctx); + ctx->data += attr->uvalue; + break; + + default: + FIXME("Unhandled attribute form %lx\n", abbrev_attr->form); + break; + } +} + static struct symt* dwarf2_find_symt_by_ref(struct module* module, unsigned long ref) { WARN("want ref<0x%lx>\n", ref); @@ -483,6 +626,69 @@ static struct symt* dwarf2_add_symt_ref( return NULL; } +/****************************************************************** + * dwarf2_read_one_debug_info + * + * Loads into memory one debug info entry, and recursively its children (if any) + */ +static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx, + dwarf2_debug_info_t** pdi) +{ + const dwarf2_abbrev_entry_t*abbrev; + unsigned long entry_code; + unsigned long offset; + dwarf2_debug_info_t* di; + dwarf2_debug_info_t* child; + dwarf2_debug_info_t** where; + dwarf2_abbrev_entry_attr_t* attr; + unsigned i; + + offset = ctx->data - ctx->data_stream; + entry_code = dwarf2_leb128_as_unsigned(ctx); + TRACE("found entry_code %lu at 0x%lx\n", entry_code, offset); + if (!entry_code) + { + *pdi = NULL; + return TRUE; + } + abbrev = dwarf2_abbrev_table_find_entry(&ctx->abbrev_table, entry_code); + if (!abbrev) + { + WARN("Cannot find abbrev entry for %lu at 0x%lx\n", entry_code, offset); + return FALSE; + } + di = sparse_array_add(&ctx->debug_info_table, offset, &ctx->pool); + if (!di) return FALSE; + di->offset = offset; + di->abbrev = abbrev; + di->symt = NULL; + + if (abbrev->num_attr) + { + di->attributes = pool_alloc(&ctx->pool, + abbrev->num_attr * sizeof(union attribute)); + for (i = 0, attr = abbrev->attrs; attr; i++, attr = attr->next) + { + dwarf2_parse_attr_into_di(ctx, attr, &di->attributes[i]); + } + } + else di->attributes = NULL; + if (abbrev->have_child) + { + vector_init(&di->children, sizeof(dwarf2_debug_info_t*), 16); + while (ctx->data < ctx->end_data) + { + if (!dwarf2_read_one_debug_info(ctx, &child)) return FALSE; + if (!child) break; + where = vector_add(&di->children, &ctx->pool); + if (!where) return FALSE; + *where = child; + } + } + *pdi = di; + return TRUE; +} + static struct symt_basic* dwarf2_parse_base_type(struct module* module, dwarf2_abbrev_entry_t* entry, dwarf2_parse_context_t* ctx) { struct symt_basic* symt = NULL; @@ -1694,6 +1900,7 @@ BOOL dwarf2_parse(struct module* module, dwarf2_parse_context_t ctx; dwarf2_parse_context_t abbrev_ctx; struct symt_compiland* compiland = NULL; + dwarf2_debug_info_t* di; comp_unit_stream = (const dwarf2_comp_unit_stream_t*) comp_unit_cursor; @@ -1730,6 +1937,10 @@ BOOL dwarf2_parse(struct module* module, abbrev_ctx.str_section = str; dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx.abbrev_table, &ctx.pool); + sparse_array_init(&ctx.debug_info_table, sizeof(dwarf2_debug_info_t), 128); + dwarf2_read_one_debug_info(&ctx, &di); + ctx.data = ctx.start_data; /* FIXME */ + while (ctx.data < ctx.end_data) { const dwarf2_abbrev_entry_t* entry = NULL; unsigned long entry_code;

1 0

Eric Pouech : dbghelp: Dwarf abbrev table is now a sparse array.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: b51cd5750f9f41f19c192a231a16f749fc77ee23 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b51cd5750f9f41f19c192a2… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:31:13 2006 +0200 dbghelp: Dwarf abbrev table is now a sparse array. - added a pool for memory allocation when parsing a compilation unit - now using the brand new sparse array for the abbrev table --- dlls/dbghelp/dwarf.c | 206 +++++++++++++++++++------------------------------- 1 files changed, 77 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b51cd5750f9f41f19c1…

1 0

Eric Pouech : dbghelp: Added another basic type for storage: the sparse array.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: ad02173d210fcf341d00543b797358f8c07cb1cc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ad02173d210fcf341d00543… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:31:10 2006 +0200 dbghelp: Added another basic type for storage: the sparse array. --- dlls/dbghelp/dbghelp_private.h | 11 +++++ dlls/dbghelp/storage.c | 85 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index ef7916e..d10b120 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -63,6 +63,17 @@ void* vector_add(struct vector* v, st void* vector_iter_up(const struct vector* v, void* elt); void* vector_iter_down(const struct vector* v, void* elt); +struct sparse_array +{ + struct vector key2index; + struct vector elements; +}; + +void sparse_array_init(struct sparse_array* sa, unsigned elt_sz, unsigned bucket_sz); +void* sparse_array_find(const struct sparse_array* sa, unsigned long idx); +void* sparse_array_add(struct sparse_array* sa, unsigned long key, struct pool* pool); +unsigned sparse_array_length(const struct sparse_array* sa); + struct hash_table_elt { const char* name; diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 77c7f2d..3aef566 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -225,6 +225,91 @@ void* vector_iter_down(const struct vect return vector_at(v, pos - 1); } +/* We construct the sparse array as two vectors (of equal size) + * The first vector (key2index) is the lookup table between the key and + * an index in the second vector (elements) + * When inserting an element, it's always appended in second vector (and + * never moved in memory later on), only the first vector is reordered + */ +struct key2index +{ + unsigned long key; + unsigned index; +}; + +void sparse_array_init(struct sparse_array* sa, unsigned elt_sz, unsigned bucket_sz) +{ + vector_init(&sa->key2index, sizeof(struct key2index), bucket_sz); + vector_init(&sa->elements, elt_sz, bucket_sz); +} + +/****************************************************************** + * spare_array_lookup + * + * Returns the first index which key is >= at passed key + */ +static struct key2index* spare_array_lookup(const struct sparse_array* sa, + unsigned long key, unsigned* idx) +{ + struct key2index* pk2i; + + /* FIXME: should use bsearch here */ + for (*idx = 0; *idx < sa->elements.num_elts; (*idx)++) + { + pk2i = vector_at(&sa->key2index, *idx); + if (pk2i && pk2i->key >= key) return pk2i; + } + return NULL; +} + +void* sparse_array_find(const struct sparse_array* sa, unsigned long key) +{ + unsigned idx; + struct key2index* pk2i; + + if ((pk2i = spare_array_lookup(sa, key, &idx)) && pk2i->key == key) + return vector_at(&sa->elements, pk2i->index); + return NULL; +} + +void* sparse_array_add(struct sparse_array* sa, unsigned long key, + struct pool* pool) +{ + unsigned idx, i; + struct key2index* pk2i; + struct key2index* to; + + pk2i = spare_array_lookup(sa, key, &idx); + if (pk2i && pk2i->key == key) + { + FIXME("re adding an existing key\n"); + return NULL; + } + to = vector_add(&sa->key2index, pool); + if (pk2i) + { + /* we need to shift vector's content... */ + /* let's do it brute force... (FIXME) */ + assert(sa->key2index.num_elts >= 2); + for (i = sa->key2index.num_elts - 1; i > idx; i--) + { + pk2i = vector_at(&sa->key2index, i - 1); + *to = *pk2i; + to = pk2i; + } + } + + to->key = key; + to->index = sa->elements.num_elts; + + return vector_add(&sa->elements, pool); +} + +unsigned sparse_array_length(const struct sparse_array* sa) +{ + return sa->elements.num_elts; +} + unsigned hash_table_hash(const char* name, unsigned num_buckets) { unsigned hash = 0;

1 0

Eric Pouech : dbghelp: Transform a few TRACEs into WARNs ( especially for unhandled stuff).
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: b319600130a213d34438c2f23f8811c8ed51c8ae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b319600130a213d34438c2f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:31:07 2006 +0200 dbghelp: Transform a few TRACEs into WARNs (especially for unhandled stuff). --- dlls/dbghelp/dwarf.c | 62 +++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b319600130a213d3443…

1 0

Eric Pouech : dbghelp: Remove the unneeded level attribute while parsing.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: 474c5cc2a5e964da8d853cb20daf628ad4d15ef4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=474c5cc2a5e964da8d853cb… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:31:03 2006 +0200 dbghelp: Remove the unneeded level attribute while parsing. --- dlls/dbghelp/dwarf.c | 18 +----------------- 1 files changed, 1 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 9b8f0dc..a7312a3 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -126,7 +126,6 @@ typedef struct dwarf2_parse_context_s { const unsigned char* str_section; unsigned long offset; unsigned char word_size; - unsigned char level; } dwarf2_parse_context_t; /* forward declarations */ @@ -198,7 +197,7 @@ static long dwarf2_leb128_as_signed(dwar static const char* dwarf2_debug_ctx(dwarf2_parse_context_t* ctx) { /*return wine_dbg_sprintf("ctx(0x%x,%u)", ctx->data - ctx->start_data, ctx->level); */ - return wine_dbg_sprintf("ctx(0x%x,%u)", ctx->data - ctx->data_stream, ctx->level); + return wine_dbg_sprintf("ctx(0x%x)", ctx->data - ctx->data_stream); } static const char* dwarf2_debug_attr(dwarf2_abbrev_entry_attr_t* attr) { @@ -735,7 +734,6 @@ static struct symt_array* dwarf2_parse_a symt = symt_new_array(module, min, max, ref_type, NULL); if (entry->have_child) { /** any interest to not have child ? */ - ++ctx->level; while (ctx->data < ctx->end_data) { dwarf2_abbrev_entry_t* entry = NULL; unsigned long entry_code; @@ -767,7 +765,6 @@ static struct symt_array* dwarf2_parse_a break; } } - --ctx->level; } /** set correct data cursor */ @@ -933,7 +930,6 @@ static void dwarf2_parse_udt_member(stru static void dwarf2_parse_udt_members(struct module* module, dwarf2_abbrev_entry_t* entry, dwarf2_parse_context_t* ctx, struct symt_udt* symt) { if (entry->have_child) { /** any interest to not have child ? */ - ++ctx->level; while (ctx->data < ctx->end_data) { dwarf2_abbrev_entry_t* entry = NULL; unsigned long entry_code; @@ -971,7 +967,6 @@ static void dwarf2_parse_udt_members(str break; } } - --ctx->level; } } @@ -1170,7 +1165,6 @@ static struct symt_enum* dwarf2_parse_en symt = symt_new_enum(module, name); if (entry->have_child) { /** any interest to not have child ? */ - ++ctx->level; while (ctx->data < ctx->end_data) { dwarf2_abbrev_entry_t* entry = NULL; unsigned long entry_code; @@ -1202,7 +1196,6 @@ static struct symt_enum* dwarf2_parse_en break; } } - --ctx->level; } /** set correct data cursor */ @@ -1347,7 +1340,6 @@ static void dwarf2_parse_inlined_subrout } if (entry->have_child) { /** any interest to not have child ? */ - ++ctx->level; while (ctx->data < ctx->end_data) { dwarf2_abbrev_entry_t* entry = NULL; unsigned long entry_code; @@ -1383,7 +1375,6 @@ static void dwarf2_parse_inlined_subrout break; } } - --ctx->level; } /** set correct data cursor */ @@ -1426,7 +1417,6 @@ static void dwarf2_parse_subprogram_bloc } if (entry->have_child) { /** any interest to not have child ? */ - ++ctx->level; while (ctx->data < ctx->end_data) { dwarf2_abbrev_entry_t* entry = NULL; unsigned long entry_code; @@ -1462,7 +1452,6 @@ static void dwarf2_parse_subprogram_bloc break; } } - --ctx->level; } /** set correct data cursor */ @@ -1476,7 +1465,6 @@ static void dwarf2_parse_subprogram_cont struct symt_function* func_type) { if (entry->have_child) { /** any interest to not have child ? */ - ++ctx->level; while (ctx->data < ctx->end_data) { dwarf2_abbrev_entry_t* entry = NULL; unsigned long entry_code; @@ -1515,7 +1503,6 @@ static void dwarf2_parse_subprogram_cont break; } } - --ctx->level; } } @@ -1613,7 +1600,6 @@ static struct symt_function* dwarf2_pars static void dwarf2_parse_compiland_content(struct module* module, const dwarf2_abbrev_entry_t* entry, dwarf2_parse_context_t* ctx, struct symt_compiland* compiland) { if (entry->have_child) { /** any interest to not have child ? */ - ++ctx->level; while (ctx->data < ctx->end_data) { dwarf2_abbrev_entry_t* entry = NULL; unsigned long entry_code; @@ -1709,7 +1695,6 @@ static void dwarf2_parse_compiland_conte break; } } - --ctx->level; } } @@ -1778,7 +1763,6 @@ BOOL dwarf2_parse(struct module* module, ctx.offset = comp_unit_cursor - debug; ctx.word_size = comp_unit.word_size; ctx.str_section = str; - ctx.level = 0; comp_unit_cursor += comp_unit.length + sizeof(unsigned); ctx.end_data = comp_unit_cursor;

1 0

Eric Pouech : dbghelp: Moved all Dwarf standard definitions into dwarf. h file.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: 57c662f4d1266c8d5791c9c5e6d01e9b69528a46 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57c662f4d1266c8d5791c9c… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:30:59 2006 +0200 dbghelp: Moved all Dwarf standard definitions into dwarf.h file. --- dlls/dbghelp/dwarf.c | 363 ----------------------------------------------- dlls/dbghelp/dwarf.h | 388 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 389 insertions(+), 362 deletions(-) create mode 100644 dlls/dbghelp/dwarf.h Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=57c662f4d1266c8d579…

1 0

Eric Pouech : dbghelp: Dwarf & typedefs.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: 00cf2da5d6d7ba5bf89bd7fd00f2f2c649c62ec4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00cf2da5d6d7ba5bf89bd7f… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:30:55 2006 +0200 dbghelp: Dwarf & typedefs. - removed lookup for name for the const modifier - hard wire dwarf-reference to our pointer types --- dlls/dbghelp/dwarf.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index b13bd09..2c20e52 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1137,9 +1137,8 @@ static struct symt_array* dwarf2_parse_a return symt; } -static struct symt_typedef* dwarf2_parse_const_type(struct module* module, dwarf2_abbrev_entry_t* entry, dwarf2_parse_context_t* ctx) +static struct symt* dwarf2_parse_const_type(struct module* module, dwarf2_abbrev_entry_t* entry, dwarf2_parse_context_t* ctx) { - struct symt_typedef* symt = NULL; struct symt* ref_type = NULL; dwarf2_abbrev_entry_attr_t* attr = NULL; unsigned long next_sibling = 0; @@ -1159,8 +1158,6 @@ static struct symt_typedef* dwarf2_parse dwarf2_parse_attr(attr, ctx); } } - FIXME("need to generate a name\n"); - symt = symt_new_typedef(module, ref_type, ""); if (entry->have_child) { FIXME("Unsupported children\n"); @@ -1169,12 +1166,12 @@ static struct symt_typedef* dwarf2_parse /** set correct data cursor */ dwarf2_check_sibling(ctx, next_sibling); - return symt; + return ref_type; } -static struct symt_typedef* dwarf2_parse_reference_type(struct module* module, dwarf2_abbrev_entry_t* entry, dwarf2_parse_context_t* ctx) +static struct symt* dwarf2_parse_reference_type(struct module* module, dwarf2_abbrev_entry_t* entry, dwarf2_parse_context_t* ctx) { - struct symt_typedef* symt = NULL; + struct symt* symt = NULL; struct symt* ref_type = NULL; dwarf2_abbrev_entry_attr_t* attr = NULL; unsigned long next_sibling = 0; @@ -1197,8 +1194,8 @@ static struct symt_typedef* dwarf2_parse dwarf2_parse_attr(attr, ctx); } } - FIXME("need to generate a name\n"); - symt = symt_new_typedef(module, ref_type, ""); + /* FIXME: for now, we hard-wire C++ references to pointers */ + symt = &symt_new_pointer(module, ref_type)->symt; if (entry->have_child) { FIXME("Unsupported children\n"); @@ -2039,14 +2036,14 @@ static void dwarf2_parse_compiland_conte break; case DW_TAG_const_type: { - struct symt_typedef* symt = dwarf2_parse_const_type(module, entry, ctx); - dwarf2_add_symt_ref(module, entry_ref, &symt->symt); + struct symt* symt = dwarf2_parse_const_type(module, entry, ctx); + dwarf2_add_symt_ref(module, entry_ref, symt); } break; case DW_TAG_reference_type: { - struct symt_typedef* symt = dwarf2_parse_reference_type(module, entry, ctx); - dwarf2_add_symt_ref(module, entry_ref, &symt->symt); + struct symt* symt = dwarf2_parse_reference_type(module, entry, ctx); + dwarf2_add_symt_ref(module, entry_ref, symt); } break; case DW_TAG_enumeration_type:

1 0

Eric Pouech : dbghelp: Dwarf & module's symtype.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: d396ec31f98836c9845d30bd039e8f75425bd9f4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d396ec31f98836c9845d30b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:30:52 2006 +0200 dbghelp: Dwarf & module's symtype. - we should set the module's symtype upon success - removed unneeded bRet variable --- dlls/dbghelp/dwarf.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 3ddefe1..b13bd09 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2115,7 +2115,6 @@ BOOL dwarf2_parse(struct module* module, { const unsigned char* comp_unit_cursor = debug; const unsigned char* end_debug = debug + debug_size; - BOOL bRet = TRUE; while (comp_unit_cursor < end_debug) { dwarf2_abbrev_table_t* abbrev_table; @@ -2203,5 +2202,7 @@ BOOL dwarf2_parse(struct module* module, } dwarf2_abbrev_table_free(abbrev_table); } - return bRet; + + module->module.SymType = SymDia; + return TRUE; }

1 0

Eric Pouech : dbghelp: Dwarf2 & AT_byte_size.
by Alexandre Julliard June 20, 2006

June 20, 2006

Module: wine Branch: refs/heads/master Commit: 24743774e8fbe08a1742442e5fc39e63e098cc7c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24743774e8fbe08a1742442… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:30:49 2006 +0200 dbghelp: Dwarf2 & AT_byte_size. - AT_byte_size can be larger than a single byte (especially for enums) - added missing enumeration type parsing --- dlls/dbghelp/dwarf.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 053f662..3ddefe1 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2,6 +2,7 @@ * File dwarf.c - read dwarf2 information from the ELF modules * * Copyright (C) 2005, Raphael Junqueira + * Copyright (C) 2006, Eric Pouech * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -489,6 +490,9 @@ typedef struct dwarf2_parse_context_s { unsigned char level; } dwarf2_parse_context_t; +/* forward declarations */ +static struct symt_enum* dwarf2_parse_enumeration_type(struct module* module, dwarf2_abbrev_entry_t* entry, dwarf2_parse_context_t* ctx); + static unsigned char dwarf2_parse_byte(dwarf2_parse_context_t* ctx) { unsigned char uvalue = *(const unsigned char*) ctx->data; @@ -908,7 +912,7 @@ static struct symt_basic* dwarf2_parse_b TRACE("found name %s\n", name); break; case DW_AT_byte_size: - size = dwarf2_parse_byte(ctx); + size = dwarf2_parse_attr_as_data(attr, ctx); break; case DW_AT_encoding: encoding = dwarf2_parse_byte(ctx); @@ -992,7 +996,7 @@ static struct symt_pointer* dwarf2_parse for (attr = entry->attrs; NULL != attr; attr = attr->next) { switch (attr->attribute) { case DW_AT_byte_size: - size = dwarf2_parse_byte(ctx); + size = dwarf2_parse_attr_as_data(attr, ctx); break; case DW_AT_type: { @@ -1314,6 +1318,12 @@ static void dwarf2_parse_udt_members(str case DW_TAG_member: dwarf2_parse_udt_member(module, entry, ctx, symt); break; + case DW_TAG_enumeration_type: + { + struct symt_enum* symt = dwarf2_parse_enumeration_type(module, entry, ctx); + dwarf2_add_symt_ref(module, entry_ref, &symt->symt); + } + break; default: { dwarf2_abbrev_entry_attr_t* attr; @@ -1349,7 +1359,7 @@ static struct symt_udt* dwarf2_parse_cla TRACE("found name %s\n", name); break; case DW_AT_byte_size: - size = dwarf2_parse_byte(ctx); + size = dwarf2_parse_attr_as_data(attr, ctx); break; case DW_AT_decl_file: case DW_AT_decl_line: @@ -1389,7 +1399,7 @@ static struct symt_udt* dwarf2_parse_str TRACE("found name %s\n", name); break; case DW_AT_byte_size: - size = dwarf2_parse_byte(ctx); + size = dwarf2_parse_attr_as_data(attr, ctx); break; case DW_AT_decl_file: case DW_AT_decl_line: @@ -1429,7 +1439,7 @@ static struct symt_udt* dwarf2_parse_uni TRACE("found name %s\n", name); break; case DW_AT_byte_size: - size = dwarf2_parse_byte(ctx); + size = dwarf2_parse_attr_as_data(attr, ctx); break; case DW_AT_decl_file: case DW_AT_decl_line:

1 0