luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add column support for libdwarf

Browse Source
This commit is contained in:
Jeremy 2023-11-15 22:50:10 -05:00
parent 140166a4a7
commit 0de366f7d6
No known key found for this signature in database
GPG Key ID: BE03111EB7ED6E2E
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/symbols/symbols_with_libdwarf.cpp
View File

@ -70,7 +70,8 @@ namespace libdwarf {
// int i; // int i;
Dwarf_Line line; Dwarf_Line line;
optional<std::string> path; optional<std::string> path;
optional<unsigned> line_number; optional<std::uint32_t> line_number;
optional<std::uint32_t> column_number;
line_entry(Dwarf_Addr low, Dwarf_Line line) : low(low), line(line) {} line_entry(Dwarf_Addr low, Dwarf_Line line) : low(low), line(line) {}
}; };
@ -664,12 +665,21 @@ namespace libdwarf {
// If the vector has been empty this can happen // If the vector has been empty this can happen
if(table_it != line_entries.end()) { if(table_it != line_entries.end()) {
Dwarf_Line line = table_it->line; Dwarf_Line line = table_it->line;
// line number
if(!table_it->line_number) { if(!table_it->line_number) {
Dwarf_Unsigned line_number = 0; Dwarf_Unsigned line_number = 0;
VERIFY(wrap(dwarf_lineno, line, &line_number) == DW_DLV_OK); VERIFY(wrap(dwarf_lineno, line, &line_number) == DW_DLV_OK);
table_it->line_number = static_cast<std::uint32_t>(line_number); table_it->line_number = static_cast<std::uint32_t>(line_number);
} }
frame.line = table_it->line_number.unwrap(); frame.line = table_it->line_number.unwrap();
// column number
if(!table_it->column_number) {
Dwarf_Unsigned column_number = 0;
VERIFY(wrap(dwarf_lineoff_b, line, &column_number) == DW_DLV_OK);
table_it->column_number = static_cast<std::uint32_t>(column_number);
}
frame.column = table_it->column_number.unwrap();
// filename
if(!table_it->path) { if(!table_it->path) {
char* filename = nullptr; char* filename = nullptr;
VERIFY(wrap(dwarf_linesrc, line, &filename) == DW_DLV_OK); VERIFY(wrap(dwarf_linesrc, line, &filename) == DW_DLV_OK);