diff --git a/nemu/src/utils/ftrace.c b/nemu/src/utils/ftrace.c index a21cc71..c121dd4 100644 --- a/nemu/src/utils/ftrace.c +++ b/nemu/src/utils/ftrace.c @@ -116,8 +116,10 @@ void ftrace_return(vaddr_t pc, vaddr_t addr) { ftrace_stack_len--) { vaddr_t tco_addr = ftrace_stack[ftrace_stack_len]; func_t *f = get_func(tco_addr); - Trace("%*s0x%x [%s@0x%x] ", ftrace_stack_len, "", pc, f == NULL ? "???" : f->name, tco_addr - f->start); + Trace("%*s0x%x 0x%x <%s+0x%x> ", ftrace_stack_len, "", pc, tco_addr, + f == NULL ? "???" : f->name, tco_addr - f->start); } func_t *f = get_func(addr); - Trace("%*s0x%x ret <%s+0x%x>", ftrace_stack_len, "", pc, f == NULL ? "???" : f->name, addr - f->start); + Trace("%*s0x%x ret 0x%x <%s+0x%x>", ftrace_stack_len, "", pc, addr, + f == NULL ? "???" : f->name, addr - f->start); }