diff -r -u --new-file glibc-2.3.2.orig/sysdeps/generic/unwind.h glibc-2.3.2/sysdeps/generic/unwind.h --- glibc-2.3.2.orig/sysdeps/generic/unwind.h 2001-11-15 15:09:20.000000000 -0800 +++ glibc-2.3.2/sysdeps/generic/unwind.h 2004-05-24 20:38:35.000000000 -0700 @@ -114,6 +114,14 @@ e.g. executing cleanup code, and not to implement rethrowing. */ extern void _Unwind_Resume (struct _Unwind_Exception *); +/* @@@ Use unwind data to perform a stack backtrace. The trace callback + is called for every stack frame in the call chain, but no cleanup + actions are performed. */ +typedef _Unwind_Reason_Code (*_Unwind_Trace_Fn) + (struct _Unwind_Context *, void *); + +extern _Unwind_Reason_Code _Unwind_Backtrace (_Unwind_Trace_Fn, void *); + /* These functions are used for communicating information about the unwind context (i.e. the unwind descriptors and the user register state) between the unwind library and the personality routine and landing pad. Only diff -r -u --new-file glibc-2.3.2.orig/sysdeps/s390/s390-32/backtrace.c glibc-2.3.2/sysdeps/s390/s390-32/backtrace.c --- glibc-2.3.2.orig/sysdeps/s390/s390-32/backtrace.c 2001-07-07 12:21:28.000000000 -0700 +++ glibc-2.3.2/sysdeps/s390/s390-32/backtrace.c 2004-05-24 20:39:05.000000000 -0700 @@ -1,5 +1,5 @@ /* Return backtrace of current program state. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -18,8 +18,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include +#include #include #include +#include +#include /* This is a global variable set at program start time. It marks the highest used stack address. */ @@ -51,10 +55,31 @@ int empty[2]; }; -int -__backtrace (array, size) - void **array; - int size; +struct trace_arg +{ + void **array; + int cnt, size; +}; + +static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *); +static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *); + +static void +init (void) +{ + void *handle = __libc_dlopen ("libgcc_s.so.1"); + + if (handle == NULL) + return; + + unwind_backtrace = __libc_dlsym (handle, "_Unwind_Backtrace"); + unwind_getip = __libc_dlsym (handle, "_Unwind_GetIP"); + if (unwind_getip == NULL) + unwind_backtrace = NULL; +} + +static int +__backchain_backtrace (void **array, int size) { /* We assume that all the code is generated with frame pointers set. */ struct layout *stack; @@ -71,11 +96,42 @@ out of range. */ break; - array[cnt++] = stack->save_grps[8]; + array[cnt++] = (void *) (stack->save_grps[8] & 0x7fffffff); stack = (struct layout *) stack->back_chain; } return cnt; } + +static _Unwind_Reason_Code +backtrace_helper (struct _Unwind_Context *ctx, void *a) +{ + struct trace_arg *arg = a; + + /* We are first called with address in the __backtrace function. + Skip it. */ + if (arg->cnt != -1) + arg->array[arg->cnt] = (void *) unwind_getip (ctx); + if (++arg->cnt == arg->size) + return _URC_END_OF_STACK; + return _URC_NO_REASON; +} + +int +__backtrace (void **array, int size) +{ + struct trace_arg arg = { .array = array, .size = size, .cnt = -1 }; + __libc_once_define (static, once); + + __libc_once (once, init); + if (unwind_backtrace == NULL) + return __backchain_backtrace (array, size); + + if (size >= 1) + unwind_backtrace (backtrace_helper, &arg); + + return arg.cnt != -1 ? arg.cnt : 0; +} + weak_alias (__backtrace, backtrace) diff -r -u --new-file glibc-2.3.2.orig/sysdeps/s390/s390-32/backtrace.c~ glibc-2.3.2/sysdeps/s390/s390-32/backtrace.c~ --- glibc-2.3.2.orig/sysdeps/s390/s390-32/backtrace.c~ 1969-12-31 16:00:00.000000000 -0800 +++ glibc-2.3.2/sysdeps/s390/s390-32/backtrace.c~ 2004-05-24 20:38:51.000000000 -0700 @@ -0,0 +1,81 @@ +/* Return backtrace of current program state. + Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include + +/* This is a global variable set at program start time. It marks the + highest used stack address. */ +extern void *__libc_stack_end; + + +/* This is the stack layout we see for every non-leaf function. + size offset + %r15 -> +------------------+ + 4 | back chain | 0 + 4 | end of stack | 4 + 8 | glue | 8 + 8 | scratch | 16 + 40 | save area r6-r15 | 24 + 16 | save area f4,f6 | 64 + 16 | empty | 80 + +------------------+ + r14 in the save area holds the return address. +*/ + +struct layout +{ + int back_chain; + int end_of_stack; + int glue[2]; + int scratch[2]; + int save_grps[10]; + int save_fp[4]; + int empty[2]; +}; + +int +__backtrace (array, size) + void **array; + int size; +{ + /* We assume that all the code is generated with frame pointers set. */ + struct layout *stack; + int cnt = 0; + + asm ("LR %0,%%r15" : "=d" (stack) ); + /* We skip the call to this function, it makes no sense to record it. */ + stack = (struct layout *) stack->back_chain; + while (cnt < size) + { + if (stack == NULL || (void *) stack > __libc_stack_end) + /* This means the address is out of range. Note that for the + toplevel we see a frame pointer with value NULL which clearly is + out of range. */ + break; + + array[cnt++] = stack->save_grps[8] & 0x7fffffff; + + stack = (struct layout *) stack->back_chain; + } + + return cnt; +} +weak_alias (__backtrace, backtrace) diff -r -u --new-file glibc-2.3.2.orig/sysdeps/s390/s390-64/backtrace.c glibc-2.3.2/sysdeps/s390/s390-64/backtrace.c --- glibc-2.3.2.orig/sysdeps/s390/s390-64/backtrace.c 2001-07-07 12:21:28.000000000 -0700 +++ glibc-2.3.2/sysdeps/s390/s390-64/backtrace.c 2004-05-24 20:39:05.000000000 -0700 @@ -1,5 +1,5 @@ /* Return backtrace of current program state. 64 bit S/390 version. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2003 Free Software Foundation, Inc. Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com). This file is part of the GNU C Library. @@ -18,8 +18,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include +#include #include #include +#include +#include /* This is a global variable set at program start time. It marks the @@ -50,10 +54,31 @@ long empty[2]; }; +struct trace_arg +{ + void **array; + int cnt, size; +}; + +static _Unwind_Reason_Code (*unwind_backtrace) (_Unwind_Trace_Fn, void *); +static _Unwind_Ptr (*unwind_getip) (struct _Unwind_Context *); + +static void +init (void) +{ + void *handle = __libc_dlopen ("libgcc_s.so.1"); + + if (handle == NULL) + return; + + unwind_backtrace = __libc_dlsym (handle, "_Unwind_Backtrace"); + unwind_getip = __libc_dlsym (handle, "_Unwind_GetIP"); + if (unwind_getip == NULL) + unwind_backtrace = NULL; +} + int -__backtrace (array, size) - void **array; - int size; +__backchain_backtrace (void **array, int size) { /* We assume that all the code is generated with frame pointers set. */ struct layout *stack; @@ -77,4 +102,35 @@ return cnt; } + +static _Unwind_Reason_Code +backtrace_helper (struct _Unwind_Context *ctx, void *a) +{ + struct trace_arg *arg = a; + + /* We are first called with address in the __backtrace function. + Skip it. */ + if (arg->cnt != -1) + arg->array[arg->cnt] = (void *) unwind_getip (ctx); + if (++arg->cnt == arg->size) + return _URC_END_OF_STACK; + return _URC_NO_REASON; +} + +int +__backtrace (void **array, int size) +{ + struct trace_arg arg = { .array = array, .size = size, .cnt = -1 }; + __libc_once_define (static, once); + + __libc_once (once, init); + if (unwind_backtrace == NULL) + return __backchain_backtrace (array, size); + + if (size >= 1) + unwind_backtrace (backtrace_helper, &arg); + + return arg.cnt != -1 ? arg.cnt : 0; +} + weak_alias (__backtrace, backtrace)