diff options
Diffstat (limited to 'runtime/stack-i386.c')
| -rw-r--r-- | runtime/stack-i386.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/runtime/stack-i386.c b/runtime/stack-i386.c index d36f30d2..d10a8cfe 100644 --- a/runtime/stack-i386.c +++ b/runtime/stack-i386.c @@ -1,6 +1,6 @@ /* -*- linux-c -*- * i386 stack tracing functions - * Copyright (C) 2005, 2006 Red Hat Inc. + * Copyright (C) 2005, 2006, 2007 Red Hat Inc. * * This file is part of systemtap, and is free software. You can * redistribute it and/or modify it under the terms of the GNU General @@ -18,7 +18,7 @@ static inline int _stp_valid_stack_ptr_info(struct unwind_frame_info *info) } static int -_stp_show_trace_unwind(String str, struct unwind_frame_info *info, int verbose) +_stp_show_trace_unwind(struct unwind_frame_info *info, int verbose) { int n = 0; @@ -27,11 +27,11 @@ _stp_show_trace_unwind(String str, struct unwind_frame_info *info, int verbose) break; n++; if (verbose) { - _stp_string_cat(str, " "); - _stp_symbol_sprint (str, UNW_PC(info)); - _stp_string_cat(str, "\n"); + _stp_print_char (' '); + _stp_symbol_print (UNW_PC(info)); + _stp_print_char ('\n'); } else - _stp_sprintf (str, "%p ", UNW_PC(info)); + _stp_printf ("%p ", UNW_PC(info)); if (arch_unw_user_mode(info)) break; } @@ -44,7 +44,7 @@ static inline int _stp_valid_stack_ptr(unsigned long context, unsigned long p) return p > context && p < context + THREAD_SIZE - 3; } -static void __stp_stack_sprint (String str, struct pt_regs *regs, int verbose, int levels) +static void __stp_stack_print (struct pt_regs *regs, int verbose, int levels) { unsigned long *stack = (unsigned long *)®_SP(regs); unsigned long context = (unsigned long)stack & ~(THREAD_SIZE - 1); @@ -54,12 +54,12 @@ static void __stp_stack_sprint (String str, struct pt_regs *regs, int verbose, i #ifdef CONFIG_STACK_UNWIND struct unwind_frame_info info; if (unwind_init_frame_info(&info, current, regs) == 0) - uw_ret = _stp_show_trace_unwind(str, &info, verbose); + uw_ret = _stp_show_trace_unwind(&info, verbose); stack = (void *)UNW_SP(&info); #endif if (uw_ret == 0) - _stp_string_cat(str, "Inexact backtrace:\n"); + _stp_print("Inexact backtrace:\n"); #ifdef CONFIG_FRAME_POINTER { @@ -72,13 +72,13 @@ static void __stp_stack_sprint (String str, struct pt_regs *regs, int verbose, i if (verbose) { if (uw_ret) { uw_ret = 0; - _stp_string_cat(str, "Leftover inexact backtrace:\n"); + _stp_print("Leftover inexact backtrace:\n"); } - _stp_string_cat(str, " "); - _stp_symbol_sprint (str, addr); - _stp_string_cat(str, "\n"); + _stp_print_char(' '); + _stp_symbol_print (addr); + _stp_print_char('\n'); } else - _stp_sprintf (str, "%p ", (void *)addr); + _stp_printf ("%p ", (void *)addr); ebp = *(unsigned long *)ebp; } } @@ -89,13 +89,13 @@ static void __stp_stack_sprint (String str, struct pt_regs *regs, int verbose, i if (verbose) { if (uw_ret) { uw_ret = 0; - _stp_string_cat(str, "Leftover inexact backtrace:\n"); + _stp_print("Leftover inexact backtrace:\n"); } - _stp_string_cat(str, " "); - _stp_symbol_sprint(str, addr); - _stp_string_cat(str, "\n"); + _stp_print_char(' '); + _stp_symbol_print(addr); + _stp_print_char('\n'); } else - _stp_sprintf (str, "%p ", (void *)addr); + _stp_printf ("%p ", (void *)addr); } } #endif |