From 93a45ff1ca6d459618bb0cf93580c4b2809a4b61 Mon Sep 17 00:00:00 2001 From: Andreas Krebbel Date: Tue, 7 Jan 2014 09:36:31 +0100 Subject: S/390: Make jmp_buf extendible. --- sysdeps/s390/Makefile | 5 ++ sysdeps/s390/Versions | 11 ++++ sysdeps/s390/__longjmp.c | 31 +++++++++ sysdeps/s390/bits/setjmp.h | 4 ++ sysdeps/s390/longjmp.c | 64 ++++++++++++++++++ sysdeps/s390/rtld-__longjmp.c | 19 ++++++ sysdeps/s390/rtld-setjmp.S | 20 ++++++ sysdeps/s390/s390-32/__longjmp-common.c | 68 +++++++++++++++++++ sysdeps/s390/s390-32/__longjmp.c | 68 ------------------- sysdeps/s390/s390-32/setjmp-common.S | 84 ++++++++++++++++++++++++ sysdeps/s390/s390-32/setjmp.S | 80 ----------------------- sysdeps/s390/s390-64/__longjmp-common.c | 74 +++++++++++++++++++++ sysdeps/s390/s390-64/__longjmp.c | 74 --------------------- sysdeps/s390/s390-64/setjmp-common.S | 79 +++++++++++++++++++++++ sysdeps/s390/s390-64/setjmp.S | 75 --------------------- sysdeps/s390/setjmp.S | 64 ++++++++++++++++++ sysdeps/s390/sigjmp.c | 34 ++++++++++ sysdeps/s390/v1-longjmp.c | 57 ++++++++++++++++ sysdeps/s390/v1-setjmp.h | 111 ++++++++++++++++++++++++++++++++ sysdeps/s390/v1-sigjmp.c | 44 +++++++++++++ 20 files changed, 769 insertions(+), 297 deletions(-) create mode 100644 sysdeps/s390/Makefile create mode 100644 sysdeps/s390/__longjmp.c create mode 100644 sysdeps/s390/longjmp.c create mode 100644 sysdeps/s390/rtld-__longjmp.c create mode 100644 sysdeps/s390/rtld-setjmp.S create mode 100644 sysdeps/s390/s390-32/__longjmp-common.c delete mode 100644 sysdeps/s390/s390-32/__longjmp.c create mode 100644 sysdeps/s390/s390-32/setjmp-common.S delete mode 100644 sysdeps/s390/s390-32/setjmp.S create mode 100644 sysdeps/s390/s390-64/__longjmp-common.c delete mode 100644 sysdeps/s390/s390-64/__longjmp.c create mode 100644 sysdeps/s390/s390-64/setjmp-common.S delete mode 100644 sysdeps/s390/s390-64/setjmp.S create mode 100644 sysdeps/s390/setjmp.S create mode 100644 sysdeps/s390/sigjmp.c create mode 100644 sysdeps/s390/v1-longjmp.c create mode 100644 sysdeps/s390/v1-setjmp.h create mode 100644 sysdeps/s390/v1-sigjmp.c (limited to 'sysdeps/s390') diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile new file mode 100644 index 0000000..fdc6ee5 --- /dev/null +++ b/sysdeps/s390/Makefile @@ -0,0 +1,5 @@ +ifeq ($(subdir),setjmp) +ifeq (yes,$(build-shared)) +sysdep_routines += v1-longjmp v1-sigjmp +endif +endif diff --git a/sysdeps/s390/Versions b/sysdeps/s390/Versions index baf9842..156abc7 100644 --- a/sysdeps/s390/Versions +++ b/sysdeps/s390/Versions @@ -1,3 +1,14 @@ +libc { + GLIBC_2.19 { + setjmp; _setjmp; __setjmp; __sigsetjmp; + longjmp; _longjmp; siglongjmp; + } + GLIBC_PRIVATE { + __v1__libc_longjmp; __v1__libc_siglongjmp; + __v2__libc_longjmp; __v2__libc_siglongjmp; + } +} + ld { GLIBC_2.3 { # runtime interface to TLS diff --git a/sysdeps/s390/__longjmp.c b/sysdeps/s390/__longjmp.c new file mode 100644 index 0000000..e4acd31 --- /dev/null +++ b/sysdeps/s390/__longjmp.c @@ -0,0 +1,31 @@ +/* Copyright (C) 2013 Free Software Foundation, Inc. + 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, see + . */ + +#include +#include + +#define __longjmp __v2__longjmp +#include "__longjmp-common.c" +#undef __longjmp +strong_alias (__v2__longjmp, __longjmp) + +#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19) +# undef __longjmp +# define __V1_JMPBUF +# define __longjmp __v1__longjmp +# include "__longjmp-common.c" +#endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19) */ diff --git a/sysdeps/s390/bits/setjmp.h b/sysdeps/s390/bits/setjmp.h index 0071a9d..25eaf10 100644 --- a/sysdeps/s390/bits/setjmp.h +++ b/sysdeps/s390/bits/setjmp.h @@ -40,6 +40,10 @@ typedef struct __s390_jmp_buf /* We save fpu registers 4 and 6. */ long __fpregs[4]; # endif +#ifndef __V1_JMPBUF + unsigned long __flags; + char __reserved[128]; +#endif } __jmp_buf[1]; #endif diff --git a/sysdeps/s390/longjmp.c b/sysdeps/s390/longjmp.c new file mode 100644 index 0000000..c758d14 --- /dev/null +++ b/sysdeps/s390/longjmp.c @@ -0,0 +1,64 @@ +/* Copyright (C) 2013 Free Software Foundation, Inc. + 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, see + . + + Versioned copy of sysdeps/generic/longjmp.c modified for extended + jmpbuf. */ + +#include +#include +#include +#include + +extern void __v2__longjmp (__jmp_buf __env, int __val) + __attribute__ ((__noreturn__)); +extern void __v2__libc_longjmp (sigjmp_buf env, int val) + __attribute__ ((__noreturn__)); +libc_hidden_proto (__v2__libc_longjmp) + +/* Set the signal mask to the one specified in ENV, and jump + to the position specified in ENV, causing the setjmp + call there to return VAL, or 1 if VAL is 0. */ +void +__v2__libc_siglongjmp (sigjmp_buf env, int val) +{ + /* Perform any cleanups needed by the frames being unwound. */ + _longjmp_unwind (env, val); + + if (env[0].__mask_was_saved) + /* Restore the saved signal mask. */ + (void) __sigprocmask (SIG_SETMASK, &env[0].__saved_mask, + (sigset_t *) NULL); + + /* Call the machine-dependent function to restore machine state. */ + __v2__longjmp (env[0].__jmpbuf, val ?: 1); +} + +#ifndef __v2__longjmp +strong_alias (__v2__libc_siglongjmp, __v2__libc_longjmp) +libc_hidden_def (__v2__libc_longjmp) +weak_alias (__v2__libc_siglongjmp, __v2_longjmp) +weak_alias (__v2__libc_siglongjmp, __v2longjmp) +weak_alias (__v2__libc_siglongjmp, __v2siglongjmp) + +/* These will be used by libpthread only. */ +versioned_symbol (libc, __v2__libc_longjmp, __libc_longjmp, GLIBC_PRIVATE); +versioned_symbol (libc, __v2__libc_siglongjmp, __libc_siglongjmp, GLIBC_PRIVATE); + +versioned_symbol (libc, __v2_longjmp, _longjmp, GLIBC_2_19); +versioned_symbol (libc, __v2longjmp, longjmp, GLIBC_2_19); +versioned_symbol (libc, __v2siglongjmp, siglongjmp, GLIBC_2_19); +#endif /* ifndef __v2__longjmp */ diff --git a/sysdeps/s390/rtld-__longjmp.c b/sysdeps/s390/rtld-__longjmp.c new file mode 100644 index 0000000..5e9f739 --- /dev/null +++ b/sysdeps/s390/rtld-__longjmp.c @@ -0,0 +1,19 @@ +/* Copyright (C) 2013 Free Software Foundation, Inc. + 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, see + . */ + +/* Build a non-versioned object for rtld-*. */ +# include "__longjmp-common.c" diff --git a/sysdeps/s390/rtld-setjmp.S b/sysdeps/s390/rtld-setjmp.S new file mode 100644 index 0000000..4011011 --- /dev/null +++ b/sysdeps/s390/rtld-setjmp.S @@ -0,0 +1,20 @@ +/* Extendible version of setjmp for System z + Copyright (C) 2013 Free Software Foundation, Inc. + 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, see + . */ + +/* Build a non-versioned object for rtld-*. */ +# include "setjmp-common.S" diff --git a/sysdeps/s390/s390-32/__longjmp-common.c b/sysdeps/s390/s390-32/__longjmp-common.c new file mode 100644 index 0000000..f78ef65 --- /dev/null +++ b/sysdeps/s390/s390-32/__longjmp-common.c @@ -0,0 +1,68 @@ +/* Copyright (C) 2000-2014 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Martin Schwidefsky (schwidefsky@de.ibm.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; if not, see + . */ + +#include +#include +#include +#include +#include +#include + +/* Jump to the position specified by ENV, causing the + setjmp call there to return VAL, or 1 if VAL is 0. */ +attribute_hidden void +__longjmp (__jmp_buf env, int val) +{ +#ifdef PTR_DEMANGLE + uintptr_t guard = THREAD_GET_POINTER_GUARD (); +# ifdef CHECK_SP + CHECK_SP (env, guard); +# endif +#elif defined CHECK_SP + CHECK_SP (env, 0); +#endif + register int r2 __asm ("%r2") = val == 0 ? 1 : val; +#ifdef PTR_DEMANGLE + register uintptr_t r3 __asm ("%r3") = guard; + register void *r1 __asm ("%r1") = (void *) env; +#endif + /* Restore registers and jump back. */ + asm volatile ("ld %%f6,48(%1)\n\t" + "ld %%f4,40(%1)\n\t" +#ifdef PTR_DEMANGLE + "lm %%r6,%%r13,0(%1)\n\t" + "lm %%r4,%%r5,32(%1)\n\t" + "xr %%r4,%2\n\t" + "xr %%r5,%2\n\t" + "lr %%r15,%%r5\n\t" + "br %%r4" +#else + "lm %%r6,%%r15,0(%1)\n\t" + "br %%r14" +#endif + : : "r" (r2), +#ifdef PTR_DEMANGLE + "r" (r1), "r" (r3) +#else + "a" (env) +#endif + ); + + /* Avoid `volatile function does return' warnings. */ + for (;;); +} diff --git a/sysdeps/s390/s390-32/__longjmp.c b/sysdeps/s390/s390-32/__longjmp.c deleted file mode 100644 index 5d46e21..0000000 --- a/sysdeps/s390/s390-32/__longjmp.c +++ /dev/null @@ -1,68 +0,0 @@ -/* Copyright (C) 2000-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Martin Schwidefsky (schwidefsky@de.ibm.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; if not, see - . */ - -#include -#include -#include -#include -#include -#include - -/* Jump to the position specified by ENV, causing the - setjmp call there to return VAL, or 1 if VAL is 0. */ -void -__longjmp (__jmp_buf env, int val) -{ -#ifdef PTR_DEMANGLE - uintptr_t guard = THREAD_GET_POINTER_GUARD (); -# ifdef CHECK_SP - CHECK_SP (env, guard); -# endif -#elif defined CHECK_SP - CHECK_SP (env, 0); -#endif - register int r2 __asm ("%r2") = val == 0 ? 1 : val; -#ifdef PTR_DEMANGLE - register uintptr_t r3 __asm ("%r3") = guard; - register void *r1 __asm ("%r1") = (void *) env; -#endif - /* Restore registers and jump back. */ - asm volatile ("ld %%f6,48(%1)\n\t" - "ld %%f4,40(%1)\n\t" -#ifdef PTR_DEMANGLE - "lm %%r6,%%r13,0(%1)\n\t" - "lm %%r4,%%r5,32(%1)\n\t" - "xr %%r4,%2\n\t" - "xr %%r5,%2\n\t" - "lr %%r15,%%r5\n\t" - "br %%r4" -#else - "lm %%r6,%%r15,0(%1)\n\t" - "br %%r14" -#endif - : : "r" (r2), -#ifdef PTR_DEMANGLE - "r" (r1), "r" (r3) -#else - "a" (env) -#endif - ); - - /* Avoid `volatile function does return' warnings. */ - for (;;); -} diff --git a/sysdeps/s390/s390-32/setjmp-common.S b/sysdeps/s390/s390-32/setjmp-common.S new file mode 100644 index 0000000..d7bb720 --- /dev/null +++ b/sysdeps/s390/s390-32/setjmp-common.S @@ -0,0 +1,84 @@ +/* setjmp for s390, ELF version. + Copyright (C) 2000-2014 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, see + . */ + +#include +#define _ASM +#define _SETJMP_H +#include + + /* We include the BSD entry points here as well but we make + them weak. */ +ENTRY (setjmp) + .weak C_SYMBOL_NAME (setjmp) + lhi %r3,1 /* second argument of one */ + j 0f /* branch relativ to __sigsetjmp */ +END (setjmp) + + /* Binary compatibility entry point. */ +ENTRY(_setjmp) + .weak C_SYMBOL_NAME (_setjmp) + lhi %r3,0 /* second argument of zero */ + j 0f /* branch relativ to __sigsetjmp */ +END (_setjmp) +libc_hidden_def (_setjmp) + +ENTRY(__setjmp) + lhi %r3,0 /* second argument of zero */ + j 0f /* branch relativ to __sigsetjmp */ +END (__setjmp) + +ENTRY(__sigsetjmp) +0: +#ifdef PTR_MANGLE + stm %r6,%r13,0(%r2) /* store registers in jmp_buf */ + lr %r4,%r14 + lr %r5,%r15 + PTR_MANGLE (%r4, %r1) + PTR_MANGLE2 (%r5, %r1) + stm %r4,%r5,32(%r2) +#else + stm %r6,%r15,0(%r2) /* store registers in jmp_buf */ +#endif +#ifndef __V1_JMPBUF + lhi %r4,0 + st %r4,56(%r2) /* Set __flags to 0. */ +#endif + std %f4,40(%r2) + std %f6,48(%r2) +#if defined NOT_IN_libc && defined IS_IN_rtld + /* In ld.so we never save the signal mask. */ + lhi %r2,0 + br %r14 +#elif defined PIC + /* We cannot use the PLT, because it requires that %r12 be set, but + we can't save and restore our caller's value. Instead, we do an + indirect jump through the GOT. */ + basr %r1,0 +0: al %r1,1f-0b(0,%r1) /* get address of global offset table */ + /* get address of __sigjmp_save from got */ + l %r1,__sigjmp_save@GOT12(0,%r1) + br %r1 +1: .long _GLOBAL_OFFSET_TABLE_ - 0b +#else + basr %r1,0 +0: l %r1,1f-0b(0,%r1) /* load address of __sigjmp_save */ + br %r1 /* tail-call __sigjmp_save */ +1: .long __sigjmp_save +#endif +END (__sigsetjmp) diff --git a/sysdeps/s390/s390-32/setjmp.S b/sysdeps/s390/s390-32/setjmp.S deleted file mode 100644 index b8a0296..0000000 --- a/sysdeps/s390/s390-32/setjmp.S +++ /dev/null @@ -1,80 +0,0 @@ -/* setjmp for s390, ELF version. - Copyright (C) 2000-2014 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, see - . */ - -#include -#define _ASM -#define _SETJMP_H -#include - - /* We include the BSD entry points here as well but we make - them weak. */ -ENTRY (setjmp) - .weak C_SYMBOL_NAME (setjmp) - lhi %r3,1 /* second argument of one */ - j .Linternal_sigsetjmp /* branch relativ to __sigsetjmp */ -END (setjmp) - - /* Binary compatibility entry point. */ -ENTRY(_setjmp) - .weak C_SYMBOL_NAME (_setjmp) - lhi %r3,0 /* second argument of zero */ - j .Linternal_sigsetjmp /* branch relativ to __sigsetjmp */ -END (_setjmp) -libc_hidden_def (_setjmp) - -ENTRY(__setjmp) - lhi %r3,0 /* second argument of zero */ - j .Linternal_sigsetjmp /* branch relativ to __sigsetjmp */ -END (__setjmp) - -ENTRY(__sigsetjmp) -.Linternal_sigsetjmp: -#ifdef PTR_MANGLE - stm %r6,%r13,0(%r2) /* store registers in jmp_buf */ - lr %r4,%r14 - lr %r5,%r15 - PTR_MANGLE (%r4, %r1) - PTR_MANGLE2 (%r5, %r1) - stm %r4,%r5,32(%r2) -#else - stm %r6,%r15,0(%r2) /* store registers in jmp_buf */ -#endif - std %f4,40(%r2) - std %f6,48(%r2) -#if defined NOT_IN_libc && defined IS_IN_rtld - /* In ld.so we never save the signal mask. */ - lhi %r2,0 - br %r14 -#elif defined PIC - /* We cannot use the PLT, because it requires that %r12 be set, but - we can't save and restore our caller's value. Instead, we do an - indirect jump through the GOT. */ - basr %r1,0 -.L0: al %r1,.L1 - .L0(0,%r1) /* get address of global offset table */ - /* get address of __sigjmp_save from got */ - l %r1,__sigjmp_save@GOT12(0,%r1) - br %r1 -.L1: .long _GLOBAL_OFFSET_TABLE_ - .L0 -#else - basr %r1,0 -.L0: l %r1,.L1-.L0(0,%r1) /* load address of __sigjmp_save */ - br %r1 /* tail-call __sigjmp_save */ -.L1: .long __sigjmp_save -#endif -END (__sigsetjmp) diff --git a/sysdeps/s390/s390-64/__longjmp-common.c b/sysdeps/s390/s390-64/__longjmp-common.c new file mode 100644 index 0000000..46cabb6 --- /dev/null +++ b/sysdeps/s390/s390-64/__longjmp-common.c @@ -0,0 +1,74 @@ +/* Copyright (C) 2001-2014 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Martin Schwidefsky (schwidefsky@de.ibm.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; if not, see + . */ + +#include +#include +#include +#include +#include +#include + +/* Jump to the position specified by ENV, causing the + setjmp call there to return VAL, or 1 if VAL is 0. */ +attribute_hidden void +__longjmp (__jmp_buf env, int val) +{ +#ifdef PTR_DEMANGLE + uintptr_t guard = THREAD_GET_POINTER_GUARD (); +# ifdef CHECK_SP + CHECK_SP (env, guard); +# endif +#elif defined CHECK_SP + CHECK_SP (env, 0); +#endif + register long int r2 __asm ("%r2") = val == 0 ? 1 : val; +#ifdef PTR_DEMANGLE + register uintptr_t r3 __asm ("%r3") = guard; + register void *r1 __asm ("%r1") = (void *) env; +#endif + /* Restore registers and jump back. */ + asm volatile ("ld %%f8,80(%1)\n\t" + "ld %%f9,88(%1)\n\t" + "ld %%f10,96(%1)\n\t" + "ld %%f11,104(%1)\n\t" + "ld %%f12,112(%1)\n\t" + "ld %%f13,120(%1)\n\t" + "ld %%f14,128(%1)\n\t" + "ld %%f15,136(%1)\n\t" +#ifdef PTR_DEMANGLE + "lmg %%r6,%%r13,0(%1)\n\t" + "lmg %%r4,%%r5,64(%1)\n\t" + "xgr %%r4,%2\n\t" + "xgr %%r5,%2\n\t" + "lgr %%r15,%%r5\n\t" + "br %%r4" +#else + "lmg %%r6,%%r15,0(%1)\n\t" + "br %%r14" +#endif + : : "r" (r2), +#ifdef PTR_DEMANGLE + "r" (r1), "r" (r3) +#else + "a" (env) +#endif + ); + + /* Avoid `volatile function does return' warnings. */ + for (;;); +} diff --git a/sysdeps/s390/s390-64/__longjmp.c b/sysdeps/s390/s390-64/__longjmp.c deleted file mode 100644 index 168ebf5..0000000 --- a/sysdeps/s390/s390-64/__longjmp.c +++ /dev/null @@ -1,74 +0,0 @@ -/* Copyright (C) 2001-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Martin Schwidefsky (schwidefsky@de.ibm.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; if not, see - . */ - -#include -#include -#include -#include -#include -#include - -/* Jump to the position specified by ENV, causing the - setjmp call there to return VAL, or 1 if VAL is 0. */ -void -__longjmp (__jmp_buf env, int val) -{ -#ifdef PTR_DEMANGLE - uintptr_t guard = THREAD_GET_POINTER_GUARD (); -# ifdef CHECK_SP - CHECK_SP (env, guard); -# endif -#elif defined CHECK_SP - CHECK_SP (env, 0); -#endif - register long int r2 __asm ("%r2") = val == 0 ? 1 : val; -#ifdef PTR_DEMANGLE - register uintptr_t r3 __asm ("%r3") = guard; - register void *r1 __asm ("%r1") = (void *) env; -#endif - /* Restore registers and jump back. */ - asm volatile ("ld %%f8,80(%1)\n\t" - "ld %%f9,88(%1)\n\t" - "ld %%f10,96(%1)\n\t" - "ld %%f11,104(%1)\n\t" - "ld %%f12,112(%1)\n\t" - "ld %%f13,120(%1)\n\t" - "ld %%f14,128(%1)\n\t" - "ld %%f15,136(%1)\n\t" -#ifdef PTR_DEMANGLE - "lmg %%r6,%%r13,0(%1)\n\t" - "lmg %%r4,%%r5,64(%1)\n\t" - "xgr %%r4,%2\n\t" - "xgr %%r5,%2\n\t" - "lgr %%r15,%%r5\n\t" - "br %%r4" -#else - "lmg %%r6,%%r15,0(%1)\n\t" - "br %%r14" -#endif - : : "r" (r2), -#ifdef PTR_DEMANGLE - "r" (r1), "r" (r3) -#else - "a" (env) -#endif - ); - - /* Avoid `volatile function does return' warnings. */ - for (;;); -} diff --git a/sysdeps/s390/s390-64/setjmp-common.S b/sysdeps/s390/s390-64/setjmp-common.S new file mode 100644 index 0000000..9cdcae4 --- /dev/null +++ b/sysdeps/s390/s390-64/setjmp-common.S @@ -0,0 +1,79 @@ +/* setjmp for 64 bit S/390, ELF version. + Copyright (C) 2001-2014 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, see + . */ + +#include +#define _ASM +#define _SETJMP_H +#include + + /* We include the BSD entry points here as well but we make + them weak. */ +ENTRY (setjmp) + .weak C_SYMBOL_NAME (setjmp) + lghi %r3,1 /* Second argument of one. */ + j 0f /* Branch relativ to __sigsetjmp. */ +END (setjmp) + + /* Binary compatibility entry point. */ +ENTRY(_setjmp) + .weak C_SYMBOL_NAME (_setjmp) + slgr %r3,%r3 /* Second argument of zero. */ + j 0f /* Branch relativ to __sigsetjmp. */ +END (_setjmp) +libc_hidden_def (_setjmp) + +ENTRY(__setjmp) + slgr %r3,%r3 /* Second argument of zero. */ + j 0f /* Branch relativ to __sigsetjmp. */ +END (__setjmp) + +ENTRY(__sigsetjmp) +0: +#ifdef PTR_MANGLE + stmg %r6,%r13,0(%r2) /* Store registers in jmp_buf. */ + lgr %r4,%r14 + lgr %r5,%r15 + PTR_MANGLE (%r4, %r1) + PTR_MANGLE2 (%r5, %r1) + stmg %r4,%r5,64(%r2) +#else + stmg %r6,%r15,0(%r2) /* Store registers in jmp_buf. */ +#endif +#ifndef __V1_JMPBUF + lghi %r4,0 + stg %r4,144(%r2) /* Set __flags to 0. */ +#endif + std %f8,80(%r2) + std %f9,88(%r2) + std %f10,96(%r2) + std %f11,104(%r2) + std %f12,112(%r2) + std %f13,120(%r2) + std %f14,128(%r2) + std %f15,136(%r2) +#if defined NOT_IN_libc && defined IS_IN_rtld + /* In ld.so we never save the signal mask. */ + lghi %r2,0 + br %r14 +#elif defined PIC + jg __sigjmp_save@PLT /* Branch to PLT of __sigsetjmp. */ +#else + jg __sigjmp_save +#endif +END (__sigsetjmp) diff --git a/sysdeps/s390/s390-64/setjmp.S b/sysdeps/s390/s390-64/setjmp.S deleted file mode 100644 index 5462dab..0000000 --- a/sysdeps/s390/s390-64/setjmp.S +++ /dev/null @@ -1,75 +0,0 @@ -/* setjmp for 64 bit S/390, ELF version. - Copyright (C) 2001-2014 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, see - . */ - -#include -#define _ASM -#define _SETJMP_H -#include - - /* We include the BSD entry points here as well but we make - them weak. */ -ENTRY (setjmp) - .weak C_SYMBOL_NAME (setjmp) - lghi %r3,1 /* Second argument of one. */ - j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */ -END (setjmp) - - /* Binary compatibility entry point. */ -ENTRY(_setjmp) - .weak C_SYMBOL_NAME (_setjmp) - slgr %r3,%r3 /* Second argument of zero. */ - j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */ -END (setjmp) -libc_hidden_def (_setjmp) - -ENTRY(__setjmp) - slgr %r3,%r3 /* Second argument of zero. */ - j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */ -END (setjmp) - -ENTRY(__sigsetjmp) -.Linternal_sigsetjmp: -#ifdef PTR_MANGLE - stmg %r6,%r13,0(%r2) /* Store registers in jmp_buf. */ - lgr %r4,%r14 - lgr %r5,%r15 - PTR_MANGLE (%r4, %r1) - PTR_MANGLE2 (%r5, %r1) - stmg %r4,%r5,64(%r2) -#else - stmg %r6,%r15,0(%r2) /* Store registers in jmp_buf. */ -#endif - std %f8,80(%r2) - std %f9,88(%r2) - std %f10,96(%r2) - std %f11,104(%r2) - std %f12,112(%r2) - std %f13,120(%r2) - std %f14,128(%r2) - std %f15,136(%r2) -#if defined NOT_IN_libc && defined IS_IN_rtld - /* In ld.so we never save the signal mask. */ - lghi %r2,0 - br %r14 -#elif defined PIC - jg __sigjmp_save@PLT /* Branch to PLT of __sigsetjmp. */ -#else - jg __sigjmp_save -#endif -END (__sigsetjmp) diff --git a/sysdeps/s390/setjmp.S b/sysdeps/s390/setjmp.S new file mode 100644 index 0000000..2ec621a --- /dev/null +++ b/sysdeps/s390/setjmp.S @@ -0,0 +1,64 @@ +/* Extendible version of setjmp for System z + Copyright (C) 2013 Free Software Foundation, Inc. + 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, see + . */ + +#include +#include + +versioned_symbol (libc, __v2setjmp, setjmp, GLIBC_2_19) +versioned_symbol (libc, __v2_setjmp, _setjmp, GLIBC_2_19) +versioned_symbol (libc, __v2__setjmp, __setjmp, GLIBC_2_19) +versioned_symbol (libc, __v2__sigsetjmp, __sigsetjmp, GLIBC_2_19) +#define setjmp __v2setjmp +#define _setjmp __v2_setjmp +#define __setjmp __v2__setjmp +#define __sigsetjmp __v2__sigsetjmp +#define __sigjmp_save __v2__sigjmp_save + +#include "setjmp-common.S" + +#undef setjmp +#undef _setjmp +#undef __setjmp +#undef __sigsetjmp +#undef __sigjmp_save +libc_hidden_ver (__v2setjmp, setjmp) +libc_hidden_ver (__v2_setjmp, _setjmp) +libc_hidden_ver (__v2__setjmp, __setjmp) +libc_hidden_ver (__v2__sigsetjmp, __sigsetjmp) + +#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19) +compat_symbol (libc, __v1setjmp, setjmp, GLIBC_2_0) +compat_symbol (libc, __v1_setjmp, _setjmp, GLIBC_2_0) +compat_symbol (libc, __v1__setjmp, __setjmp, GLIBC_2_0) +compat_symbol (libc, __v1__sigsetjmp, __sigsetjmp, GLIBC_2_0) +# define setjmp __v1setjmp +# define _setjmp __v1_setjmp +# define __setjmp __v1__setjmp +# define __sigsetjmp __v1__sigsetjmp +# define __sigjmp_save __v1__sigjmp_save +# define __V1_JMPBUF + +# include "setjmp-common.S" + +# undef setjmp +# undef _setjmp +# undef __setjmp +# undef __sigsetjmp +# undef __sigjmp_save + +#endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19) */ diff --git a/sysdeps/s390/sigjmp.c b/sysdeps/s390/sigjmp.c new file mode 100644 index 0000000..f7b5a6f --- /dev/null +++ b/sysdeps/s390/sigjmp.c @@ -0,0 +1,34 @@ +/* Copyright (C) 1992-2013 Free Software Foundation, Inc. + 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, see + . */ + +#include +#include +#include + +/* This function is called by the `sigsetjmp' macro + before doing a `__setjmp' on ENV[0].__jmpbuf. + Always return zero. */ + +int +__v2__sigjmp_save (sigjmp_buf env, int savemask) +{ + env[0].__mask_was_saved = (savemask && + __sigprocmask (SIG_BLOCK, (sigset_t *) NULL, + &env[0].__saved_mask) == 0); + + return 0; +} diff --git a/sysdeps/s390/v1-longjmp.c b/sysdeps/s390/v1-longjmp.c new file mode 100644 index 0000000..82252c9 --- /dev/null +++ b/sysdeps/s390/v1-longjmp.c @@ -0,0 +1,57 @@ +/* Copyright (C) 2013 Free Software Foundation, Inc. + 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, see + . + + Versioned copy of sysdeps/generic/longjmp.c modified for extended + jmpbuf. */ + +#include +#include +#include +#include "v1-setjmp.h" + +#if !defined NOT_INT_libc && defined SHARED +# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19) + +void +__v1__libc_siglongjmp (__v1__sigjmp_buf env, int val) +{ + /* Perform any cleanups needed by the frames being unwound. */ + _longjmp_unwind (env, val); + + if (env[0].__mask_was_saved) + /* Restore the saved signal mask. */ + (void) __sigprocmask (SIG_SETMASK, &env[0].__saved_mask, + (sigset_t *) NULL); + + /* Call the machine-dependent function to restore machine state. */ + __v1__longjmp (env[0].__jmpbuf, val ?: 1); +} + +# ifndef __v1__longjmp +strong_alias (__v1__libc_siglongjmp, __v1__libc_longjmp) +libc_hidden_def (__v1__libc_longjmp) +weak_alias (__v1__libc_siglongjmp, __v1_longjmp) +weak_alias (__v1__libc_siglongjmp, __v1longjmp) +weak_alias (__v1__libc_siglongjmp, __v1siglongjmp) + +compat_symbol (libc, __v1_longjmp, _longjmp, GLIBC_2_0); +compat_symbol (libc, __v1longjmp, longjmp, GLIBC_2_0); +compat_symbol (libc, __v1siglongjmp, siglongjmp, GLIBC_2_0); + +# endif /* ifndef __v1__longjmp */ +# endif /* SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19) */ +#endif /* if !defined NOT_INT_libc && defined SHARED */ diff --git a/sysdeps/s390/v1-setjmp.h b/sysdeps/s390/v1-setjmp.h new file mode 100644 index 0000000..a4a6b76 --- /dev/null +++ b/sysdeps/s390/v1-setjmp.h @@ -0,0 +1,111 @@ +/* Copyright (C) 1991-2013 Free Software Foundation, Inc. + 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, see + . */ + +/* + * ISO C99 Standard: 7.13 Nonlocal jumps + */ + +#ifndef _V1_SETJMP_H +#define _V1_SETJMP_H 1 + +#include + +__BEGIN_DECLS + +#define __V1_JMPBUF +#define _SETJMP_H +#include /* Get `__jmp_buf'. */ + +#ifndef _ASM + +#include /* Get `__sigset_t'. */ + + +/* Calling environment, plus possibly a saved signal mask. */ +typedef struct __v1__jmp_buf_tag + { + /* NOTE: The machine-dependent definitions of `__sigsetjmp' + assume that a `jmp_buf' begins with a `__jmp_buf' and that + `__mask_was_saved' follows it. Do not move these members + or add others before it. */ + __jmp_buf __jmpbuf; /* Calling environment. */ + int __mask_was_saved; /* Saved the signal mask? */ + __sigset_t __saved_mask; /* Saved signal mask. */ + } __v1__jmp_buf[1]; + + +/* Store the calling environment in ENV, also saving the signal mask. + Return 0. */ +extern int __v1setjmp (__v1__jmp_buf __env); + +/* Store the calling environment in ENV, also saving the + signal mask if SAVEMASK is nonzero. Return 0. + This is the internal name for `sigsetjmp'. */ +extern int __v1__sigsetjmp (struct __v1__jmp_buf_tag __env[1], + int __savemask); + +/* Store the calling environment in ENV, not saving the signal mask. + Return 0. */ +extern int __v1_setjmp (struct __v1__jmp_buf_tag __env[1]); + +/* Jump to the environment saved in ENV, making the + `setjmp' call there return VAL, or 1 if VAL is 0. */ +extern void __v1longjmp (struct __v1__jmp_buf_tag __env[1], int __val) + __attribute__ ((__noreturn__)); + +/* Same. Usually `_longjmp' is used with `_setjmp', which does not save + the signal mask. But it is how ENV was saved that determines whether + `longjmp' restores the mask; `_longjmp' is just an alias. */ +extern void __v1_longjmp (struct __v1__jmp_buf_tag __env[1], int __val) + __attribute__ ((__noreturn__)); + +/* Use the same type for `jmp_buf' and `sigjmp_buf'. + The `__mask_was_saved' flag determines whether + or not `longjmp' will restore the signal mask. */ +typedef struct __v1__jmp_buf_tag __v1__sigjmp_buf[1]; + +/* Jump to the environment saved in ENV, making the + sigsetjmp call there return VAL, or 1 if VAL is 0. + Restore the signal mask if that sigsetjmp call saved it. + This is just an alias `longjmp'. */ +extern void __v1siglongjmp (__v1__sigjmp_buf __env, int __val) + __attribute__ ((__noreturn__)); + +/* Internal machine-dependent function to restore context sans signal mask. */ +extern void __v1__longjmp (__jmp_buf __env, int __val) + __attribute__ ((__noreturn__)); + +/* Internal function to possibly save the current mask of blocked signals + in ENV, and always set the flag saying whether or not it was saved. + This is used by the machine-dependent definition of `__sigsetjmp'. + Always returns zero, for convenience. */ +extern int __v1__sigjmp_save (__v1__jmp_buf __env, int __savemask); + +extern void _longjmp_unwind (__v1__jmp_buf env, int val); + +extern void __v1__libc_siglongjmp (__v1__sigjmp_buf env, int val) + __attribute__ ((noreturn)); + +extern void __v1__libc_longjmp (__v1__sigjmp_buf env, int val) + __attribute__ ((noreturn)); + +libc_hidden_proto (__v1__libc_longjmp) +libc_hidden_proto (__v1_setjmp) +libc_hidden_proto (__v1__sigsetjmp) +#endif /* !_ASM */ + +#endif /* ifndef _V1_SETJMP_H */ diff --git a/sysdeps/s390/v1-sigjmp.c b/sysdeps/s390/v1-sigjmp.c new file mode 100644 index 0000000..b624d16 --- /dev/null +++ b/sysdeps/s390/v1-sigjmp.c @@ -0,0 +1,44 @@ +/* Copyright (C) 1992-2013 Free Software Foundation, Inc. + 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, see + . + + Copied from setjmp/sigjmp.c for extending jmp_buf. */ + +#include +#include + +#if !defined NOT_IN_libc && defined SHARED +# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19) +# include +# include +# include + +/* This function is called by the `sigsetjmp' macro + before doing a `__setjmp' on ENV[0].__jmpbuf. + Always return zero. */ + +int +__v1__sigjmp_save (__v1__sigjmp_buf env, int savemask) +{ + env[0].__mask_was_saved = (savemask && + __sigprocmask (SIG_BLOCK, (sigset_t *) NULL, + &env[0].__saved_mask) == 0); + + return 0; +} + +# endif /* SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_19) */ +#endif /* !NOT_IN_libc && SHARED */ -- cgit v1.1