Skip to content

W
wine-winehq
Commit 3bc073d8 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

dbghelp/pdb: Let codeview_snarf() handle all module debug information.

Except old linetab v1. Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 54ec50d8
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 24 deletions
dlls/dbghelp/msc.c
View file @ 3bc073d8
...@@ -90,6 +90,15 @@ struct pdb_module_info ...@@ -90,6 +90,15 @@ struct pdb_module_info
#define loc_cv_local_range (loc_user + 0) /* loc.offset contain the copy of all defrange* Codeview records following S_LOCAL */ #define loc_cv_local_range (loc_user + 0) /* loc.offset contain the copy of all defrange* Codeview records following S_LOCAL */
struct cv_module_snarf
{
const struct codeview_type_parse* ipi_ctp;
const struct CV_DebugSSubsectionHeader_t* dbgsubsect;
unsigned dbgsubsect_size;
const char* strimage;
unsigned strsize;
};
/*======================================================================== /*========================================================================
* Debug file access helper routines * Debug file access helper routines
*/ */
...@@ -1468,11 +1477,11 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B ...@@ -1468,11 +1477,11 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B
} }
} }
static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const BYTE* linetab, DWORD size, static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const struct cv_module_snarf* cvmod)
const char* strimage, DWORD strsize)
{ {
unsigned i; unsigned i;
DWORD_PTR addr; DWORD_PTR addr;
const void* hdr_last = (const char*)cvmod->dbgsubsect + cvmod->dbgsubsect_size;
const struct CV_DebugSSubsectionHeader_t* hdr; const struct CV_DebugSSubsectionHeader_t* hdr;
const struct CV_DebugSSubsectionHeader_t* hdr_next; const struct CV_DebugSSubsectionHeader_t* hdr_next;
const struct CV_DebugSSubsectionHeader_t* hdr_files = NULL; const struct CV_DebugSSubsectionHeader_t* hdr_files = NULL;
...@@ -1484,15 +1493,13 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const ...@@ -1484,15 +1493,13 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const
struct symt_function* func; struct symt_function* func;
/* locate DEBUG_S_FILECHKSMS (if any) */ /* locate DEBUG_S_FILECHKSMS (if any) */
hdr = (const struct CV_DebugSSubsectionHeader_t*)linetab; for (hdr = cvmod->dbgsubsect; CV_IS_INSIDE(hdr, hdr_last); hdr = CV_RECORD_GAP(hdr, hdr->cbLen))
while (CV_IS_INSIDE(hdr, linetab + size))
{ {
if (hdr->type == DEBUG_S_FILECHKSMS) if (hdr->type == DEBUG_S_FILECHKSMS)
{ {
hdr_files = hdr; hdr_files = hdr;
break; break;
} }
hdr = CV_RECORD_GAP(hdr, hdr->cbLen);
} }
if (!hdr_files) if (!hdr_files)
{ {
...@@ -1500,8 +1507,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const ...@@ -1500,8 +1507,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const
return; return;
} }
hdr = (const struct CV_DebugSSubsectionHeader_t*)linetab; for (hdr = cvmod->dbgsubsect; CV_IS_INSIDE(hdr, hdr_last); hdr = hdr_next)
while (CV_IS_INSIDE(hdr, linetab + size))
{ {
hdr_next = CV_RECORD_GAP(hdr, hdr->cbLen); hdr_next = CV_RECORD_GAP(hdr, hdr->cbLen);
if (!(hdr->type & DEBUG_S_IGNORE)) if (!(hdr->type & DEBUG_S_IGNORE))
...@@ -1524,7 +1530,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const ...@@ -1524,7 +1530,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const
break; break;
} }
source = source_new(msc_dbg->module, NULL, source = source_new(msc_dbg->module, NULL,
(chksms->strOffset < strsize) ? strimage + chksms->strOffset : "<<stroutofbounds>>"); (chksms->strOffset < cvmod->strsize) ? cvmod->strimage + chksms->strOffset : "<<stroutofbounds>>");
func = (struct symt_function*)symt_find_nearest(msc_dbg->module, addr); func = (struct symt_function*)symt_find_nearest(msc_dbg->module, addr);
/* FIXME: at least labels support line numbers */ /* FIXME: at least labels support line numbers */
if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite))
...@@ -1756,8 +1762,10 @@ static unsigned codeview_transform_defrange(const struct msc_debug_info* msc_dbg ...@@ -1756,8 +1762,10 @@ static unsigned codeview_transform_defrange(const struct msc_debug_info* msc_dbg
return len; return len;
} }
static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* root, static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg,
int offset, int size, BOOL do_globals) const BYTE* root, unsigned offset, unsigned size,
const struct cv_module_snarf* cvmod,
BOOL do_globals)
{ {
struct symt_function* curr_func = NULL; struct symt_function* curr_func = NULL;
int i, length; int i, length;
...@@ -2220,7 +2228,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo ...@@ -2220,7 +2228,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo
break; break;
} }
} }
if (cvmod) codeview_snarf_linetab2(msc_dbg, cvmod);
return TRUE; return TRUE;
} }
...@@ -3011,6 +3019,8 @@ static BOOL pdb_process_internal(const struct process* pcs, ...@@ -3011,6 +3019,8 @@ static BOOL pdb_process_internal(const struct process* pcs,
PDB_SYMBOLS symbols; PDB_SYMBOLS symbols;
BYTE* globalimage; BYTE* globalimage;
BYTE* modimage; BYTE* modimage;
BYTE* ipi_image;
struct codeview_type_parse ipi_ctp;
BYTE* file; BYTE* file;
int header_size = 0; int header_size = 0;
PDB_STREAM_INDEXES* psi; PDB_STREAM_INDEXES* psi;
...@@ -3052,12 +3062,15 @@ static BOOL pdb_process_internal(const struct process* pcs, ...@@ -3052,12 +3062,15 @@ static BOOL pdb_process_internal(const struct process* pcs,
pdb_lookup, pdb_module_info, module_index); pdb_lookup, pdb_module_info, module_index);
pdb_process_types(msc_dbg, pdb_file); pdb_process_types(msc_dbg, pdb_file);
ipi_image = pdb_read_file(pdb_file, 4);
pdb_init_type_parse(msc_dbg, &ipi_ctp, ipi_image);
/* Read global symbol table */ /* Read global symbol table */
globalimage = pdb_read_file(pdb_file, symbols.gsym_file); globalimage = pdb_read_file(pdb_file, symbols.gsym_file);
if (globalimage) if (globalimage)
{ {
codeview_snarf(msc_dbg, globalimage, 0, codeview_snarf(msc_dbg, globalimage, 0, pdb_get_file_size(pdb_file, symbols.gsym_file),
pdb_get_file_size(pdb_file, symbols.gsym_file), FALSE); NULL, FALSE);
} }
/* Read per-module symbols' tables */ /* Read per-module symbols' tables */
...@@ -3074,19 +3087,18 @@ static BOOL pdb_process_internal(const struct process* pcs, ...@@ -3074,19 +3087,18 @@ static BOOL pdb_process_internal(const struct process* pcs,
modimage = pdb_read_file(pdb_file, sfile.file); modimage = pdb_read_file(pdb_file, sfile.file);
if (modimage) if (modimage)
{ {
if (sfile.symbol_size) struct cv_module_snarf cvmod = {&ipi_ctp, (const void*)(modimage + sfile.symbol_size), sfile.lineno2_size,
codeview_snarf(msc_dbg, modimage, sizeof(DWORD), files_image + 12, files_size};
sfile.symbol_size, TRUE); codeview_snarf(msc_dbg, modimage, sizeof(DWORD), sfile.symbol_size,
&cvmod, TRUE);
if (sfile.lineno_size && sfile.lineno2_size) FIXME("Both line info present... only supporting first\n");
if (sfile.lineno_size) if (sfile.lineno_size && sfile.lineno2_size)
FIXME("Both line info present... only supporting second\n");
else if (sfile.lineno_size)
codeview_snarf_linetab(msc_dbg, codeview_snarf_linetab(msc_dbg,
modimage + sfile.symbol_size, modimage + sfile.symbol_size,
sfile.lineno_size, sfile.lineno_size,
pdb_file->kind == PDB_JG); pdb_file->kind == PDB_JG);
else if (sfile.lineno2_size && files_image)
codeview_snarf_linetab2(msc_dbg, modimage + sfile.symbol_size, sfile.lineno2_size,
files_image + 12, files_size);
pdb_free(modimage); pdb_free(modimage);
} }
...@@ -3101,6 +3113,8 @@ static BOOL pdb_process_internal(const struct process* pcs, ...@@ -3101,6 +3113,8 @@ static BOOL pdb_process_internal(const struct process* pcs,
pdb_get_file_size(pdb_file, symbols.gsym_file)); pdb_get_file_size(pdb_file, symbols.gsym_file));
pdb_free(globalimage); pdb_free(globalimage);
} }
HeapFree(GetProcessHeap(), 0, (DWORD*)ipi_ctp.offset);
pdb_free(ipi_image);
} }
else else
pdb_process_symbol_imports(pcs, msc_dbg, NULL, NULL, image, pdb_process_symbol_imports(pcs, msc_dbg, NULL, NULL, image,
...@@ -3565,8 +3579,8 @@ static BOOL codeview_process_info(const struct process* pcs, ...@@ -3565,8 +3579,8 @@ static BOOL codeview_process_info(const struct process* pcs,
if (ent->SubSection == sstAlignSym) if (ent->SubSection == sstAlignSym)
{ {
codeview_snarf(msc_dbg, msc_dbg->root + ent->lfo, sizeof(DWORD), codeview_snarf(msc_dbg, msc_dbg->root + ent->lfo, sizeof(DWORD), ent->cb,
ent->cb, TRUE); NULL, TRUE);
/* /*
* Check the next and previous entry. If either is a * Check the next and previous entry. If either is a
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment