This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
[PATCH] NPTL enable Altivec for setjmp/longjmp part 5 of 5
- From: Steve Munroe <sjmunroe at us dot ibm dot com>
- To: libc-alpha at sources dot redhat dot com
- Cc: dgm69 at us dot ibm dot com, Segher Boessenkoof <segher at kernel dot crashing dot org>, janis187 at us dot ibm dot com
- Date: Wed, 11 Feb 2004 17:05:40 -0600
- Subject: [PATCH] NPTL enable Altivec for setjmp/longjmp part 5 of 5
- Organization: IBM LTC
- Reply-to: sjmunroe at vnet dot ibm dot com
With changes to merge trivial differences between the 32-/64-bit source
into common powerpc source.
2004-01-29 Steven Munroe <sjmunroe@us.ibm.com>
* 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.
diff -urN libc23-cvstip-20040210/nptl/Makefile libc23/nptl/Makefile
--- libc23-cvstip-20040210/nptl/Makefile 2004-01-08 12:20:58.000000000 -0600
+++ libc23/nptl/Makefile 2004-02-11 10:50:05.000000000 -0600
@@ -99,7 +99,7 @@
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 -urN libc23-cvstip-20040210/nptl/pt-cleanup.c libc23/nptl/pt-cleanup.c
--- libc23-cvstip-20040210/nptl/pt-cleanup.c Wed Dec 31 17:00:00 1969
+++ libc23/nptl/pt-cleanup.c Wed Feb 11 10:50:05 2004
@@ -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 <drepper@redhat.com>, 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 <setjmp.h>
+#include <stdlib.h>
+#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 -urN libc23-cvstip-20040210/nptl/pt-longjmp.c libc23/nptl/pt-longjmp.c
--- libc23-cvstip-20040210/nptl/pt-longjmp.c Thu Dec 18 19:31:08 2003
+++ libc23/nptl/pt-longjmp.c Wed Dec 31 17:00:00 1969
@@ -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 <drepper@redhat.com>, 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 <setjmp.h>
-#include <stdlib.h>
-#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 -urN libc23-cvstip-20040210/nptl/sysdeps/generic/pt-longjmp.c libc23/nptl/sysdeps/generic/pt-longjmp.c
--- libc23-cvstip-20040210/nptl/sysdeps/generic/pt-longjmp.c Wed Dec 31 17:00:00 1969
+++ libc23/nptl/sysdeps/generic/pt-longjmp.c Wed Feb 11 10:50:05 2004
@@ -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 <drepper@redhat.com>, 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 <setjmp.h>
+#include <stdlib.h>
+#include "pthreadP.h"
+
+void
+longjmp (jmp_buf env, int val)
+{
+ __libc_longjmp (env, val);
+}
+weak_alias (longjmp, siglongjmp)
diff -urN libc23-cvstip-20040210/nptl/sysdeps/unix/sysv/linux/powerpc/Versions libc23/nptl/sysdeps/unix/sysv/linux/powerpc/Versions
--- libc23-cvstip-20040210/nptl/sysdeps/unix/sysv/linux/powerpc/Versions Wed Dec 31 17:00:00 1969
+++ libc23/nptl/sysdeps/unix/sysv/linux/powerpc/Versions Wed Feb 11 10:50:05 2004
@@ -0,0 +1,5 @@
+libpthread {
+ GLIBC_2.3.4 {
+ longjmp; siglongjmp;
+ }
+}
diff -urN libc23-cvstip-20040210/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c libc23/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c
--- libc23-cvstip-20040210/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c Wed Dec 31 17:00:00 1969
+++ libc23/nptl/sysdeps/unix/sysv/linux/powerpc/pt-longjmp.c Wed Feb 11 10:50:05 2004
@@ -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 <drepper@redhat.com>, 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 <setjmp.h>
+#include <stdlib.h>
+#include <bits/wordsize.h>
+#include "pthreadP.h"
+#include <shlib-compat.h>
+#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);
+