From e2982bf018ff39fcfb452012027479a07457fa92 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 14 Feb 2004 05:22:43 +0000 Subject: Update. 2004-01-29 Steven Munroe * Makefile (libpthread-routines): Add pt-cleanup. * pt-longjmp.c: Removed. * pt-cleanup.c: Copied __pthread_cleanup_upto to here. New file. * sysdeps/generic/pt-longjmp.c: Copied longjmp to here. New file. * sysdeps/unix/sysv/linux/powerpc/Versions: New file. Version longjmp, siglongjmp for GLIBC_2.3.4. * sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c: New File. --- nptl/ChangeLog | 10 ++++ nptl/Makefile | 2 +- nptl/pt-cleanup.c | 64 ++++++++++++++++++++ nptl/pt-longjmp.c | 71 ----------------------- nptl/sysdeps/generic/pt-longjmp.c | 29 +++++++++ nptl/sysdeps/unix/sysv/linux/powerpc/Versions | 5 ++ nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c | 68 ++++++++++++++++++++++ 7 files changed, 177 insertions(+), 72 deletions(-) create mode 100644 nptl/pt-cleanup.c delete mode 100644 nptl/pt-longjmp.c create mode 100644 nptl/sysdeps/generic/pt-longjmp.c create mode 100644 nptl/sysdeps/unix/sysv/linux/powerpc/Versions create mode 100644 nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c (limited to 'nptl') diff --git a/nptl/ChangeLog b/nptl/ChangeLog index c37d8a3ade..f69a346b7a 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,13 @@ +2004-01-29 Steven Munroe + + * Makefile (libpthread-routines): Add pt-cleanup. + * pt-longjmp.c: Removed. + * pt-cleanup.c: Copied __pthread_cleanup_upto to here. New file. + * sysdeps/generic/pt-longjmp.c: Copied longjmp to here. New file. + * sysdeps/unix/sysv/linux/powerpc/Versions: New file. + Version longjmp, siglongjmp for GLIBC_2.3.4. + * sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c: New File. + 2004-02-13 Ulrich Drepper * sysdeps/pthread/pthread_cond_timedwait.c diff --git a/nptl/Makefile b/nptl/Makefile index c67bfe4ef6..715dd766ff 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -99,7 +99,7 @@ libpthread-routines = init events version \ sem_wait sem_trywait sem_timedwait sem_post \ cleanup cleanup_defer cleanup_compat \ cleanup_defer_compat unwind \ - pt-longjmp \ + pt-longjmp pt-cleanup\ cancellation \ lowlevellock \ pt-vfork \ diff --git a/nptl/pt-cleanup.c b/nptl/pt-cleanup.c new file mode 100644 index 0000000000..96836a14a1 --- /dev/null +++ b/nptl/pt-cleanup.c @@ -0,0 +1,64 @@ +/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2002. + + 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 +#include "pthreadP.h" +#include "jmpbuf-unwind.h" + +void +__pthread_cleanup_upto (__jmp_buf target, char *targetframe) +{ + struct pthread *self = THREAD_SELF; + struct _pthread_cleanup_buffer *cbuf; + + /* Adjust all pointers used in comparisons, so that top of thread's + stack is at the top of address space. Without that, things break + if stack is allocated above the main stack. */ + uintptr_t adj = (uintptr_t) self->stackblock + self->stackblock_size; + uintptr_t targetframe_adj = (uintptr_t) targetframe - adj; + + for (cbuf = THREAD_GETMEM (self, cleanup); + cbuf != NULL && _JMPBUF_UNWINDS_ADJ (target, cbuf, adj); + cbuf = cbuf->__prev) + { +#if _STACK_GROWS_DOWN + if ((uintptr_t) cbuf - adj <= targetframe_adj) + { + cbuf = NULL; + break; + } +#elif _STACK_GROWS_UP + if ((uintptr_t) cbuf - adj >= targetframe_adj) + { + cbuf = NULL; + break; + } +#else +# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP" +#endif + + /* Call the cleanup code. */ + cbuf->__routine (cbuf->__arg); + } + + THREAD_SETMEM (self, cleanup, cbuf); +} +hidden_def (__pthread_cleanup_upto) + diff --git a/nptl/pt-longjmp.c b/nptl/pt-longjmp.c deleted file mode 100644 index 2022386c5b..0000000000 --- a/nptl/pt-longjmp.c +++ /dev/null @@ -1,71 +0,0 @@ -/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 2002. - - 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 -#include "pthreadP.h" -#include "jmpbuf-unwind.h" - -void -__pthread_cleanup_upto (__jmp_buf target, char *targetframe) -{ - struct pthread *self = THREAD_SELF; - struct _pthread_cleanup_buffer *cbuf; - - /* Adjust all pointers used in comparisons, so that top of thread's - stack is at the top of address space. Without that, things break - if stack is allocated above the main stack. */ - uintptr_t adj = (uintptr_t) self->stackblock + self->stackblock_size; - uintptr_t targetframe_adj = (uintptr_t) targetframe - adj; - - for (cbuf = THREAD_GETMEM (self, cleanup); - cbuf != NULL && _JMPBUF_UNWINDS_ADJ (target, cbuf, adj); - cbuf = cbuf->__prev) - { -#if _STACK_GROWS_DOWN - if ((uintptr_t) cbuf - adj <= targetframe_adj) - { - cbuf = NULL; - break; - } -#elif _STACK_GROWS_UP - if ((uintptr_t) cbuf - adj >= targetframe_adj) - { - cbuf = NULL; - break; - } -#else -# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP" -#endif - - /* Call the cleanup code. */ - cbuf->__routine (cbuf->__arg); - } - - THREAD_SETMEM (self, cleanup, cbuf); -} -hidden_def (__pthread_cleanup_upto) - - -void -longjmp (jmp_buf env, int val) -{ - __libc_longjmp (env, val); -} -weak_alias (longjmp, siglongjmp) diff --git a/nptl/sysdeps/generic/pt-longjmp.c b/nptl/sysdeps/generic/pt-longjmp.c new file mode 100644 index 0000000000..f161380eaa --- /dev/null +++ b/nptl/sysdeps/generic/pt-longjmp.c @@ -0,0 +1,29 @@ +/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2002. + + 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 +#include "pthreadP.h" + +void +longjmp (jmp_buf env, int val) +{ + __libc_longjmp (env, val); +} +weak_alias (longjmp, siglongjmp) diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/Versions b/nptl/sysdeps/unix/sysv/linux/powerpc/Versions new file mode 100644 index 0000000000..f63cf41358 --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/Versions @@ -0,0 +1,5 @@ +libpthread { + GLIBC_2.3.4 { + longjmp; siglongjmp; + } +} diff --git a/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c b/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c new file mode 100644 index 0000000000..eac52905db --- /dev/null +++ b/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c @@ -0,0 +1,68 @@ +/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2002. + + 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 +#include +#include "pthreadP.h" +#include +#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4) + +/* These functions are not declared anywhere since they shouldn't be + used at another place but here. */ +extern void __novmx__libc_siglongjmp (sigjmp_buf env, int val) + __attribute__ ((noreturn)); +extern void __novmx__libc_longjmp (sigjmp_buf env, int val) + __attribute__ ((noreturn)); + + +void __novmxsiglongjmp (sigjmp_buf env, int val) +{ + __novmx__libc_siglongjmp (env, val); +} + +void __novmxlongjmp (jmp_buf env, int val) +{ + __novmx__libc_longjmp (env, val); +} + +# if __WORDSIZE == 64 +symbol_version (__novmx_longjmp,longjmp,GLIBC_2.3); +symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.3); +# else +symbol_version (__novmx_longjmp,longjmp,GLIBC_2.0); +symbol_version (__novmx_siglongjmp,siglongjmp,GLIBC_2.0); +# endif +#endif /* defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)) */ + +void +__vmx_longjmp (jmp_buf env, int val) +{ + __libc_longjmp (env, val); +} + +void +__vmx_siglongjmp (jmp_buf env, int val) +{ + __libc_siglongjmp (env, val); +} + +versioned_symbol (libc, __vmx_longjmp, longjmp, GLIBC_2_3_4); +versioned_symbol (libc, __vmx_siglongjmp, siglongjmp, GLIBC_2_3_4); + -- cgit 1.4.1