diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | nptl/ChangeLog | 11 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/jmpbuf-unwind.h | 24 | ||||
| -rw-r--r-- | nptl/sysdeps/pthread/unwind-forcedunwind.c (renamed from nptl/unwind-forcedunwind.c) | 6 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h | 29 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c | 38 | ||||
| -rw-r--r-- | nptl/unwind.c | 5 | ||||
| -rw-r--r-- | sysdeps/generic/unwind.h | 3 |
8 files changed, 117 insertions, 5 deletions
@@ -1,4 +1,8 @@ -2003-09-03 Ulrich Drepper <drepper@redhat.com> +22003-09-04 Jakub Jelinek <jakub@redhat.com> + + * sysdeps/generic/unwind.h (_Unwind_GetBSP): Add prototype. + +003-09-03 Ulrich Drepper <drepper@redhat.com> * nss/getXXbyYY_r.c (INTERNAL): Explicitly set errno and avoid returning ERANGE if this wasn't intended. diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 0ecb632..647a443 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,14 @@ +2003-09-04 Jakub Jelinek <jakub@redhat.com> + + * unwind-forcedunwind.c: Move to... + * sysdeps/pthread/unwind-forcedunwind.c: ...here. + (pthread_cancel_init): Use ARCH_CANCEL_INIT if defined. + * sysdeps/pthread/jmpbuf-unwind.h: New file. + * sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c: New file. + * sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h: New file. + * unwind.c: Include jmpbuf-unwind.h. + (unwind_stop): Use _JMPBUF_CFA_UNWINDS macro. + 2003-09-02 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/ia64/bits/local_lim.h: New file. diff --git a/nptl/sysdeps/pthread/jmpbuf-unwind.h b/nptl/sysdeps/pthread/jmpbuf-unwind.h new file mode 100644 index 0000000..fef293a --- /dev/null +++ b/nptl/sysdeps/pthread/jmpbuf-unwind.h @@ -0,0 +1,24 @@ +/* Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Jakub Jelinek <jakub@redhat.com>, 2003. + + 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 <setjmp.h> +#include <unwind.h> + +#define _JMPBUF_CFA_UNWINDS(_jmpbuf, _context) \ + _JMPBUF_UNWINDS (_jmpbuf, (void *) _Unwind_GetCFA (_context)) diff --git a/nptl/unwind-forcedunwind.c b/nptl/sysdeps/pthread/unwind-forcedunwind.c index 9c10932..b0f8487 100644 --- a/nptl/unwind-forcedunwind.c +++ b/nptl/sysdeps/pthread/unwind-forcedunwind.c @@ -46,7 +46,11 @@ pthread_cancel_init (void) || (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL || (forcedunwind = __libc_dlsym (handle, "_Unwind_ForcedUnwind")) == NULL - || (getcfa = __libc_dlsym (handle, "_Unwind_GetCFA")) == NULL) + || (getcfa = __libc_dlsym (handle, "_Unwind_GetCFA")) == NULL +#ifdef ARCH_CANCEL_INIT + || ARCH_CANCEL_INIT (handle) +#endif + ) __libc_fatal ("libgcc_s.so.1 must be installed for pthread_cancel to work\n"); libgcc_s_resume = resume; diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h b/nptl/sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h new file mode 100644 index 0000000..4a526b0 --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h @@ -0,0 +1,29 @@ +/* Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Jakub Jelinek <jakub@redhat.com>, 2003. + + 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 <setjmp.h> +#include <unwind.h> + +#define _JMPBUF_CFA_UNWINDS(_jmpbuf, _context) \ + ({ void *_cfa = (void *) _Unwind_GetCFA (_context); \ + (_cfa < (void *)(((long *)(_jmpbuf))[0]) \ + || (_cfa == (void *)(((long *)(_jmpbuf))[0]) \ + && (void *) _Unwind_GetBSP (_context) \ + >= (void *)(((long *)(_jmpbuf))[17]))); \ + }) diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c b/nptl/sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c new file mode 100644 index 0000000..fb44b42 --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c @@ -0,0 +1,38 @@ +/* Copyright (C) 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Jakub Jelinek <jakub@redhat.com>. + + 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; 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 <dlfcn.h> +#include <stdio.h> +#include <unwind.h> +#include <pthreadP.h> + +static _Unwind_Word (*libgcc_s_getbsp) (struct _Unwind_Context *); + +#define ARCH_CANCEL_INIT(handle) \ + ((libgcc_s_getbsp = __libc_dlsym (handle, "_Unwind_GetBSP")) == NULL) + +#include <sysdeps/pthread/unwind-forcedunwind.c> + +_Unwind_Word +_Unwind_GetBSP (struct _Unwind_Context *context) +{ + if (__builtin_expect (libgcc_s_getbsp == NULL, 0)) + pthread_cancel_init (); + return libgcc_s_getbsp (context); +} diff --git a/nptl/unwind.c b/nptl/unwind.c index 9bde166..a879e92 100644 --- a/nptl/unwind.c +++ b/nptl/unwind.c @@ -23,7 +23,7 @@ #include <string.h> #include <unistd.h> #include "pthreadP.h" - +#include "jmpbuf-unwind.h" #ifdef HAVE_FORCED_UNWIND @@ -41,8 +41,7 @@ unwind_stop (int version, _Unwind_Action actions, of a function is NOT within it's stack frame; it's the SP of the previous frame. */ if ((actions & _UA_END_OF_STACK) - || ! _JMPBUF_UNWINDS (buf->cancel_jmp_buf[0].jmp_buf, - _Unwind_GetCFA (context))) + || ! _JMPBUF_CFA_UNWINDS (buf->cancel_jmp_buf[0].jmp_buf, context)) __libc_longjmp ((struct __jmp_buf_tag *) buf->cancel_jmp_buf, 1); return _URC_NO_REASON; diff --git a/sysdeps/generic/unwind.h b/sysdeps/generic/unwind.h index 08d3381..31c7054 100644 --- a/sysdeps/generic/unwind.h +++ b/sysdeps/generic/unwind.h @@ -200,6 +200,9 @@ _Unwind_GetTextRelBase (struct _Unwind_Context *_C) abort (); return 0; } + +/* @@@ Retrieve the Backing Store Pointer of the given context. */ +extern _Unwind_Word _Unwind_GetBSP (struct _Unwind_Context *); #else extern _Unwind_Ptr _Unwind_GetDataRelBase (struct _Unwind_Context *); extern _Unwind_Ptr _Unwind_GetTextRelBase (struct _Unwind_Context *); |