From 5c76ff279fa8fd1425b86a39fe75507660cc0b5c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 14 Feb 2004 05:16:57 +0000 Subject: Update. 2004-02-13 Steven Munroe * sysdeps/powerpc/powerpc64/__longjmp-common.S: New file. * sysdeps/powerpc/powerpc64/__longjmp.S [NOT_IN_libc](__longjmp): Non-versioned __longjmp for rtld-__longjmp. [!NOT_IN_libc](__vmx__longjmp): Add VMX reg support and define as default version of __longjmp. [SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)] (__novmx__longjmp): Original version of __longjmp. * sysdeps/powerpc/powerpc64/bsd-_setjmp.S [NOT_IN_libc](_setjmp): Non-versioned _setjmp for rtld-_setjmp. [!NOT_IN_libc](__vmx_setjmp): Branch to __vmx__sigsetjmp and define as default version of _setjmp. [SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)] (__novmx_setjmp): Original version of _setjmp. * sysdeps/powerpc/powerpc64/bsd-setjmp.S (__vmxsetjmp): Branch to __vmx__sigsetjmp and define as default version of setjmp. [SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)] (__novmxsetjmp): Original version of setjmp. * sysdeps/powerpc/powerpc64/setjmp-common.S: New file. * sysdeps/powerpc/powerpc64/setjmp.S [NOT_IN_libc](__setjmp): Non-versioned __sigsetjmp for rtld-setjmp. [!NOT_IN_libc](__vmx__sigsetjmp): Add VMX reg support and define as default version of __sigsetjmp. [SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)] (__novmx__sigsetjmp): Original version of __sigsetjmp. * sysdeps/powerpc/powerpc32/__longjmp-common.S: New File * sysdeps/powerpc/powerpc32/__longjmp.S [NOT_IN_libc](__longjmp): Non-versioned __longjmp for rtld-__longjmp. [!NOT_IN_libc](__vmx__longjmp): Add VMX reg support and define as default version of __longjmp. [SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)] (__novmx__longjmp): Original version of __longjmp. * sysdeps/powerpc/powerpc32/bsd-_setjmp.S [NOT_IN_libc](_setjmp): Non-versioned _setjmp for rtld-_setjmp. [!NOT_IN_libc](__vmx_setjmp): Branch to __vmx__sigsetjmp and define as default version of _setjmp. [SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)] (__novmx_setjmp): Original version of _setjmp. * sysdeps/powerpc/powerpc32/bsd-setjmp.S (__vmxsetjmp): Branch to __vmx__sigsetjmp and define as default version of setjmp. [SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)] (__novmxsetjmp): Original version of setjmp. * sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S: New file. * sysdeps/powerpc/powerpc32/fpu/__longjmp.S [NOT_IN_libc](__longjmp): Non-versioned __longjmp for rtld-__longjmp. [!NOT_IN_libc](__vmx__longjmp): Add VMX reg support and define as default version of __longjmp. [SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)] (__novmx__longjmp): Original version of __longjmp. * sysdeps/powerpc/powerpc32/fpu/setjmp-common.S: New file. * sysdeps/powerpc/powerpc32/fpu/setjmp.S [NOT_IN_libc](__setjmp): Non-versioned __sigsetjmp for rtld-setjmp. [!NOT_IN_libc](__vmx__sigsetjmp): Add VMX reg support and define as default version of __sigsetjmp. [SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)] (__novmx__sigsetjmp): Original version of __sigsetjmp. * sysdeps/powerpc/powerpc32/setjmp-common.S: New file. * sysdeps/powerpc/powerpc32/setjmp.S [NOT_IN_libc](__setjmp): Non-versioned __sigsetjmp for rtld-setjmp. [!NOT_IN_libc](__vmx__sigsetjmp): Add VMX reg support and define as default version of __sigsetjmp. [SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)] (__novmx__sigsetjmp): Original version of __sigsetjmp. * sysdeps/powerpc/Dist: New File. * sysdeps/powerpc/Makefile (sysdep_routines): Add novmx-longjmp.c and novmx-sigjmp.c * sysdeps/powerpc/Versions (libc): To GLIBC_2.3_4 add _longjmp, __sigsetjmp, _setjmp, longjmp, and setjmp. To GLIBC_PRIVATE add __novmx__libc_longjmp, __novmx__libc_siglongjmp, __vmx__libc_longjmp, and __vmx__libc_siglongjmp. * sysdeps/powerpc/bits/setjmp.h: Define JB_VRSAVE, JB_VRS, and adjust JB_SIZE to add VMX regs to __jmp_buf. * sysdeps/powerpc/longjmp.c: New file. * sysdeps/powerpc/novmxsetjmp.h: New file. * sysdeps/powerpc/novmx-longjmp.c: New file. * sysdeps/powerpc/novmx-sigjmp.c: New file. * sysdeps/powerpc/sigjmp.c: New file. --- sysdeps/powerpc/powerpc64/__longjmp-common.S | 153 ++++++++++++++++++++++++ sysdeps/powerpc/powerpc64/__longjmp.S | 79 ++++--------- sysdeps/powerpc/powerpc64/bsd-_setjmp.S | 46 ++++++- sysdeps/powerpc/powerpc64/bsd-setjmp.S | 42 ++++++- sysdeps/powerpc/powerpc64/setjmp-common.S | 171 +++++++++++++++++++++++++++ sysdeps/powerpc/powerpc64/setjmp.S | 97 +++++---------- 6 files changed, 454 insertions(+), 134 deletions(-) create mode 100644 sysdeps/powerpc/powerpc64/__longjmp-common.S create mode 100644 sysdeps/powerpc/powerpc64/setjmp-common.S (limited to 'sysdeps/powerpc/powerpc64') diff --git a/sysdeps/powerpc/powerpc64/__longjmp-common.S b/sysdeps/powerpc/powerpc64/__longjmp-common.S new file mode 100644 index 0000000000..df316234d9 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/__longjmp-common.S @@ -0,0 +1,153 @@ +/* longjmp for PowerPC64. + Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004 + 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#define _ASM +#define _SETJMP_H +#ifdef __NO_VMX__ +# include +#else +# include +#endif +#include +#include + +#ifndef __NO_VMX__ + .section ".toc","aw" +.LC__dl_hwcap: +#ifdef SHARED + .tc _rtld_global[TC],_rtld_global +#else + .tc _dl_hwcap[TC],_dl_hwcap +#endif + .section ".text" +#endif + +ENTRY (BP_SYM (__longjmp)) + CHECK_BOUNDS_BOTH_WIDE_LIT (r3, r8, r9, JB_SIZE) +#ifndef __NO_VMX__ + ld r5,.LC__dl_hwcap@toc(r2) +#ifdef SHARED + /* Load _rtld-global._dl_hwcap. */ + ld r5,RTLD_GLOBAL_DL_HWCAP_OFFSET(r5) +#else + ld r5,0(r5) /* Load extern _dl_hwcap. */ +#endif + andis. r5,r5,(PPC_FEATURE_HAS_ALTIVEC >> 16) + beq no_vmx + la r5,((JB_VRS)*8)(3) + andi. r6,r5,0xf + lwz r0,((JB_VRSAVE)*8)(3) + mtspr VRSAVE,r0 + beq+ aligned_restore_vmx + addi r6,r5,16 + lvsl v0,0,r5 + lvx v1,0,r5 + addi r5,r5,32 + lvx v21,0,r6 + vperm v20,v1,v21,v0 +#define load_misaligned_vmx_lo_loaded(loadvr,lovr,shiftvr,loadgpr,addgpr) \ + addi addgpr,addgpr,32; \ + lvx lovr,0,loadgpr; \ + vperm loadvr,loadvr,lovr,shiftvr; + load_misaligned_vmx_lo_loaded(v21,v22,v0,r5,r6) + load_misaligned_vmx_lo_loaded(v22,v23,v0,r6,r5) + load_misaligned_vmx_lo_loaded(v23,v24,v0,r5,r6) + load_misaligned_vmx_lo_loaded(v24,v25,v0,r6,r5) + load_misaligned_vmx_lo_loaded(v25,v26,v0,r5,r6) + load_misaligned_vmx_lo_loaded(v26,v27,v0,r6,r5) + load_misaligned_vmx_lo_loaded(v27,v28,v0,r5,r6) + load_misaligned_vmx_lo_loaded(v28,v29,v0,r6,r5) + load_misaligned_vmx_lo_loaded(v29,v30,v0,r5,r6) + load_misaligned_vmx_lo_loaded(v30,v31,v0,r6,r5) + lvx v1,0,r5 + vperm v31,v31,v1,v0 + b no_vmx +aligned_restore_vmx: + addi r6,r5,16 + lvx v20,0,r5 + addi r5,r5,32 + lvx v21,0,r6 + addi r6,r6,32 + lvx v22,0,r5 + addi r5,r5,32 + lvx v23,0,r6 + addi r6,r6,32 + lvx v24,0,r5 + addi r5,r5,32 + lvx v25,0,r6 + addi r6,r6,32 + lvx v26,0,r5 + addi r5,r5,32 + lvx v27,0,r6 + addi r6,r6,32 + lvx v28,0,r5 + addi r5,r5,32 + lvx v29,0,r6 + addi r6,r6,32 + lvx v30,0,r5 + lvx v31,0,r6 +no_vmx: +#endif + ld r1,(JB_GPR1*8)(r3) + ld r2,(JB_GPR2*8)(r3) + ld r0,(JB_LR*8)(r3) + ld r14,((JB_GPRS+0)*8)(r3) + lfd fp14,((JB_FPRS+0)*8)(r3) + ld r15,((JB_GPRS+1)*8)(r3) + lfd fp15,((JB_FPRS+1)*8)(r3) + ld r16,((JB_GPRS+2)*8)(r3) + lfd fp16,((JB_FPRS+2)*8)(r3) + ld r17,((JB_GPRS+3)*8)(r3) + lfd fp17,((JB_FPRS+3)*8)(r3) + ld r18,((JB_GPRS+4)*8)(r3) + lfd fp18,((JB_FPRS+4)*8)(r3) + ld r19,((JB_GPRS+5)*8)(r3) + lfd fp19,((JB_FPRS+5)*8)(r3) + ld r20,((JB_GPRS+6)*8)(r3) + lfd fp20,((JB_FPRS+6)*8)(r3) + mtlr r0 + ld r21,((JB_GPRS+7)*8)(r3) + lfd fp21,((JB_FPRS+7)*8)(r3) + ld r22,((JB_GPRS+8)*8)(r3) + lfd fp22,((JB_FPRS+8)*8)(r3) + ld r0,(JB_CR*8)(r3) + ld r23,((JB_GPRS+9)*8)(r3) + lfd fp23,((JB_FPRS+9)*8)(r3) + ld r24,((JB_GPRS+10)*8)(r3) + lfd fp24,((JB_FPRS+10)*8)(r3) + ld r25,((JB_GPRS+11)*8)(r3) + lfd fp25,((JB_FPRS+11)*8)(r3) + mtcrf 0xFF,r0 + ld r26,((JB_GPRS+12)*8)(r3) + lfd fp26,((JB_FPRS+12)*8)(r3) + ld r27,((JB_GPRS+13)*8)(r3) + lfd fp27,((JB_FPRS+13)*8)(r3) + ld r28,((JB_GPRS+14)*8)(r3) + lfd fp28,((JB_FPRS+14)*8)(r3) + ld r29,((JB_GPRS+15)*8)(r3) + lfd fp29,((JB_FPRS+15)*8)(r3) + ld r30,((JB_GPRS+16)*8)(r3) + lfd fp30,((JB_FPRS+16)*8)(r3) + ld r31,((JB_GPRS+17)*8)(r3) + lfd fp31,((JB_FPRS+17)*8)(r3) + mr r3,r4 + blr +END (BP_SYM (__longjmp)) diff --git a/sysdeps/powerpc/powerpc64/__longjmp.S b/sysdeps/powerpc/powerpc64/__longjmp.S index e4152126b1..88b6cfcd78 100644 --- a/sysdeps/powerpc/powerpc64/__longjmp.S +++ b/sysdeps/powerpc/powerpc64/__longjmp.S @@ -1,6 +1,5 @@ -/* longjmp for PowerPC64. - Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002 - Free Software Foundation, Inc. +/* AltiVec/VMX (new) version of __longjmp for PowerPC64. + Copyright (C) 1995-1997, 1999-2002, 2004 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 @@ -18,57 +17,25 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include -#define _ASM -#define _SETJMP_H -#include -#include -#include +#include +#include +#include -ENTRY (BP_SYM (__longjmp)) - CHECK_BOUNDS_BOTH_WIDE_LIT (r3, r8, r9, JB_SIZE) - ld r1,(JB_GPR1*8)(r3) - ld r2,(JB_GPR2*8)(r3) - ld r0,(JB_LR*8)(r3) - ld r14,((JB_GPRS+0)*8)(r3) - lfd fp14,((JB_FPRS+0)*8)(r3) - ld r15,((JB_GPRS+1)*8)(r3) - lfd fp15,((JB_FPRS+1)*8)(r3) - ld r16,((JB_GPRS+2)*8)(r3) - lfd fp16,((JB_FPRS+2)*8)(r3) - ld r17,((JB_GPRS+3)*8)(r3) - lfd fp17,((JB_FPRS+3)*8)(r3) - ld r18,((JB_GPRS+4)*8)(r3) - lfd fp18,((JB_FPRS+4)*8)(r3) - ld r19,((JB_GPRS+5)*8)(r3) - lfd fp19,((JB_FPRS+5)*8)(r3) - ld r20,((JB_GPRS+6)*8)(r3) - lfd fp20,((JB_FPRS+6)*8)(r3) - mtlr r0 - ld r21,((JB_GPRS+7)*8)(r3) - lfd fp21,((JB_FPRS+7)*8)(r3) - ld r22,((JB_GPRS+8)*8)(r3) - lfd fp22,((JB_FPRS+8)*8)(r3) - ld r0,(JB_CR*8)(r3) - ld r23,((JB_GPRS+9)*8)(r3) - lfd fp23,((JB_FPRS+9)*8)(r3) - ld r24,((JB_GPRS+10)*8)(r3) - lfd fp24,((JB_FPRS+10)*8)(r3) - ld r25,((JB_GPRS+11)*8)(r3) - lfd fp25,((JB_FPRS+11)*8)(r3) - mtcrf 0xFF,r0 - ld r26,((JB_GPRS+12)*8)(r3) - lfd fp26,((JB_FPRS+12)*8)(r3) - ld r27,((JB_GPRS+13)*8)(r3) - lfd fp27,((JB_FPRS+13)*8)(r3) - ld r28,((JB_GPRS+14)*8)(r3) - lfd fp28,((JB_FPRS+14)*8)(r3) - ld r29,((JB_GPRS+15)*8)(r3) - lfd fp29,((JB_FPRS+15)*8)(r3) - ld r30,((JB_GPRS+16)*8)(r3) - lfd fp30,((JB_FPRS+16)*8)(r3) - ld r31,((JB_GPRS+17)*8)(r3) - lfd fp31,((JB_FPRS+17)*8)(r3) - mr r3,r4 - blr -END (BP_SYM (__longjmp)) +#if defined NOT_IN_libc +/* Build a none versioned object for rtld-*. */ +# include "__longjmp-common.S" + +#else /* !NOT_IN_libc */ +/* Build a versioned object for libc. */ +default_symbol_version (__vmx__longjmp,__longjmp,GLIBC_2.3.4) +# define __longjmp __vmx__longjmp +# include "__longjmp-common.S" + +# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4) +# define __NO_VMX__ +# undef __longjmp +symbol_version(__novmx__longjmp,__longjmp,GLIBC_2.3) +# define __longjmp __novmx__longjmp +# include "__longjmp-common.S" +# endif +#endif /* !NOT_IN_libc */ diff --git a/sysdeps/powerpc/powerpc64/bsd-_setjmp.S b/sysdeps/powerpc/powerpc64/bsd-_setjmp.S index 994f82f851..1b15fedd64 100644 --- a/sysdeps/powerpc/powerpc64/bsd-_setjmp.S +++ b/sysdeps/powerpc/powerpc64/bsd-_setjmp.S @@ -1,5 +1,6 @@ -/* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. PowerPC64 version. - Copyright (C) 2002 Free Software Foundation, Inc. +/* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. PowerPC32/64 version. + Copyright (C) 1994, 1997, 1999, 2000, 2002, 2003, 2004 + 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 @@ -16,6 +17,43 @@ 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 -/* This code was moved into setjmp.S to solve a double stub call problem. - @local would have worked but it is not supported in PowerPC64 asm. */ +#if defined NOT_IN_libc +/* Build a none versioned object for rtld-*. */ +ENTRY (BP_SYM (_setjmp)) + li r4,0 /* Set second argument to 0. */ + b JUMPTARGET(BP_SYM (__sigsetjmp)) +END (BP_SYM (_setjmp)) +libc_hidden_def (_setjmp) + +#else +/* Build a versioned object for libc. */ +# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4) +symbol_version (__novmx_setjmp,_setjmp,GLIBC_2.3); + +ENTRY (BP_SYM (__novmx_setjmp)) + li r4,0 /* Set second argument to 0. */ + b JUMPTARGET(BP_SYM (__novmx__sigsetjmp)) +END (BP_SYM (__novmx_setjmp)) +libc_hidden_def (__novmx_setjmp) +# endif /* defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4) */ + +default_symbol_version (__vmx_setjmp,_setjmp,GLIBC_2.3.4) +/* __GI__setjmp prototype is needed for ntpl i.e. _setjmp is defined + as a libc_hidden_proto & is used in sysdeps/generic/libc-start.c + if HAVE_CLEANUP_JMP_BUF is defined */ +ENTRY (BP_SYM (__GI__setjmp)) + li r4,0 /* Set second argument to 0. */ + b JUMPTARGET(BP_SYM (__vmx__sigsetjmp)) +END (BP_SYM (__GI__setjmp)) + +ENTRY (BP_SYM (__vmx_setjmp)) + li r4,0 /* Set second argument to 0. */ + b JUMPTARGET(BP_SYM (__vmx__sigsetjmp)) +END (BP_SYM (__vmx_setjmp)) +libc_hidden_def (__vmx_setjmp) +#endif /* !NOT_IN_libc */ diff --git a/sysdeps/powerpc/powerpc64/bsd-setjmp.S b/sysdeps/powerpc/powerpc64/bsd-setjmp.S index b6bb8f6e08..e83fe53a92 100644 --- a/sysdeps/powerpc/powerpc64/bsd-setjmp.S +++ b/sysdeps/powerpc/powerpc64/bsd-setjmp.S @@ -1,5 +1,5 @@ -/* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. PowerPC version. - Copyright (C) 2002 Free Software Foundation, Inc. +/* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. PowerPC32/64 version. + Copyright (C) 1994,1997,1999,2000,2003,2004 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 @@ -16,6 +16,40 @@ 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 -/* This code was moved into setjmp.S to solve a double stub call problem. - @local would have worked but it is not supported in PowerPC64 asm. */ +#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4) + +/* We need 2 copies of identicatal code for the setjmp's as gas complains + erronously about having multiple versions of setjmp this eliminates the + need for the strong alias of __setjmp to setjmp which + does not support versioning i.e. another gas unimplemented feature. */ +symbol_version (__novmx__setjmp,__setjmp,GLIBC_2.3) +symbol_version (__novmxsetjmp,setjmp,GLIBC_2.3) + +ENTRY (BP_SYM (__novmxsetjmp)) + li r4,1 /* Set second argument to 1. */ + b JUMPTARGET (BP_SYM (__novmx__sigsetjmp)) +END (BP_SYM (__novmxsetjmp)) + +ENTRY (BP_SYM (__novmx__setjmp)) + li r4,1 /* Set second argument to 1. */ + b JUMPTARGET (BP_SYM (__novmx__sigsetjmp)) +END (BP_SYM (__novmx__setjmp)) +#endif /* defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4) */ + +default_symbol_version (__vmx__setjmp,__setjmp,GLIBC_2.3.4) +default_symbol_version (__vmxsetjmp,setjmp,GLIBC_2.3.4) + +ENTRY (BP_SYM (__vmxsetjmp)) + li r4,1 /* Set second argument to 1. */ + b JUMPTARGET (BP_SYM (__vmx__sigsetjmp)) +END (BP_SYM (__vmxsetjmp)) + +ENTRY (BP_SYM (__vmx__setjmp)) + li r4,1 /* Set second argument to 1. */ + b JUMPTARGET (BP_SYM (__vmx__sigsetjmp)) +END (BP_SYM (__vmx__setjmp)) diff --git a/sysdeps/powerpc/powerpc64/setjmp-common.S b/sysdeps/powerpc/powerpc64/setjmp-common.S new file mode 100644 index 0000000000..541b5d4276 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/setjmp-common.S @@ -0,0 +1,171 @@ +/* setjmp for PowerPC64. + Copyright (C) 1995-2003, 2004 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#define _ASM +#define _SETJMP_H +#ifdef __NO_VMX__ +#include +#else +#include +#endif +#include +#include + +#ifndef __NO_VMX__ + .section ".toc","aw" +.LC__dl_hwcap: +#ifdef SHARED + .tc _rtld_global[TC],_rtld_global +#else + .tc _dl_hwcap[TC],_dl_hwcap +#endif + .section ".text" +#endif + +ENTRY (BP_SYM (__sigsetjmp)) + CHECK_BOUNDS_BOTH_WIDE_LIT (r3, r8, r9, JB_SIZE) + std r1,(JB_GPR1*8)(3) + mflr r0 + std r2,(JB_GPR2*8)(3) + std r14,((JB_GPRS+0)*8)(3) + stfd fp14,((JB_FPRS+0)*8)(3) + std r0,(JB_LR*8)(3) + std r15,((JB_GPRS+1)*8)(3) + stfd fp15,((JB_FPRS+1)*8)(3) + mfcr r0 + std r16,((JB_GPRS+2)*8)(3) + stfd fp16,((JB_FPRS+2)*8)(3) + std r0,(JB_CR*8)(3) + std r17,((JB_GPRS+3)*8)(3) + stfd fp17,((JB_FPRS+3)*8)(3) + std r18,((JB_GPRS+4)*8)(3) + stfd fp18,((JB_FPRS+4)*8)(3) + std r19,((JB_GPRS+5)*8)(3) + stfd fp19,((JB_FPRS+5)*8)(3) + std r20,((JB_GPRS+6)*8)(3) + stfd fp20,((JB_FPRS+6)*8)(3) + std r21,((JB_GPRS+7)*8)(3) + stfd fp21,((JB_FPRS+7)*8)(3) + std r22,((JB_GPRS+8)*8)(3) + stfd fp22,((JB_FPRS+8)*8)(3) + std r23,((JB_GPRS+9)*8)(3) + stfd fp23,((JB_FPRS+9)*8)(3) + std r24,((JB_GPRS+10)*8)(3) + stfd fp24,((JB_FPRS+10)*8)(3) + std r25,((JB_GPRS+11)*8)(3) + stfd fp25,((JB_FPRS+11)*8)(3) + std r26,((JB_GPRS+12)*8)(3) + stfd fp26,((JB_FPRS+12)*8)(3) + std r27,((JB_GPRS+13)*8)(3) + stfd fp27,((JB_FPRS+13)*8)(3) + std r28,((JB_GPRS+14)*8)(3) + stfd fp28,((JB_FPRS+14)*8)(3) + std r29,((JB_GPRS+15)*8)(3) + stfd fp29,((JB_FPRS+15)*8)(3) + std r30,((JB_GPRS+16)*8)(3) + stfd fp30,((JB_FPRS+16)*8)(3) + std r31,((JB_GPRS+17)*8)(3) + stfd fp31,((JB_FPRS+17)*8)(3) +#ifndef __NO_VMX__ + ld r5,.LC__dl_hwcap@toc(r2) +#ifdef SHARED + /* Load _rtld-global._dl_hwcap. */ + ld r5,RTLD_GLOBAL_DL_HWCAP_OFFSET(r5) +#else + ld r5,0(r5) /* Load extern _dl_hwcap. */ +#endif + andis. r5,r5,(PPC_FEATURE_HAS_ALTIVEC >> 16) + beq no_vmx + la r5,((JB_VRS)*8)(3) + andi. r6,r5,0xf + mfspr r0,VRSAVE + stw r0,((JB_VRSAVE)*8)(3) + addi r6,r5,16 + beq+ aligned_save_vmx + lvsr v0,0,r5 + vspltisb v1,-1 /* set v1 to all 1's */ + vspltisb v2,0 /* set v2 to all 0's */ + vperm v3,v2,v1,v0 /* v3 contains shift mask with num all 1 bytes + on left = misalignment */ + + + /* Special case for v20 we need to preserve what is in save area + below v20 before obliterating it */ + lvx v5,0,r5 + vperm v20,v20,v20,v0 + vsel v5,v5,v20,v3 + vsel v20,v20,v2,v3 + stvx v5,0,r5 + +#define save_2vmx_partial(savevr,prev_savevr,hivr,shiftvr,maskvr,savegpr,addgpr) \ + addi addgpr,addgpr,32; \ + vperm savevr,savevr,savevr,shiftvr; \ + vsel hivr,prev_savevr,savevr,maskvr; \ + stvx hivr,0,savegpr; + + save_2vmx_partial(v21,v20,v5,v0,v3,r6,r5) + save_2vmx_partial(v22,v21,v5,v0,v3,r5,r6) + save_2vmx_partial(v23,v22,v5,v0,v3,r6,r5) + save_2vmx_partial(v24,v23,v5,v0,v3,r5,r6) + save_2vmx_partial(v25,v24,v5,v0,v3,r6,r5) + save_2vmx_partial(v26,v25,v5,v0,v3,r5,r6) + save_2vmx_partial(v27,v26,v5,v0,v3,r6,r5) + save_2vmx_partial(v28,v27,v5,v0,v3,r5,r6) + save_2vmx_partial(v29,v28,v5,v0,v3,r6,r5) + save_2vmx_partial(v30,v29,v5,v0,v3,r5,r6) + + /* Special case for r31 we need to preserve what is in save area + above v31 before obliterating it */ + addi r5,r5,32 + vperm v31,v31,v31,v0 + lvx v4,0,r5 + vsel v5,v30,v31,v3 + stvx v5,0,r6 + vsel v4,v31,v4,v3 + stvx v4,0,r5 + b no_vmx + +aligned_save_vmx: + stvx 20,0,r5 + addi r5,r5,32 + stvx 21,0,r6 + addi r6,r6,32 + stvx 22,0,r5 + addi r5,r5,32 + stvx 23,0,r6 + addi r6,r6,32 + stvx 24,0,r5 + addi r5,r5,32 + stvx 25,0,r6 + addi r6,r6,32 + stvx 26,0,r5 + addi r5,r5,32 + stvx 27,0,r6 + addi r6,r6,32 + stvx 28,0,r5 + addi r5,r5,32 + stvx 29,0,r6 + addi r6,r6,32 + stvx 30,0,r5 + stvx 31,0,r6 +no_vmx: +#endif + b JUMPTARGET (BP_SYM (__sigjmp_save)) +END (BP_SYM (__sigsetjmp)) diff --git a/sysdeps/powerpc/powerpc64/setjmp.S b/sysdeps/powerpc/powerpc64/setjmp.S index 4ee6c9447a..77653836ad 100644 --- a/sysdeps/powerpc/powerpc64/setjmp.S +++ b/sysdeps/powerpc/powerpc64/setjmp.S @@ -1,6 +1,5 @@ -/* setjmp for PowerPC64. - Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002 - Free Software Foundation, Inc. +/* AltiVec (new) version of setjmp for PowerPC. + Copyright (C) 1995-97, 1999-2002, 2004 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 @@ -18,70 +17,28 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include -#define _ASM -#define _SETJMP_H -#include -#include -#include - -ENTRY (BP_SYM (__sigsetjmp)) - CHECK_BOUNDS_BOTH_WIDE_LIT (r3, r8, r9, JB_SIZE) -___sigsetjmp: - std r1,(JB_GPR1*8)(3) - mflr r0 - std r2,(JB_GPR2*8)(3) - std r14,((JB_GPRS+0)*8)(3) - stfd fp14,((JB_FPRS+0)*8)(3) - std r0,(JB_LR*8)(3) - std r15,((JB_GPRS+1)*8)(3) - stfd fp15,((JB_FPRS+1)*8)(3) - mfcr r0 - std r16,((JB_GPRS+2)*8)(3) - stfd fp16,((JB_FPRS+2)*8)(3) - std r0,(JB_CR*8)(3) - std r17,((JB_GPRS+3)*8)(3) - stfd fp17,((JB_FPRS+3)*8)(3) - std r18,((JB_GPRS+4)*8)(3) - stfd fp18,((JB_FPRS+4)*8)(3) - std r19,((JB_GPRS+5)*8)(3) - stfd fp19,((JB_FPRS+5)*8)(3) - std r20,((JB_GPRS+6)*8)(3) - stfd fp20,((JB_FPRS+6)*8)(3) - std r21,((JB_GPRS+7)*8)(3) - stfd fp21,((JB_FPRS+7)*8)(3) - std r22,((JB_GPRS+8)*8)(3) - stfd fp22,((JB_FPRS+8)*8)(3) - std r23,((JB_GPRS+9)*8)(3) - stfd fp23,((JB_FPRS+9)*8)(3) - std r24,((JB_GPRS+10)*8)(3) - stfd fp24,((JB_FPRS+10)*8)(3) - std r25,((JB_GPRS+11)*8)(3) - stfd fp25,((JB_FPRS+11)*8)(3) - std r26,((JB_GPRS+12)*8)(3) - stfd fp26,((JB_FPRS+12)*8)(3) - std r27,((JB_GPRS+13)*8)(3) - stfd fp27,((JB_FPRS+13)*8)(3) - std r28,((JB_GPRS+14)*8)(3) - stfd fp28,((JB_FPRS+14)*8)(3) - std r29,((JB_GPRS+15)*8)(3) - stfd fp29,((JB_FPRS+15)*8)(3) - std r30,((JB_GPRS+16)*8)(3) - stfd fp30,((JB_FPRS+16)*8)(3) - std r31,((JB_GPRS+17)*8)(3) - stfd fp31,((JB_FPRS+17)*8)(3) - b JUMPTARGET (BP_SYM (__sigjmp_save)) -END (BP_SYM (__sigsetjmp)) - -ENTRY (BP_SYM (_setjmp)) - li r4,0 /* Set second argument to 0. */ - b ___sigsetjmp -END (BP_SYM (_setjmp)) -libc_hidden_def (_setjmp) - -ENTRY (BP_SYM (__setjmp)) - li r4,1 /* Set second argument to 1. */ - b ___sigsetjmp -END (BP_SYM (__setjmp)) - -strong_alias (__setjmp, setjmp) +#include +#include +#include + +#if defined NOT_IN_libc +/* Build a none versioned object for rtld-*. */ +# include "setjmp-common.S" + +#else /* !NOT_IN_libc */ +/* Build a versioned object for libc. */ +default_symbol_version (__vmx__sigsetjmp,__sigsetjmp,GLIBC_2.3.4) +# define __sigsetjmp __vmx__sigsetjmp +# define __sigjmp_save __vmx__sigjmp_save +# include "setjmp-common.S" + +# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4) +# undef __sigsetjmp +# undef __sigjmp_save +# define __NO_VMX__ +symbol_version (__novmx__sigsetjmp,__sigsetjmp,GLIBC_2.3) +# define __sigsetjmp __novmx__sigsetjmp +# define __sigjmp_save __novmx__sigjmp_save +# include "setjmp-common.S" +# endif +#endif /* !NOT_IN_libc */ -- cgit v1.2.3