Improve backtrace formatting.
Show the symbol offset, when available.
Centralized formatting of native stack traces in libcorkscrew.
It's handy for automated tools if all stacks look the same.
Since we already made them all look them same, we might as well
do the formatting in just one place.
Do not strip the Thumb bit on ARM. This fixes an off-by-one
issue that could happen when resolving a PC that was at the
very beginning of a Thumb function, since the symbol table would
have the Thumb bit set but since we stripped the bit from our
PC, we would be looking for an address one byte before the
one listed in the symbol table. It's also quite useful to see
whether a given function is executing in Thumb mode just by glancing
at the PC.
Change-Id: Icaa29add85ce0bcafe24d5ce2098e138d809e2ab
diff --git a/libcorkscrew/backtrace.c b/libcorkscrew/backtrace.c
index 857b741..fa21574 100644
--- a/libcorkscrew/backtrace.c
+++ b/libcorkscrew/backtrace.c
@@ -213,8 +213,9 @@
static void init_backtrace_symbol(backtrace_symbol_t* symbol, uintptr_t pc) {
symbol->relative_pc = pc;
+ symbol->relative_symbol_addr = 0;
symbol->map_name = NULL;
- symbol->name = NULL;
+ symbol->symbol_name = NULL;
symbol->demangled_name = NULL;
}
@@ -235,8 +236,10 @@
#if HAVE_DLADDR
Dl_info info;
if (dladdr((const void*)frame->absolute_pc, &info) && info.dli_sname) {
- symbol->name = strdup(info.dli_sname);
- symbol->demangled_name = demangle_symbol_name(symbol->name);
+ symbol->relative_symbol_addr = (uintptr_t)info.dli_saddr
+ - (uintptr_t)info.dli_fbase;
+ symbol->symbol_name = strdup(info.dli_sname);
+ symbol->demangled_name = demangle_symbol_name(symbol->symbol_name);
}
#endif
}
@@ -262,8 +265,9 @@
}
}
if (s) {
- symbol->name = strdup(s->name);
- symbol->demangled_name = demangle_symbol_name(symbol->name);
+ symbol->relative_symbol_addr = s->start;
+ symbol->symbol_name = strdup(s->name);
+ symbol->demangled_name = demangle_symbol_name(symbol->symbol_name);
}
}
}
@@ -272,8 +276,30 @@
for (size_t i = 0; i < frames; i++) {
backtrace_symbol_t* symbol = &backtrace_symbols[i];
free(symbol->map_name);
- free(symbol->name);
+ free(symbol->symbol_name);
free(symbol->demangled_name);
init_backtrace_symbol(symbol, 0);
}
}
+
+void format_backtrace_line(unsigned frameNumber, const backtrace_frame_t* frame,
+ const backtrace_symbol_t* symbol, char* buffer, size_t bufferSize) {
+ const char* mapName = symbol->map_name ? symbol->map_name : "<unknown>";
+ const char* symbolName = symbol->demangled_name ? symbol->demangled_name : symbol->symbol_name;
+ size_t fieldWidth = (bufferSize - 80) / 2;
+ if (symbolName) {
+ uint32_t pc_offset = symbol->relative_pc - symbol->relative_symbol_addr;
+ if (pc_offset) {
+ snprintf(buffer, bufferSize, "#%02d pc %08x %.*s (%.*s+%u)",
+ frameNumber, symbol->relative_pc, fieldWidth, mapName,
+ fieldWidth, symbolName, pc_offset);
+ } else {
+ snprintf(buffer, bufferSize, "#%02d pc %08x %.*s (%.*s)",
+ frameNumber, symbol->relative_pc, fieldWidth, mapName,
+ fieldWidth, symbolName);
+ }
+ } else {
+ snprintf(buffer, bufferSize, "#%02d pc %08x %.*s",
+ frameNumber, symbol->relative_pc, fieldWidth, mapName);
+ }
+}