diff options
| author | hunt <hunt> | 2005-04-11 18:49:33 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2005-04-11 18:49:33 +0000 |
| commit | ac902b1d1fa1444bd978334173738dd48afdcc5d (patch) | |
| tree | 697ca741f92da7e2fe1d736aee8be58742611775 | |
| parent | 156fc47f2e418fccb026674437855e65dd68476b (diff) | |
| download | systemtap-steved-ac902b1d1fa1444bd978334173738dd48afdcc5d.tar.gz systemtap-steved-ac902b1d1fa1444bd978334173738dd48afdcc5d.tar.xz systemtap-steved-ac902b1d1fa1444bd978334173738dd48afdcc5d.zip | |
i386 fixes.
| -rw-r--r-- | runtime/stack.c | 8 | ||||
| -rw-r--r-- | runtime/string.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/runtime/stack.c b/runtime/stack.c index 4aca6c54..e63d1d8b 100644 --- a/runtime/stack.c +++ b/runtime/stack.c @@ -97,15 +97,15 @@ static inline unsigned long _stp_sprint_context_stack ( while (valid_stack_ptr(tinfo, (void *)ebp)) { addr = *(unsigned long *)(ebp + 4); _stp_symbol_sprint (str, addr); - _stp_string_cat ("\n"); + _stp_string_cat (str, "\n"); ebp = *(unsigned long *)ebp; } #else while (valid_stack_ptr(tinfo, stack)) { addr = *stack++; if (_stp_kta (addr)) { - _stp_symbol_sprint (addr); - _stp_string_cat ("\n"); + _stp_symbol_sprint (str, addr); + _stp_string_cat (str, "\n"); } } #endif @@ -125,6 +125,7 @@ static void __stp_stack_print (unsigned long *stack, int verbose, int levels) ebp = _stp_print_context_stack (context, stack, ebp); stack = (unsigned long*)context->previous_esp; } + _stp_print_flush (); } static void __stp_stack_sprint (String str, unsigned long *stack, int verbose, int levels) @@ -172,7 +173,6 @@ String _stp_stack_sprint (String str, int verbose, int levels) { unsigned long stack; __stp_stack_sprint (str, &stack, verbose, levels); - _stp_log ("sss: str=%s\n", str->buf); return str; } diff --git a/runtime/string.c b/runtime/string.c index 1975b70c..b6432b76 100644 --- a/runtime/string.c +++ b/runtime/string.c @@ -151,10 +151,10 @@ char * _stp_string_ptr (String str) ({ \ if (__builtin_types_compatible_p (typeof (str2), char[])) { \ char *x = (char *)str2; \ - _str_string_cat_cstr(str1,x); \ + _stp_string_cat_cstr(str1,x); \ } else { \ String x = (String)str2; \ - _str_string_cat_string(str1,x); \ + _stp_string_cat_string(str1,x); \ } \ }) |