ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dbghelp: Types parsing. 

- our engine for parsing types section now requires in entry
  an offsets table for getting directly to each type in the
  section
- (re)construct this table for PDB types
This commit is contained in:
Eric Pouech 2006-03-18 13:32:41 +01:00 committed by Alexandre Julliard
parent bbf0251c78
commit 68a0ca7418
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/dbghelp/msc.c
View File

@ -738,20 +738,19 @@ static int codeview_new_func_signature(struct module* module, unsigned typeno,
} }
static int codeview_parse_type_table(struct module* module, const BYTE* table, static int codeview_parse_type_table(struct module* module, const BYTE* table,
int len) const DWORD* offset, DWORD num)
{ {
unsigned int curr_type = 0x1000; unsigned int curr_type = 0x1000;
const BYTE* ptr = table; int retv = TRUE;
int retv;
const union codeview_type* type; const union codeview_type* type;
int value, leaf_len; int value, leaf_len;
const struct p_string* p_name; const struct p_string* p_name;
const char* c_name; const char* c_name;
while (ptr - table < len) for (curr_type = 0x1000; retv && curr_type < 0x1000 + num; curr_type++)
{ {
retv = TRUE; retv = TRUE;
type = (const union codeview_type*)ptr; type = (const union codeview_type*)(table + offset[curr_type - 0x1000]);
switch (type->generic.id) switch (type->generic.id)
{ {
@ -843,7 +842,7 @@ static int codeview_parse_type_table(struct module* module, const BYTE* table,
* the 'real' type will copy the member / enumeration data. * the 'real' type will copy the member / enumeration data.
*/ */
const unsigned char* list = type->fieldlist.list; const unsigned char* list = type->fieldlist.list;
int len = (ptr + type->generic.len + 2) - list; int len = ((const BYTE*)type + type->generic.len + 2) - list;
if (((const union codeview_fieldtype*)list)->generic.id == LF_ENUMERATE_V1 || if (((const union codeview_fieldtype*)list)->generic.id == LF_ENUMERATE_V1 ||
((const union codeview_fieldtype*)list)->generic.id == LF_ENUMERATE_V3) ((const union codeview_fieldtype*)list)->generic.id == LF_ENUMERATE_V3)
@ -943,6 +942,7 @@ static int codeview_parse_type_table(struct module* module, const BYTE* table,
type->mfunction_v2.rvtype, type->mfunction_v2.rvtype,
type->mfunction_v2.call); type->mfunction_v2.call);
break; break;
case LF_ARGLIST_V1: case LF_ARGLIST_V1:
case LF_ARGLIST_V2: case LF_ARGLIST_V2:
{ {
@ -957,12 +957,9 @@ static int codeview_parse_type_table(struct module* module, const BYTE* table,
dump(type, 2 + type->generic.len); dump(type, 2 + type->generic.len);
break; break;
} }
if (!retv) return FALSE;
curr_type++;
ptr += type->generic.len + 2;
} }
return TRUE; return retv;
} }
/*======================================================================== /*========================================================================
@ -1790,6 +1787,11 @@ static void pdb_process_types(const struct msc_debug_info* msc_dbg,
if (types_image) if (types_image)
{ {
PDB_TYPES types; PDB_TYPES types;
DWORD* offset;
DWORD num, total;
const BYTE* table;
const BYTE* ptr;
pdb_convert_types_header(&types, types_image); pdb_convert_types_header(&types, types_image);
/* Check for unknown versions */ /* Check for unknown versions */
@ -1804,9 +1806,22 @@ static void pdb_process_types(const struct msc_debug_info* msc_dbg,
ERR("-Unknown type info version %ld\n", types.version); ERR("-Unknown type info version %ld\n", types.version);
} }
/* reconstruct the types offset...
* FIXME: maybe it's present in the newest PDB_TYPES structures
*/
total = types.last_index - types.first_index + 1;
offset = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) * total);
table = ptr = types_image + types.type_offset;
num = 0;
while (ptr < table + types.type_size && num < total)
{
offset[num++] = ptr - table;
ptr += ((const union codeview_type*)ptr)->generic.len + 2;
}
/* Read type table */ /* Read type table */
codeview_parse_type_table(msc_dbg->module, types_image + types.type_offset, codeview_parse_type_table(msc_dbg->module, table, offset, num);
types.type_size); HeapFree(GetProcessHeap(), 0, offset);
pdb_free(types_image); pdb_free(types_image);
} }
} }