Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Also print the indices of stack frames. This makes the "call" command

Browse Source 
more convenient to use.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26279 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2008-07-06 15:32:40 +00:00
parent ba18b05b5d
commit e146a7bf2f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/system/kernel/arch/x86/arch_debug.cpp
View File

@ -103,7 +103,8 @@ lookup_symbol(struct thread* thread, addr_t address, addr_t *_baseAddress,
static void
print_stack_frame(struct thread *thread, addr_t eip, addr_t ebp, addr_t nextEbp)
print_stack_frame(struct thread *thread, addr_t eip, addr_t ebp, addr_t nextEbp,
int32 callIndex)
{
const char *symbol, *image;
addr_t baseAddress;
@ -120,7 +121,7 @@ print_stack_frame(struct thread *thread, addr_t eip, addr_t ebp, addr_t nextEbp)
status = lookup_symbol(thread, eip, &baseAddress, &symbol, &image,
&exactMatch);
kprintf("%08lx (+%4ld) %08lx", ebp, diff, eip);
kprintf("%2ld %08lx (+%4ld) %08lx", callIndex, ebp, diff, eip);
if (status == B_OK) {
if (symbol != NULL) {
@ -293,7 +294,7 @@ stack_trace(int argc, char **argv)
bool onKernelStack = true;
for (;;) {
for (int32 callIndex = 0;; callIndex++) {
onKernelStack = onKernelStack
&& is_kernel_stack_address(thread, ebp);
@ -301,7 +302,7 @@ stack_trace(int argc, char **argv)
struct iframe *frame = (struct iframe *)ebp;
print_iframe(frame);
print_stack_frame(thread, frame->eip, ebp, frame->ebp);
print_stack_frame(thread, frame->eip, ebp, frame->ebp, callIndex);
ebp = frame->ebp;
} else {
@ -315,7 +316,7 @@ stack_trace(int argc, char **argv)
if (eip == 0 || ebp == 0)
break;
print_stack_frame(thread, eip, ebp, nextEbp);
print_stack_frame(thread, eip, ebp, nextEbp, callIndex);
ebp = nextEbp;
}