ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-08 14:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

raddbg from pdb: correctly parse several c13 files in single c13 subsection, rather than just assuming a single one

Browse Source
This commit is contained in:
Ryan Fleury
2024-02-07 13:35:14 -08:00
parent ccec64750d
commit 390aab2699
4 changed files with 111 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/raddbg_convert/pdb/raddbg_codeview.c
+27 -13
View File
@@ -399,22 +399,29 @@ cv_c13_from_data(Arena *arena, String8 c13_data,
{
// read header
if (sizeof(CV_C13_SubSecLinesHeader) <= cap){
CV_C13_SubSecLinesHeader *hdr = (CV_C13_SubSecLinesHeader*)first;
// read file
U32 file_info_off = sizeof(*hdr);
if (file_info_off + sizeof(CV_C13_File) <= cap){
CV_C13_File *file = (CV_C13_File*)(first + file_info_off);
U32 read_off = 0;
U64 read_off_opl = node->size;
CV_C13_SubSecLinesHeader *hdr = (CV_C13_SubSecLinesHeader*)(first + read_off);
read_off += sizeof(*hdr);
// extract top level info
U32 sec_idx = hdr->sec;
if (1 <= sec_idx && sec_idx <= sections->count){
B32 has_cols = !!(hdr->flags & CV_C13_SubSecLinesFlag_HasColumns);
U64 secrel_off = hdr->sec_off;
U64 secrel_opl = secrel_off + hdr->len;
U64 sec_base_off = sections->sections[sec_idx - 1].voff;
// rjf: bad section index -> skip
if(sec_idx < 1 || sections->count < sec_idx)
{
continue;
}
// read files
for(;read_off+sizeof(CV_C13_File) <= read_off_opl;)
{
// rjf: grab next file header
CV_C13_File *file = (CV_C13_File*)(first + read_off);
U32 file_off = file->file_off;
U32 line_count_unclamped = file->num_lines;
U32 block_size = file->block_size;
@@ -433,8 +440,8 @@ cv_c13_from_data(Arena *arena, String8 c13_data,
line_item_size += sizeof(CV_C13_Column);
}
U32 line_array_off = file_info_off + sizeof(*file);
U32 line_count_max = (cap - line_array_off)/line_item_size;
U32 line_array_off = read_off + sizeof(*file);
U32 line_count_max = (read_off_opl - line_array_off) / line_item_size;
U32 line_count = ClampTop(line_count_unclamped, line_count_max);
U32 col_array_off = line_array_off + line_count*sizeof(CV_C13_Line);
@@ -452,13 +459,18 @@ cv_c13_from_data(Arena *arena, String8 c13_data,
U32 i = 0;
for (; line_ptr < line_opl; line_ptr += 1, i += 1){
voffs[i] = line_ptr->off + secrel_off + sec_base_off;
if(voffs[i] == 0x0002318c)
{
int x = 0;
}
line_nums[i] = CV_C13_LineFlags_ExtractLineNumber(line_ptr->flags);
}
voffs[i] = secrel_opl + sec_base_off;
}
// emit parsed lines
CV_C13LinesParsed *lines_parsed = push_array(arena, CV_C13LinesParsed, 1);
CV_C13LinesParsedNode *lines_parsed_node = push_array(arena, CV_C13LinesParsedNode, 1);
CV_C13LinesParsed *lines_parsed = &lines_parsed_node->v;
lines_parsed->sec_idx = sec_idx;
lines_parsed->file_off = file_off;
lines_parsed->secrel_base_off = secrel_off;
@@ -466,9 +478,11 @@ cv_c13_from_data(Arena *arena, String8 c13_data,
lines_parsed->voffs = voffs;
lines_parsed->line_nums = line_nums;
lines_parsed->line_count = line_count;
SLLQueuePush(node->lines_first, node->lines_last, lines_parsed_node);
node->lines = lines_parsed;
}
// rjf: advance
read_off += sizeof(*file);
read_off += line_item_size*line_count;
}
}
}break;
src/raddbg_convert/pdb/raddbg_codeview.h
+9 -3
View File
@@ -2977,14 +2977,20 @@ typedef struct CV_C13LinesParsed{
U32 line_count;
} CV_C13LinesParsed;
typedef struct CV_C13LinesParsedNode CV_C13LinesParsedNode;
struct CV_C13LinesParsedNode
{
CV_C13LinesParsedNode *next;
CV_C13LinesParsed v;
};
typedef struct CV_C13SubSectionNode{
struct CV_C13SubSectionNode *next;
CV_C13_SubSectionKind kind;
U32 off;
U32 size;
union{
CV_C13LinesParsed *lines;
};
CV_C13LinesParsedNode *lines_first;
CV_C13LinesParsedNode *lines_last;
} CV_C13SubSectionNode;
typedef struct CV_C13Parsed{
src/raddbg_convert/pdb/raddbg_codeview_stringize.c
+10 -5
View File
@@ -2332,19 +2332,24 @@ static void
cv_stringize_c13_parsed(Arena *arena, String8List *out, CV_C13Parsed *c13){
for(CV_C13SubSectionNode *node = c13->first_sub_section;
node != 0;
node = node->next){
node = node->next)
{
String8 kind_str = cv_string_from_c13_sub_section_kind(node->kind);
str8_list_pushf(arena, out, "C13 Sub Section [%llx] (%.*s):\n",
node->off, str8_varg(kind_str));
switch (node->kind){
switch(node->kind)
{
case CV_C13_SubSectionKind_Lines:
{
CV_C13LinesParsed *lines = node->lines;
if (lines == 0){
if (node->lines_first == 0)
{
str8_list_push(arena, out, str8_lit(" failed to extract info\n"));
}
else{
else for(CV_C13LinesParsedNode *n = node->lines_first; n != 0; n = n->next)
{
CV_C13LinesParsed *lines = &n->v;
str8_list_pushf(arena, out, " section: %u\n", lines->sec_idx);
str8_list_pushf(arena, out, " file off: %u\n", lines->file_off);
str8_list_pushf(arena, out, " file name: %.*s\n", str8_varg(lines->file_name));
src/raddbg_convert/pdb/raddbg_from_pdb.c
+9 -4
View File
@@ -3419,10 +3419,15 @@ str8_list_pushf(arena, &out->errors, fmt, __VA_ARGS__);\
// unit's line info
for (CV_C13SubSectionNode *node = unit_c13->first_sub_section;
node != 0;
node = node->next){
if (node->kind == CV_C13_SubSectionKind_Lines){
CV_C13LinesParsed *lines = node->lines;
if (lines != 0){
node = node->next)
{
if(node->kind == CV_C13_SubSectionKind_Lines)
{
for(CV_C13LinesParsedNode *lines_n = node->lines_first;
lines_n != 0;
lines_n = lines_n->next)
{
CV_C13LinesParsed *lines = &lines_n->v;
CONS_LineSequence seq = {0};
seq.file_name = lines->file_name;
seq.voffs = lines->voffs;