Update.

1998-06-08 18:57  Ulrich Drepper  <drepper@cygnus.com>

	* Makeconfig (subdirs): Add debug.
	* configure.in: Use sysdeps/generic/elf subdir if ELF platform.
	* libc.map: Add __backtrace, __backtrace_symbols, backtrace and
	backtrace_symbols.
	* sysdeps/generic/backtrace.c: New file.
	* sysdeps/generic/backtracesyms.c: New file.
	* sysdeps/generic/elf/backtracesyms.c: New file.
	* sysdeps/i386/backtrace.c: New file.
	* debug/Makefile: New file.
	* debug/backtrace-tst.c: New file.
	* debug/execinfo.h: New file.

3 files changed, 180 insertions, 0 deletions

diff --git a/sysdeps/generic/backtrace.c b/sysdeps/generic/backtrace.c
new file mode 100644
index 0000000000..26bf9d41cf
--- /dev/null
+++ b/sysdeps/generic/backtrace.c
@@ -0,0 +1,34 @@
+/* Return backtrace of current program state.
+   Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <execinfo.h>
+
+
+int
+__backtrace (array, size)
+     void **array;
+     int size;
+{
+  /* We don't generally have the possibility to determine the stack
+     trace.  Even gcc's `__builtin_return_address' feature cannot help
+     since it requires a constant argument.  */
+  return 0;
+}
+weak_alias (__backtrace, backtrace)
diff --git a/sysdeps/generic/backtracesyms.c b/sysdeps/generic/backtracesyms.c
new file mode 100644
index 0000000000..36bd39caaf
--- /dev/null
+++ b/sysdeps/generic/backtracesyms.c
@@ -0,0 +1,58 @@
+/* Return list with names for address in backtrace.
+   Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <execinfo.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+/* Assume the worst for the width of an address.  */
+#define WORD_WIDTH 16
+
+
+char **
+__backtrace_symbols (array, size)
+     const void **array;
+     int size;
+{
+  int cnt;
+  size_t total = 0;
+  const char **result;
+
+  /* We can compute the text size needed for the symbols since we print
+     them all as "[%<addr>]".  */
+  total = size * (WORD_WIDTH + 3);
+
+  /* Allocate memory for the result.  */
+  result = malloc (size * sizeof (char *) + total);
+  if (result != NULL)
+    {
+      char *last = (char *) (result + size);
+
+      for (cnt = 0; cnt < size; ++cnt)
+	{
+	  result[cnt] = last;
+	  last += 1 + sprintf (last, "[+%p]", array[cnt]);
+	}
+    }
+
+  return result;
+}
+weak_alias (__backtrace_symbols, backtrace_symbols)
diff --git a/sysdeps/generic/elf/backtracesyms.c b/sysdeps/generic/elf/backtracesyms.c
new file mode 100644
index 0000000000..11a65ea267
--- /dev/null
+++ b/sysdeps/generic/elf/backtracesyms.c
@@ -0,0 +1,88 @@
+/* Return list with names for address in backtrace.
+   Copyright (C) 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <execinfo.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <elf/ldsodefs.h>
+
+#if __ELF_NATIVE_CLASS == 32
+# define WORD_WIDTH 8
+#else
+/* We assyme 64bits.  */
+# define WORD_WIDTH 16
+#endif
+
+
+char **
+__backtrace_symbols (array, size)
+     const void **array;
+     int size;
+{
+  Dl_info info[size];
+  int status[size];
+  int cnt;
+  size_t total = 0;
+  char **result;
+
+  /* Fill in the information we can get from `dladdr'.  */
+  for (cnt = 0; cnt < size; ++cnt)
+    {
+      status[cnt] = _dl_addr (array[cnt], &info[cnt]);
+      if (status[cnt] && info[cnt].dli_fname && info[cnt].dli_fname[0] != '\0')
+	/* We have some info, compute the length of the string which will be
+	   "<fct-name>(<sym-name>)[+offset].  */
+	total += (strlen (info[cnt].dli_fname ?: "")
+		  + (info[cnt].dli_sname
+		     ? strlen (info[cnt].dli_sname) + 2
+		     : 0)
+		  + WORD_WIDTH + 6);
+      else
+	total += 6 + WORD_WIDTH;
+    }
+
+  /* Allocate memory for the result.  */
+  result = malloc (size * sizeof (char *) + total);
+  if (result != NULL)
+    {
+      char *last = (char *) (result + size);
+
+      for (cnt = 0; cnt < size; ++cnt)
+	{
+	  result[cnt] = last;
+
+	  if (status[cnt] && info[cnt].dli_fname
+	      && info[cnt].dli_fname[0] != '\0')
+	    last += 1 + sprintf (last, "%s%s%s%s[+%p]",
+				 info[cnt].dli_fname ?: "",
+				 info[cnt].dli_sname ? "(" : "",
+				 info[cnt].dli_sname ?: "",
+				 info[cnt].dli_sname ? ") " : " ",
+				 info[cnt].dli_fbase);
+	  else
+	    last += 1 + sprintf (last, "[+%p]", array[cnt]);
+	}
+    }
+
+  return result;
+}
+weak_alias (__backtrace_symbols, backtrace_symbols)