A couple small cleanup things in libdwarf code, hopefully fixing tests

This commit is contained in:
Jeremy 2023-09-12 17:59:37 -04:00
parent f95b25f0d6
commit d714e70cf6
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4

View File

@ -437,7 +437,8 @@ namespace cpptrace {
return die_object(dbg, targdie); return die_object(dbg, targdie);
} }
default: default:
assert(false); fprintf(stderr, "unknown form for attribute %d %d\n", dw_attrnum, form);
exit(1);
} }
} }
}; };
@ -781,7 +782,6 @@ namespace cpptrace {
dbg, dbg,
die, die,
[pc, dwversion, &frame] (Dwarf_Debug dbg, const die_object& die) { [pc, dwversion, &frame] (Dwarf_Debug dbg, const die_object& die) {
int ret;
if(dump_dwarf) { if(dump_dwarf) {
fprintf( fprintf(
stderr, stderr,
@ -798,7 +798,12 @@ namespace cpptrace {
} }
} else { } else {
if(trace_dwarf) { if(trace_dwarf) {
fprintf(stderr, "pc in die %08llx %s\n", die.get_global_offset(), die.get_tag_name()); fprintf(
stderr,
"pc in die %08llx %s\n",
(unsigned long long) die.get_global_offset(),
die.get_tag_name()
);
} }
if(dump_dwarf) { if(dump_dwarf) {
fprintf(stderr, "pc in die <-----------------------------------\n"); fprintf(stderr, "pc in die <-----------------------------------\n");
@ -1013,9 +1018,9 @@ namespace cpptrace {
if(trace_dwarf) { if(trace_dwarf) {
fprintf( fprintf(
stderr, stderr,
"%s %08lx %s\n", "%s %08llx %s\n",
obj_path.c_str(), obj_path.c_str(),
frame_info.obj_address, (unsigned long long)frame_info.obj_address,
frame_info.symbol.c_str() frame_info.symbol.c_str()
); );
} }