[haiku-commits] BRANCH xyzzy-github.x86_64 - src/system/kernel/arch/x86/64
- From: xyzzy-github.x86_64 <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 9 Jul 2012 13:49:07 +0200 (CEST)
added 1 changeset to branch 'refs/remotes/xyzzy-github/x86_64'
old head: 3b802628b8e2aa14eb4c674d0a8cf900f522baa1
new head: ee7aba5117fea8aa4d292fb9c105dc483c67a2e2
----------------------------------------------------------------------------
ee7aba5: Print symbol information in a stack trace.
[ Alex Smith <alex@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Commit: ee7aba5117fea8aa4d292fb9c105dc483c67a2e2
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Mon Jul 9 10:54:03 2012 UTC
----------------------------------------------------------------------------
1 file changed, 60 insertions(+), 7 deletions(-)
src/system/kernel/arch/x86/64/stubs.cpp | 67 ++++++++++++++++++++++++---
----------------------------------------------------------------------------
diff --git a/src/system/kernel/arch/x86/64/stubs.cpp
b/src/system/kernel/arch/x86/64/stubs.cpp
index 0e82a29..5f85b9a 100644
--- a/src/system/kernel/arch/x86/64/stubs.cpp
+++ b/src/system/kernel/arch/x86/64/stubs.cpp
@@ -21,6 +21,7 @@
#include <team.h>
#include <thread.h>
#include <vm/vm.h>
+#include <vm/VMAddressSpace.h>
#include <boot/kernel_args.h>
@@ -129,12 +130,66 @@ print_iframe(struct iframe* frame)
}
+static status_t
+lookup_symbol(addr_t address, addr_t* _baseAddress, const char** _symbolName,
+ const char** _imageName, bool* _exactMatch)
+{
+ status_t status = B_ENTRY_NOT_FOUND;
+
+ if (IS_KERNEL_ADDRESS(address)) {
+ status = elf_debug_lookup_symbol_address(address, _baseAddress,
+ _symbolName, _imageName, _exactMatch);
+ }
+
+ return status;
+}
+
+
+static void
+print_stack_frame(addr_t rip, addr_t rbp, addr_t nextRbp, int32 callIndex)
+{
+ const char* symbol;
+ const char* image;
+ addr_t baseAddress;
+ bool exactMatch;
+ status_t status;
+ addr_t diff;
+
+ diff = nextRbp - rbp;
+
+ // kernel space/user space switch
+ if (diff & (1L << 63))
+ diff = 0;
+
+ status = lookup_symbol(rip, &baseAddress, &symbol, &image, &exactMatch);
+
+ kprintf("%2d %016lx (+%4ld) %016lx ", callIndex, rbp, diff, rip);
+
+ if (status == B_OK) {
+ if (symbol != NULL)
+ kprintf("<%s>:%s%s", image, symbol, exactMatch ? "" : "
(nearest)");
+ else
+ kprintf("<%s@%p>:unknown", image, (void*)baseAddress);
+
+ kprintf(" + 0x%04lx\n", rip - baseAddress);
+ } else {
+ VMArea *area = VMAddressSpace::Kernel()->LookupArea(rip);
+ if (area != NULL) {
+ kprintf("%d:%s@%p + %#lx\n", area->id, area->name,
+ (void*)area->Base(), rip - area->Base());
+ } else
+ kprintf("\n");
+ }
+}
+
+
void
arch_debug_stack_trace(void)
{
addr_t rbp = x86_read_ebp();
- kprintf("frame caller\n");
+ kprintf("frame caller
<image>:function"
+ " + offset\n");
for (int32 callIndex = 0;; callIndex++) {
if (rbp == 0)
@@ -143,8 +198,7 @@ arch_debug_stack_trace(void)
if (is_iframe(rbp)) {
struct iframe* frame = (struct iframe*)rbp;
print_iframe(frame);
- kprintf("%2d %016lx (+%4ld) %016lx\n", callIndex, rbp,
- frame->rbp - rbp, frame->rip);
+ print_stack_frame(frame->rip, rbp, frame->rbp,
callIndex);
rbp = frame->rbp;
} else {
@@ -152,10 +206,9 @@ arch_debug_stack_trace(void)
if (frame->return_address == 0)
break;
- kprintf("%2d %016lx (+%4ld) %016lx\n", callIndex, rbp,
- (frame->previous != NULL)
- ? (addr_t)frame->previous - rbp : 0,
- frame->return_address);
+ print_stack_frame(frame->return_address, rbp,
+ (frame->previous != NULL) ?
(addr_t)frame->previous : rbp,
+ callIndex);
rbp = (addr_t)frame->previous;
}
Other related posts:
