Merge commit 'origin/unwind'

* commit 'origin/unwind':
  Fixes for 2.6.25 pt_regs changes.
  Include string.h
  Change stap to get kernel symbols from debuginfo and
  reincarnate vim/ directory in this branch to match master
  Add new define STP_USE_DWARF_UNWINDER which is set based on which archs
  Remove misleading error message.
  Support for kernels built with CONFIG_FRAME_POINTER
  Fix regression.
  dded _stp_read_address() and changed code to use it.
  kretprobe trampoline fixes
  i386 fixes.
  control.c (_stp_ctl_write_dbug): Insert missing break.
  32-bit fixes
  Cleanup.
  2008-03-23  Frank Ch. Eigler  <fche@elastic.org>
  2008-03-23  Frank Ch. Eigler  <fche@elastic.org>
  2008-03-21  Eugene Teo  <eugeneteo@kernel.sg>
  add (back) runtime/unwind files
  * clarify utility of epilogue-type probe aliases in documentation
  rebased unwind_branch on top of current master

1 files changed, 14 insertions, 11 deletions

diff --git a/runtime/stack.c b/runtime/stack.c
index 9c01d65c..772c5baf 100644
--- a/runtime/stack.c
+++ b/runtime/stack.c
@@ -1,6 +1,6 @@
 /*  -*- linux-c -*-
  * Stack tracing functions
- * Copyright (C) 2005, 2006, 2007 Red Hat Inc.
+ * Copyright (C) 2005-2008 Red Hat Inc.
  * Copyright (C) 2005 Intel Corporation.
  *
  * This file is part of systemtap, and is free software.  You can
@@ -23,6 +23,7 @@
 
 #include "sym.c"
 #include "regs.h"
+#include "unwind.c"
 
 #define MAXBACKTRACE 20
 
@@ -57,12 +58,15 @@ void _stp_stack_print(struct pt_regs *regs, int verbose, struct kretprobe_instan
 			_stp_symbol_print((unsigned long)_stp_ret_addr_r(pi));
 		} else {
 			_stp_print_char(' ');
-			_stp_symbol_print (REG_IP(regs));
+			_stp_symbol_print(REG_IP(regs));
 		}
 		_stp_print_char('\n');
-	} else
-		_stp_printf ("%p ", (int64_t)REG_IP(regs));
-	__stp_stack_print (regs, verbose, 0);
+	} else if (pi)
+		_stp_printf("%p %p ", (int64_t)(long)_stp_ret_addr_r(pi), (int64_t) REG_IP(regs));
+	else 
+		_stp_printf("%p ", (int64_t) REG_IP(regs));
+
+	__stp_stack_print(regs, verbose, 0);
 }
 
 /** Writes stack backtrace to a string
@@ -71,7 +75,7 @@ void _stp_stack_print(struct pt_regs *regs, int verbose, struct kretprobe_instan
  * @param regs A pointer to the struct pt_regs.
  * @returns void
  */
-void _stp_stack_snprint (char *str, int size, struct pt_regs *regs, int verbose, struct kretprobe_instance *pi)
+void _stp_stack_snprint(char *str, int size, struct pt_regs *regs, int verbose, struct kretprobe_instance *pi)
 {
 	/* To get a string, we use a simple trick. First flush the print buffer, */
 	/* then call _stp_stack_print, then copy the result into the output string  */
@@ -83,19 +87,18 @@ void _stp_stack_snprint (char *str, int size, struct pt_regs *regs, int verbose,
 	pb->len = 0;
 }
 
-
 /** Prints the user stack backtrace
  * @param str string
  * @returns Same string as was input with trace info appended,
  * @note Currently limited to a depth of two. Works from jprobes and kprobes.
  */
 #if 0
-void _stp_ustack_print (char *str)
+void _stp_ustack_print(char *str)
 {
-	struct pt_regs *nregs = ((struct pt_regs *) (THREAD_SIZE + (unsigned long) current->thread_info)) - 1;
-	_stp_printf ("%p : [user]\n", (int64_t)REG_IP(nregs));
+	struct pt_regs *nregs = ((struct pt_regs *)(THREAD_SIZE + (unsigned long)current->thread_info)) - 1;
+	_stp_printf("%p : [user]\n", (int64_t) REG_IP(nregs));
 	if (REG_SP(nregs))
-		_stp_printf ("%p : [user]\n", (int64_t)(*(unsigned long *)REG_SP(nregs)));
+		_stp_printf("%p : [user]\n", (int64_t) (*(unsigned long *)REG_SP(nregs)));
 }
 #endif /* 0 */