This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] PPC enable Alitvec hardware, part 3 revision a


Reissue of the PPC64 get/setcontext changes for Altivec with changes to use _dl_hwcap directly. Plus eliminated unecessary Version changes.
2004-01-12  Steven Munroe  <sjmunroe@us.ibm.com>

	* sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions: Add GLIBC_2.3.4
	versions for setcontext, getcontext, swapcontext, and makecontext.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S 
	(__getcontext):  Upgrade to save Altivec regs and version GLIBC_2_3_4.
	[SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)](__novec_getcontext): 
	Compatible with GLIBC_2.3.3 release.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S 
	(__setcontext):  Upgrade to restore Altivec regs and version GLIBC_2_3_4.
	[SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)](__novec_setcontext): 
	Compatible with GLIBC_2.3.3 release.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S (__swapcontext):
	Upgrade to swap Altivec regs and version GLIBC_2_3_4.
	[SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)](__novec_swapcontext): 
	Compatible with GLIBC_2.3.3 release.
	* sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.h
	(SIGCONTEXT_PT_REGS, SIGCONTEXT_GP_REGS, SIGCONTEXT_FP_REGS, 
	SIGCONTEXT_V_REGS_PTR, SIGCONTEXT_V_RESERVE): Defined.

diff -urN libc23-cvstip-20040102/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions
--- libc23-cvstip-20040102/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions	2002-10-02 03:33:48.000000000 -0500
+++ libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions	2004-01-11 10:49:53.000000000 -0600
@@ -14,4 +14,9 @@
     # s*
     scandir64; 
   }
+  GLIBC_2.3.4 {
+    getcontext;
+    setcontext; 
+    swapcontext;
+  }
 }
diff -urN libc23-cvstip-20040102/sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S
--- libc23-cvstip-20040102/sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S	2003-02-03 15:13:00.000000000 -0600
+++ libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/getcontext.S	2004-01-12 14:47:04.000000000 -0600
@@ -1,5 +1,5 @@
 /* Save current context.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 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,6 +18,8 @@
    02111-1307 USA.  */
 
 #include <sysdep.h>
+#include <rtld-global-offsets.h>
+#include <shlib-compat.h>
 #include "kernel-features.h"
 
 #define __ASSEMBLY__
@@ -25,7 +27,9 @@
 #include <asm/errno.h>
 #include "ucontext_i.h"
 
-ENTRY(__getcontext)
+
+#if SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)
+ENTRY(__novec_getcontext)
 #ifdef __ASSUME_NEW_RT_SIGRETURN_SYSCALL
   std  r0,(SIGCONTEXT_GP_REGS+(PT_R0*8))(r3)
   std  r1,(SIGCONTEXT_GP_REGS+(PT_R1*8))(r3)
@@ -146,6 +150,256 @@
   addi  r1,r1,128
   mtlr  r0
   blr
+PSEUDO_END(__novec_getcontext)
+
+compat_symbol (libc, __novec_getcontext, getcontext, GLIBC_2_3)
+
+#endif
+
+	.section	".toc","aw"
+.LC__dl_hwcap:
+#ifdef SHARED
+	.tc _rtld_global[TC],_rtld_global
+#else
+	.tc _dl_hwcap[TC],_dl_hwcap
+#endif	
+	.section ".text"
+
+ENTRY(__getcontext)
+#ifdef __ASSUME_NEW_RT_SIGRETURN_SYSCALL
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_R0*8))(r3)
+  std  r1,(SIGCONTEXT_GP_REGS+(PT_R1*8))(r3)
+  mflr  r0
+  std  r2,(SIGCONTEXT_GP_REGS+(PT_R2*8))(r3)
+  std  r0,FRAME_LR_SAVE(r1)
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_LNK*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_NIP*8))(r3)
+  stdu  r1,-128(r1)
+  std  r4,(SIGCONTEXT_GP_REGS+(PT_R4*8))(r3)
+  std  r5,(SIGCONTEXT_GP_REGS+(PT_R5*8))(r3)
+  std  r6,(SIGCONTEXT_GP_REGS+(PT_R6*8))(r3)
+  std  r7,(SIGCONTEXT_GP_REGS+(PT_R7*8))(r3)
+  std  r8,(SIGCONTEXT_GP_REGS+(PT_R8*8))(r3)
+  std  r9,(SIGCONTEXT_GP_REGS+(PT_R9*8))(r3)
+  std  r10,(SIGCONTEXT_GP_REGS+(PT_R10*8))(r3)
+  std  r11,(SIGCONTEXT_GP_REGS+(PT_R11*8))(r3)
+  std  r12,(SIGCONTEXT_GP_REGS+(PT_R12*8))(r3)
+  std  r13,(SIGCONTEXT_GP_REGS+(PT_R13*8))(r3)
+  std  r14,(SIGCONTEXT_GP_REGS+(PT_R14*8))(r3)
+  std  r15,(SIGCONTEXT_GP_REGS+(PT_R15*8))(r3)
+  std  r16,(SIGCONTEXT_GP_REGS+(PT_R16*8))(r3)
+  std  r17,(SIGCONTEXT_GP_REGS+(PT_R17*8))(r3)
+  std  r18,(SIGCONTEXT_GP_REGS+(PT_R18*8))(r3)
+  std  r19,(SIGCONTEXT_GP_REGS+(PT_R19*8))(r3)
+  std  r20,(SIGCONTEXT_GP_REGS+(PT_R20*8))(r3)
+  std  r21,(SIGCONTEXT_GP_REGS+(PT_R21*8))(r3)
+  std  r22,(SIGCONTEXT_GP_REGS+(PT_R22*8))(r3)
+  std  r23,(SIGCONTEXT_GP_REGS+(PT_R23*8))(r3)
+  std  r24,(SIGCONTEXT_GP_REGS+(PT_R24*8))(r3)
+  std  r25,(SIGCONTEXT_GP_REGS+(PT_R25*8))(r3)
+  std  r26,(SIGCONTEXT_GP_REGS+(PT_R26*8))(r3)
+  std  r27,(SIGCONTEXT_GP_REGS+(PT_R27*8))(r3)
+  std  r28,(SIGCONTEXT_GP_REGS+(PT_R28*8))(r3)
+  std  r29,(SIGCONTEXT_GP_REGS+(PT_R29*8))(r3)
+  std  r30,(SIGCONTEXT_GP_REGS+(PT_R30*8))(r3)
+  std  r31,(SIGCONTEXT_GP_REGS+(PT_R31*8))(r3)
+  mfctr  r0
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_CTR*8))(r3)
+  mfxer  r0
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_XER*8))(r3)
+  mfcr  r0
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_CCR*8))(r3)
+  
+  /* Set the return value of swapcontext to "success".  R3 is the only 
+     register whose value is not preserved in the saved context.  */
+  li   r0,0
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_R3*8))(r3)
+  
+  /* Zero fill fields that can't be set in user state or are unused.  */
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_MSR*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(34*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_SOFTE*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(40*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(41*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(42*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_RESULT*8))(r3)
+  
+  /* Set the PT_REGS pointer to the address of sigcontext's gp_regs 
+     field.  Struct pt_regs and elf_gregset_t are the same thing.  
+     We kept the regs field for backwards compatibility with
+     libraries built before we extended sigcontext.  */
+  addi r0,r3,SIGCONTEXT_GP_REGS
+  std  r0,SIGCONTEXT_PT_REGS(r3)
+  
+  stfd  fp0,(SIGCONTEXT_FP_REGS+(PT_R0*8))(r3)
+  stfd  fp1,(SIGCONTEXT_FP_REGS+(PT_R1*8))(r3)
+  stfd  fp2,(SIGCONTEXT_FP_REGS+(PT_R2*8))(r3)
+  stfd  fp3,(SIGCONTEXT_FP_REGS+(PT_R3*8))(r3)
+  stfd  fp4,(SIGCONTEXT_FP_REGS+(PT_R4*8))(r3)
+  stfd  fp5,(SIGCONTEXT_FP_REGS+(PT_R5*8))(r3)
+  stfd  fp6,(SIGCONTEXT_FP_REGS+(PT_R6*8))(r3)
+  stfd  fp7,(SIGCONTEXT_FP_REGS+(PT_R7*8))(r3)
+  stfd  fp8,(SIGCONTEXT_FP_REGS+(PT_R8*8))(r3)
+  stfd  fp9,(SIGCONTEXT_FP_REGS+(PT_R9*8))(r3)
+  stfd  fp10,(SIGCONTEXT_FP_REGS+(PT_R10*8))(r3)
+  stfd  fp11,(SIGCONTEXT_FP_REGS+(PT_R11*8))(r3)
+  stfd  fp12,(SIGCONTEXT_FP_REGS+(PT_R12*8))(r3)
+  stfd  fp13,(SIGCONTEXT_FP_REGS+(PT_R13*8))(r3)
+  stfd  fp14,(SIGCONTEXT_FP_REGS+(PT_R14*8))(r3)
+  stfd  fp15,(SIGCONTEXT_FP_REGS+(PT_R15*8))(r3)
+  stfd  fp16,(SIGCONTEXT_FP_REGS+(PT_R16*8))(r3)
+  stfd  fp17,(SIGCONTEXT_FP_REGS+(PT_R17*8))(r3)
+  stfd  fp18,(SIGCONTEXT_FP_REGS+(PT_R18*8))(r3)
+  stfd  fp19,(SIGCONTEXT_FP_REGS+(PT_R19*8))(r3)
+  stfd  fp20,(SIGCONTEXT_FP_REGS+(PT_R20*8))(r3)
+  stfd  fp21,(SIGCONTEXT_FP_REGS+(PT_R21*8))(r3)
+  stfd  fp22,(SIGCONTEXT_FP_REGS+(PT_R22*8))(r3)
+  stfd  fp23,(SIGCONTEXT_FP_REGS+(PT_R23*8))(r3)
+  stfd  fp24,(SIGCONTEXT_FP_REGS+(PT_R24*8))(r3)
+  stfd  fp25,(SIGCONTEXT_FP_REGS+(PT_R25*8))(r3)
+  stfd  fp26,(SIGCONTEXT_FP_REGS+(PT_R26*8))(r3)
+  stfd  fp27,(SIGCONTEXT_FP_REGS+(PT_R27*8))(r3)
+  stfd  fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r3)
+  stfd  fp29,(SIGCONTEXT_GP_REGS+(PT_R29*8))(r3)
+  mffs  fp0
+  stfd  fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r3)
+  stfd  fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r3)
+  stfd  fp0,(SIGCONTEXT_FP_REGS+(32*8))(r3)
+  
+  ld    r5,.LC__dl_hwcap@toc(r2)
+  li    r10,0
+#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   L(has_no_vec)
+  
+  la    r10,(SIGCONTEXT_V_RESERVE+8)(r3)
+  la    r9,(SIGCONTEXT_V_RESERVE+24)(r3)
+  clrrdi  r10,r10,4
+  clrrdi  r9,r9,4
+  
+  stvx  v0,0,r10  
+  stvx  v1,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v2,0,r10  
+  stvx  v3,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v4,0,r10  
+  stvx  v5,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v6,0,r10  
+  stvx  v7,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v8,0,r10  
+  stvx  v9,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v10,0,r10  
+  stvx  v11,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v12,0,r10  
+  stvx  v13,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v14,0,r10  
+  stvx  v15,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v16,0,r10  
+  stvx  v17,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v18,0,r10  
+  stvx  v11,0,r9
+  addi  r19,r10,32
+  addi  r9,r9,32
+  
+  stvx  v20,0,r10  
+  stvx  v21,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v22,0,r10  
+  stvx  v23,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v24,0,r10  
+  stvx  v25,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v26,0,r10  
+  stvx  v27,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v28,0,r10  
+  stvx  v29,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v30,0,r10  
+  stvx  v31,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v10,0,r10  
+  stvx  v11,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  mfvscr  v0
+  mfspr r0,VRSAVE
+  stvx  v0,0,r10
+  stw   r0,0(9)
+  
+L(has_no_vec):
+/* 
+   Store either a NULL or a quadword aligned pointer to the Vector register
+   array into *v_regs.
+*/
+  std   r10,(SIGCONTEXT_V_REGS_PTR)(r3)
+  
+  addi  r5,r3,UCONTEXT_SIGMASK
+  li  r4,0
+  li  r3,SIG_BLOCK
+  bl  JUMPTARGET(sigprocmask)
+  nop
+#else
+  /* If the kernel is not at least 2.4.21 then generate a ENOSYS stub.  */
+  mflr r0
+  std  r0,FRAME_LR_SAVE(r1)
+  stdu r1,-128(r1)
+  li   r3,ENOSYS
+  bl   JUMPTARGET(__syscall_error)
+  nop
+  li   r3,-1
+#endif
+  
+  ld    r0,128+FRAME_LR_SAVE(r1)  
+  addi  r1,r1,128
+  mtlr  r0
+  blr
 PSEUDO_END(__getcontext)
 
-weak_alias(__getcontext, getcontext)
+versioned_symbol (libc, __getcontext, getcontext, GLIBC_2_3_4)
+
diff -urN libc23-cvstip-20040102/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S
--- libc23-cvstip-20040102/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S	2003-02-03 15:13:00.000000000 -0600
+++ libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/makecontext.S	2004-01-11 10:48:18.000000000 -0600
@@ -1,5 +1,5 @@
 /* Create new context.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 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
diff -urN libc23-cvstip-20040102/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S
--- libc23-cvstip-20040102/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S	2003-02-03 15:13:00.000000000 -0600
+++ libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/setcontext.S	2004-01-12 15:23:29.000000000 -0600
@@ -1,5 +1,5 @@
 /* Switch to context.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 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,6 +18,8 @@
    02111-1307 USA.  */
 
 #include <sysdep.h>
+#include <rtld-global-offsets.h>
+#include <shlib-compat.h>
 #include "kernel-features.h"
 
 #define __ASSEMBLY__
@@ -25,6 +27,171 @@
 #include "ucontext_i.h"
 #include <asm/errno.h>
 
+#if SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)
+ENTRY(__novec_setcontext)
+#ifdef __ASSUME_NEW_RT_SIGRETURN_SYSCALL
+  mflr  r0
+  std   r31,-8(1)
+  std   r0,FRAME_LR_SAVE(r1)
+  stdu  r1,-128(r1)
+  mr    r31,r3
+
+/*
+ * If this ucontext refers to the point where we were interrupted
+ * by a signal, we have to use the rt_sigreturn system call to
+ * return to the context so we get both LR and CTR restored.
+ *
+ * Otherwise, the context we are restoring is either just after
+ * a procedure call (getcontext/swapcontext) or at the beginning
+ * of a procedure call (makecontext), so we don't need to restore
+ * msr and ctr.  We don't restore r13 since it will be used as
+ * the TLS pointer.  */
+  lwz	  r0,(SIGCONTEXT_GP_REGS+(PT_MSR*8))(r31)
+  cmpdi r0,0
+  bne	  L(nv_do_sigret)
+
+  li    r5,0
+  addi  r4,r3,UCONTEXT_SIGMASK
+  li    r3,SIG_SETMASK
+  bl    JUMPTARGET(sigprocmask)
+  nop
+  cmpdi r3,0
+  bne   L(nv_error_exit)
+
+  lfd  fp0,(SIGCONTEXT_FP_REGS+(32*8))(r31)
+  lfd  fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r31)	
+  lfd  fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r31)
+  mtfsf  0xff,fp0
+  lfd  fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31)	
+  lfd  fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31)
+  lfd  fp27,(SIGCONTEXT_FP_REGS+(PT_R27*8))(r31)	
+  lfd  fp26,(SIGCONTEXT_FP_REGS+(PT_R26*8))(r31)
+  lfd  fp25,(SIGCONTEXT_FP_REGS+(PT_R25*8))(r31)	
+  lfd  fp24,(SIGCONTEXT_FP_REGS+(PT_R24*8))(r31)
+  lfd  fp23,(SIGCONTEXT_FP_REGS+(PT_R23*8))(r31)	
+  lfd  fp22,(SIGCONTEXT_FP_REGS+(PT_R22*8))(r31)
+  lfd  fp21,(SIGCONTEXT_FP_REGS+(PT_R21*8))(r31)	
+  lfd  fp20,(SIGCONTEXT_FP_REGS+(PT_R20*8))(r31)
+  lfd  fp19,(SIGCONTEXT_FP_REGS+(PT_R19*8))(r31)	
+  lfd  fp18,(SIGCONTEXT_FP_REGS+(PT_R18*8))(r31)
+  lfd  fp17,(SIGCONTEXT_FP_REGS+(PT_R17*8))(r31)	
+  lfd  fp16,(SIGCONTEXT_FP_REGS+(PT_R16*8))(r31)
+  lfd  fp15,(SIGCONTEXT_FP_REGS+(PT_R15*8))(r31)	
+  lfd  fp14,(SIGCONTEXT_FP_REGS+(PT_R14*8))(r31)
+  lfd  fp13,(SIGCONTEXT_FP_REGS+(PT_R13*8))(r31)	
+  lfd  fp12,(SIGCONTEXT_FP_REGS+(PT_R12*8))(r31)
+  lfd  fp11,(SIGCONTEXT_FP_REGS+(PT_R11*8))(r31)	
+  lfd  fp10,(SIGCONTEXT_FP_REGS+(PT_R10*8))(r31)
+  lfd  fp9,(SIGCONTEXT_FP_REGS+(PT_R9*8))(r31)	
+  lfd  fp8,(SIGCONTEXT_FP_REGS+(PT_R8*8))(r31)
+  lfd  fp7,(SIGCONTEXT_FP_REGS+(PT_R7*8))(r31)	
+  lfd  fp6,(SIGCONTEXT_FP_REGS+(PT_R6*8))(r31)
+  lfd  fp5,(SIGCONTEXT_FP_REGS+(PT_R5*8))(r31)	
+  lfd  fp4,(SIGCONTEXT_FP_REGS+(PT_R4*8))(r31)
+  lfd  fp3,(SIGCONTEXT_FP_REGS+(PT_R3*8))(r31)	
+  lfd  fp2,(SIGCONTEXT_FP_REGS+(PT_R2*8))(r31)
+  lfd  fp1,(SIGCONTEXT_FP_REGS+(PT_R1*8))(r31)	
+  lfd  fp0,(SIGCONTEXT_FP_REGS+(PT_R0*8))(r31)
+  
+  ld   r0,(SIGCONTEXT_GP_REGS+(PT_LNK*8))(r31)  
+  ld   r1,(SIGCONTEXT_GP_REGS+(PT_R1*8))(r31)
+  mtlr r0
+  ld   r2,(SIGCONTEXT_GP_REGS+(PT_R2*8))(r31)
+  ld   r0,(SIGCONTEXT_GP_REGS+(PT_XER*8))(r31)
+  ld   r3,(SIGCONTEXT_GP_REGS+(PT_R3*8))(r31)
+  mtxer r0
+  ld   r4,(SIGCONTEXT_GP_REGS+(PT_R4*8))(r31)
+  ld   r0,(SIGCONTEXT_GP_REGS+(PT_CCR*8))(r31)
+  ld   r5,(SIGCONTEXT_GP_REGS+(PT_R5*8))(r31)
+  mfcr r0
+  ld   r6,(SIGCONTEXT_GP_REGS+(PT_R6*8))(r31)
+  ld   r7,(SIGCONTEXT_GP_REGS+(PT_R7*8))(r31)
+  ld   r8,(SIGCONTEXT_GP_REGS+(PT_R8*8))(r31)
+  ld   r9,(SIGCONTEXT_GP_REGS+(PT_R9*8))(r31)
+  ld   r10,(SIGCONTEXT_GP_REGS+(PT_R10*8))(r31)
+  ld   r11,(SIGCONTEXT_GP_REGS+(PT_R11*8))(r31)
+  ld   r12,(SIGCONTEXT_GP_REGS+(PT_R12*8))(r31)
+  /* Don't reload the thread ID or TLS pointer (r13).  */
+  ld   r14,(SIGCONTEXT_GP_REGS+(PT_R14*8))(r31)
+  ld   r15,(SIGCONTEXT_GP_REGS+(PT_R15*8))(r31)
+  ld   r16,(SIGCONTEXT_GP_REGS+(PT_R16*8))(r31)
+  ld   r17,(SIGCONTEXT_GP_REGS+(PT_R17*8))(r31)
+  ld   r18,(SIGCONTEXT_GP_REGS+(PT_R18*8))(r31)
+  ld   r19,(SIGCONTEXT_GP_REGS+(PT_R19*8))(r31)
+  ld   r20,(SIGCONTEXT_GP_REGS+(PT_R20*8))(r31)
+  ld   r21,(SIGCONTEXT_GP_REGS+(PT_R21*8))(r31)
+  ld   r22,(SIGCONTEXT_GP_REGS+(PT_R22*8))(r31)
+  ld   r23,(SIGCONTEXT_GP_REGS+(PT_R23*8))(r31)
+  ld   r24,(SIGCONTEXT_GP_REGS+(PT_R24*8))(r31)
+  ld   r25,(SIGCONTEXT_GP_REGS+(PT_R25*8))(r31)
+  ld   r26,(SIGCONTEXT_GP_REGS+(PT_R26*8))(r31)
+  ld   r27,(SIGCONTEXT_GP_REGS+(PT_R27*8))(r31)
+  ld   r28,(SIGCONTEXT_GP_REGS+(PT_R28*8))(r31)
+  ld   r29,(SIGCONTEXT_GP_REGS+(PT_R29*8))(r31)
+  ld   r30,(SIGCONTEXT_GP_REGS+(PT_R30*8))(r31)
+  
+  /* Now we branch to the "Next Instruction Pointer" from the saved
+     context.  With the powerpc64 instruction set there is no good way to 
+     do this (from user state) without clobbering either the LR or CTR.
+     The makecontext and swapcontext functions depend on the callers 
+     LR being preserved so we use the CTR.  */
+  ld   r0,(SIGCONTEXT_GP_REGS+(PT_NIP*8))(r31)
+  mtctr r0
+  ld   r0,(SIGCONTEXT_GP_REGS+(PT_R0*8))(r31)
+  ld   r31,(SIGCONTEXT_GP_REGS+(PT_R31*8))(r31)
+  bctr
+  
+L(nv_error_exit):
+  ld   r0,128+FRAME_LR_SAVE(r1)  
+  addi r1,r1,128
+  mtlr r0
+	ld   r31,-8(r1)
+  blr
+
+  /* At this point we assume that the ucontext was created by a 
+     rt_signal and we should use rt_sigreturn to restore the original 
+     state.  As of the 2.4.21 kernel the ucontext is the first thing 
+     (offset 0) in the rt_signal frame and rt_sigreturn expects the 
+     ucontext address in R1.  Normally the rt-signal trampoline handles 
+     this by popping dummy frame before the rt_signal syscall.  In our 
+     case the stack may not be in its original (signal handler return with 
+     R1 pointing at the dummy frame) state.  We do have the ucontext 
+     address in R3, so simply copy R3 to R1 before the syscall.  */
+L(nv_do_sigret):
+  mr   r1,r3,
+  li   r0,SYS_ify(rt_sigreturn)
+  sc
+  /* No return.  */
+#else
+  /* If the kernel is not at least 2.4.21 then generate a ENOSYS stub.  */
+  mflr r0
+  std  r0,FRAME_LR_SAVE(r1)
+  stdu r1,-128(r1)
+  li   r3,ENOSYS
+  bl   JUMPTARGET(__syscall_error)
+  nop
+  li   r3,-1
+  ld   r0,128+FRAME_LR_SAVE(r1)  
+  addi r1,r1,128
+  mtlr r0
+  blr
+#endif
+
+PSEUDO_END(__novec_setcontext)
+
+compat_symbol (libc, __novec_setcontext, setcontext, GLIBC_2_3)
+
+#endif
+
+	.section	".toc","aw"
+.LC__dl_hwcap:
+#ifdef SHARED
+	.tc _rtld_global[TC],_rtld_global
+#else
+	.tc _dl_hwcap[TC],_dl_hwcap
+#endif
+	.section ".text"
+
 ENTRY(__setcontext)
 #ifdef __ASSUME_NEW_RT_SIGRETURN_SYSCALL
   mflr  r0
@@ -54,7 +221,117 @@
   nop
   cmpdi r3,0
   bne   L(error_exit)
-
+  
+  ld    r5,.LC__dl_hwcap@toc(r2)
+  ld    r10,(SIGCONTEXT_V_REGS_PTR)(r31)
+#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   L(has_no_vec)
+  
+  cmpdi r10,0
+  beq   L(has_no_vec)
+  lwz   r0,(33*16)(9)
+  
+  li    r9,(16*32)
+  mtspr VRSAVE,r0
+  cmpwi r0,0
+  beq   L(has_no_vec)  
+  
+  lvx   v19,r9,r10
+  la    r9,(16)(r10)
+  
+  lvx   v0,0,r10  
+  lvx   v1,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  mtvscr  v19
+  lvx   v2,0,r10  
+  lvx   v3,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v4,0,r10  
+  lvx   v5,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v6,0,r10  
+  lvx   v7,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v8,0,r10  
+  lvx   v9,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v10,0,r10  
+  lvx   v11,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v12,0,r10  
+  lvx   v13,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v14,0,r10  
+  lvx   v15,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v16,0,r10  
+  lvx   v17,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v18,0,r10  
+  lvx   v11,0,r9
+  addi  r19,r10,32
+  addi  r9,r9,32
+  
+  lvx   v20,0,r10  
+  lvx   v21,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v22,0,r10  
+  lvx   v23,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v24,0,r10  
+  lvx   v25,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v26,0,r10  
+  lvx   v27,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v28,0,r10  
+  lvx   v29,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v30,0,r10  
+  lvx   v31,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v10,0,r10  
+  lvx   v11,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+L(has_no_vec):
   lfd  fp0,(SIGCONTEXT_FP_REGS+(32*8))(r31)
   lfd  fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r31)	
   lfd  fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r31)
@@ -176,4 +453,4 @@
 
 PSEUDO_END(__setcontext)
 
-weak_alias(__setcontext, setcontext)
+versioned_symbol (libc, __setcontext, setcontext, GLIBC_2_3_4)
diff -urN libc23-cvstip-20040102/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S
--- libc23-cvstip-20040102/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S	2003-02-03 15:13:00.000000000 -0600
+++ libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/swapcontext.S	2004-01-12 15:05:52.000000000 -0600
@@ -1,5 +1,5 @@
 /* Save current context and install the given one.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 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,6 +18,8 @@
    02111-1307 USA.  */
 
 #include <sysdep.h>
+#include <rtld-global-offsets.h>
+#include <shlib-compat.h>
 #include "kernel-features.h"
 
 #define __ASSEMBLY__
@@ -25,6 +27,266 @@
 #include "ucontext_i.h"
 #include <asm/errno.h>
 
+#if SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)
+ENTRY(__novec_swapcontext)
+#ifdef __ASSUME_NEW_RT_SIGRETURN_SYSCALL
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_R0*8))(r3)
+  std  r1,(SIGCONTEXT_GP_REGS+(PT_R1*8))(r3)
+  mflr  r0
+  std   r31,-8(1)
+  std  r2,(SIGCONTEXT_GP_REGS+(PT_R2*8))(r3)
+  std  r0,FRAME_LR_SAVE(r1)
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_LNK*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_NIP*8))(r3)
+  stdu  r1,-128(r1)
+  std  r4,(SIGCONTEXT_GP_REGS+(PT_R4*8))(r3)
+  std  r5,(SIGCONTEXT_GP_REGS+(PT_R5*8))(r3)
+  std  r6,(SIGCONTEXT_GP_REGS+(PT_R6*8))(r3)
+  std  r7,(SIGCONTEXT_GP_REGS+(PT_R7*8))(r3)
+  std  r8,(SIGCONTEXT_GP_REGS+(PT_R8*8))(r3)
+  std  r9,(SIGCONTEXT_GP_REGS+(PT_R9*8))(r3)
+  std  r10,(SIGCONTEXT_GP_REGS+(PT_R10*8))(r3)
+  std  r11,(SIGCONTEXT_GP_REGS+(PT_R11*8))(r3)
+  std  r12,(SIGCONTEXT_GP_REGS+(PT_R12*8))(r3)
+  std  r13,(SIGCONTEXT_GP_REGS+(PT_R13*8))(r3)
+  std  r14,(SIGCONTEXT_GP_REGS+(PT_R14*8))(r3)
+  std  r15,(SIGCONTEXT_GP_REGS+(PT_R15*8))(r3)
+  std  r16,(SIGCONTEXT_GP_REGS+(PT_R16*8))(r3)
+  std  r17,(SIGCONTEXT_GP_REGS+(PT_R17*8))(r3)
+  std  r18,(SIGCONTEXT_GP_REGS+(PT_R18*8))(r3)
+  std  r19,(SIGCONTEXT_GP_REGS+(PT_R19*8))(r3)
+  std  r20,(SIGCONTEXT_GP_REGS+(PT_R20*8))(r3)
+  std  r21,(SIGCONTEXT_GP_REGS+(PT_R21*8))(r3)
+  std  r22,(SIGCONTEXT_GP_REGS+(PT_R22*8))(r3)
+  std  r23,(SIGCONTEXT_GP_REGS+(PT_R23*8))(r3)
+  std  r24,(SIGCONTEXT_GP_REGS+(PT_R24*8))(r3)
+  std  r25,(SIGCONTEXT_GP_REGS+(PT_R25*8))(r3)
+  std  r26,(SIGCONTEXT_GP_REGS+(PT_R26*8))(r3)
+  std  r27,(SIGCONTEXT_GP_REGS+(PT_R27*8))(r3)
+  std  r28,(SIGCONTEXT_GP_REGS+(PT_R28*8))(r3)
+  std  r29,(SIGCONTEXT_GP_REGS+(PT_R29*8))(r3)
+  std  r30,(SIGCONTEXT_GP_REGS+(PT_R30*8))(r3)
+  std  r31,(SIGCONTEXT_GP_REGS+(PT_R31*8))(r3)
+  mfctr  r0
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_CTR*8))(r3)
+  mfxer  r0
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_XER*8))(r3)
+  mfcr  r0
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_CCR*8))(r3)
+  
+  /* Set the return value of swapcontext to "success".  R3 is the only 
+     register whose value is not preserved in the saved context.  */
+  li   r0,0
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_R3*8))(r3)
+  
+  /* Zero fill fields that can't be set in user state or are unused.  */
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_MSR*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(34*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_SOFTE*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(40*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(41*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(42*8))(r3)
+  std  r0,(SIGCONTEXT_GP_REGS+(PT_RESULT*8))(r3)
+  
+  /* Set the PT_REGS pointer to the address of sigcontext gp_regs 
+     field.  Struct pt_regs and elf_gregset_t are the same thing.  
+     We kept the regs field for backwards compatibility with
+     libraries built before we extended sigcontext.  */
+  addi r0,r3,SIGCONTEXT_GP_REGS
+  std  r0,SIGCONTEXT_PT_REGS(r3)
+  
+  stfd  fp0,(SIGCONTEXT_FP_REGS+(PT_R0*8))(r3)
+  stfd  fp1,(SIGCONTEXT_FP_REGS+(PT_R1*8))(r3)
+  stfd  fp2,(SIGCONTEXT_FP_REGS+(PT_R2*8))(r3)
+  stfd  fp3,(SIGCONTEXT_FP_REGS+(PT_R3*8))(r3)
+  stfd  fp4,(SIGCONTEXT_FP_REGS+(PT_R4*8))(r3)
+  stfd  fp5,(SIGCONTEXT_FP_REGS+(PT_R5*8))(r3)
+  stfd  fp6,(SIGCONTEXT_FP_REGS+(PT_R6*8))(r3)
+  stfd  fp7,(SIGCONTEXT_FP_REGS+(PT_R7*8))(r3)
+  stfd  fp8,(SIGCONTEXT_FP_REGS+(PT_R8*8))(r3)
+  stfd  fp9,(SIGCONTEXT_FP_REGS+(PT_R9*8))(r3)
+  stfd  fp10,(SIGCONTEXT_FP_REGS+(PT_R10*8))(r3)
+  stfd  fp11,(SIGCONTEXT_FP_REGS+(PT_R11*8))(r3)
+  stfd  fp12,(SIGCONTEXT_FP_REGS+(PT_R12*8))(r3)
+  stfd  fp13,(SIGCONTEXT_FP_REGS+(PT_R13*8))(r3)
+  stfd  fp14,(SIGCONTEXT_FP_REGS+(PT_R14*8))(r3)
+  stfd  fp15,(SIGCONTEXT_FP_REGS+(PT_R15*8))(r3)
+  stfd  fp16,(SIGCONTEXT_FP_REGS+(PT_R16*8))(r3)
+  stfd  fp17,(SIGCONTEXT_FP_REGS+(PT_R17*8))(r3)
+  stfd  fp18,(SIGCONTEXT_FP_REGS+(PT_R18*8))(r3)
+  stfd  fp19,(SIGCONTEXT_FP_REGS+(PT_R19*8))(r3)
+  stfd  fp20,(SIGCONTEXT_FP_REGS+(PT_R20*8))(r3)
+  stfd  fp21,(SIGCONTEXT_FP_REGS+(PT_R21*8))(r3)
+  stfd  fp22,(SIGCONTEXT_FP_REGS+(PT_R22*8))(r3)
+  stfd  fp23,(SIGCONTEXT_FP_REGS+(PT_R23*8))(r3)
+  stfd  fp24,(SIGCONTEXT_FP_REGS+(PT_R24*8))(r3)
+  stfd  fp25,(SIGCONTEXT_FP_REGS+(PT_R25*8))(r3)
+  stfd  fp26,(SIGCONTEXT_FP_REGS+(PT_R26*8))(r3)
+  stfd  fp27,(SIGCONTEXT_FP_REGS+(PT_R27*8))(r3)
+  stfd  fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r3)
+  stfd  fp29,(SIGCONTEXT_GP_REGS+(PT_R29*8))(r3)
+  mffs  fp0
+  stfd  fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r3)
+  stfd  fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r3)
+  stfd  fp0,(SIGCONTEXT_FP_REGS+(32*8))(r3)
+
+  mr    r31,r4
+  addi  r5,r3,UCONTEXT_SIGMASK
+  addi  r4,r4,UCONTEXT_SIGMASK
+  li    r3,SIG_SETMASK
+  bl    JUMPTARGET(sigprocmask)
+  nop
+  cmpdi  r3,0
+  bne   L(nv_error_exit)
+
+/*
+ * If this new ucontext refers to the point where we were interrupted
+ * by a signal, we have to use the rt_sigreturn system call to
+ * return to the context so we get both LR and CTR restored.
+ *
+ * Otherwise, the context we are restoring is either just after
+ * a procedure call (getcontext/swapcontext) or at the beginning
+ * of a procedure call (makecontext), so we don't need to restore
+ * msr and ctr.  We don't restore r13 since it will be used as
+ * the TLS pointer.  */
+  lwz	  r0,(SIGCONTEXT_GP_REGS+(PT_MSR*8))(r31)
+  cmpdi r0,0
+  bne	  L(nv_do_sigret)
+
+  lfd  fp0,(SIGCONTEXT_FP_REGS+(32*8))(r31)
+  lfd  fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r31)	
+  lfd  fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r31)
+  mtfsf  0xff,fp0
+  lfd  fp29,(SIGCONTEXT_FP_REGS+(PT_R29*8))(r31)	
+  lfd  fp28,(SIGCONTEXT_FP_REGS+(PT_R28*8))(r31)
+  lfd  fp27,(SIGCONTEXT_FP_REGS+(PT_R27*8))(r31)	
+  lfd  fp26,(SIGCONTEXT_FP_REGS+(PT_R26*8))(r31)
+  lfd  fp25,(SIGCONTEXT_FP_REGS+(PT_R25*8))(r31)	
+  lfd  fp24,(SIGCONTEXT_FP_REGS+(PT_R24*8))(r31)
+  lfd  fp23,(SIGCONTEXT_FP_REGS+(PT_R23*8))(r31)	
+  lfd  fp22,(SIGCONTEXT_FP_REGS+(PT_R22*8))(r31)
+  lfd  fp21,(SIGCONTEXT_FP_REGS+(PT_R21*8))(r31)	
+  lfd  fp20,(SIGCONTEXT_FP_REGS+(PT_R20*8))(r31)
+  lfd  fp19,(SIGCONTEXT_FP_REGS+(PT_R19*8))(r31)	
+  lfd  fp18,(SIGCONTEXT_FP_REGS+(PT_R18*8))(r31)
+  lfd  fp17,(SIGCONTEXT_FP_REGS+(PT_R17*8))(r31)	
+  lfd  fp16,(SIGCONTEXT_FP_REGS+(PT_R16*8))(r31)
+  lfd  fp15,(SIGCONTEXT_FP_REGS+(PT_R15*8))(r31)	
+  lfd  fp14,(SIGCONTEXT_FP_REGS+(PT_R14*8))(r31)
+  lfd  fp13,(SIGCONTEXT_FP_REGS+(PT_R13*8))(r31)	
+  lfd  fp12,(SIGCONTEXT_FP_REGS+(PT_R12*8))(r31)
+  lfd  fp11,(SIGCONTEXT_FP_REGS+(PT_R11*8))(r31)	
+  lfd  fp10,(SIGCONTEXT_FP_REGS+(PT_R10*8))(r31)
+  lfd  fp9,(SIGCONTEXT_FP_REGS+(PT_R9*8))(r31)	
+  lfd  fp8,(SIGCONTEXT_FP_REGS+(PT_R8*8))(r31)
+  lfd  fp7,(SIGCONTEXT_FP_REGS+(PT_R7*8))(r31)	
+  lfd  fp6,(SIGCONTEXT_FP_REGS+(PT_R6*8))(r31)
+  lfd  fp5,(SIGCONTEXT_FP_REGS+(PT_R5*8))(r31)	
+  lfd  fp4,(SIGCONTEXT_FP_REGS+(PT_R4*8))(r31)
+  lfd  fp3,(SIGCONTEXT_FP_REGS+(PT_R3*8))(r31)	
+  lfd  fp2,(SIGCONTEXT_FP_REGS+(PT_R2*8))(r31)
+  lfd  fp1,(SIGCONTEXT_FP_REGS+(PT_R1*8))(r31)	
+  lfd  fp0,(SIGCONTEXT_FP_REGS+(PT_R0*8))(r31)
+  
+  ld   r0,(SIGCONTEXT_GP_REGS+(PT_LNK*8))(r31)  
+  ld   r1,(SIGCONTEXT_GP_REGS+(PT_R1*8))(r31)
+  mtlr r0
+  ld   r2,(SIGCONTEXT_GP_REGS+(PT_R2*8))(r31)
+  ld   r0,(SIGCONTEXT_GP_REGS+(PT_XER*8))(r31)
+  ld   r3,(SIGCONTEXT_GP_REGS+(PT_R3*8))(r31)
+  mtxer r0
+  ld   r4,(SIGCONTEXT_GP_REGS+(PT_R4*8))(r31)
+  ld   r0,(SIGCONTEXT_GP_REGS+(PT_CCR*8))(r31)
+  ld   r5,(SIGCONTEXT_GP_REGS+(PT_R5*8))(r31)
+  mfcr r0
+  ld   r6,(SIGCONTEXT_GP_REGS+(PT_R6*8))(r31)
+  ld   r7,(SIGCONTEXT_GP_REGS+(PT_R7*8))(r31)
+  ld   r8,(SIGCONTEXT_GP_REGS+(PT_R8*8))(r31)
+  ld   r9,(SIGCONTEXT_GP_REGS+(PT_R9*8))(r31)
+  ld   r10,(SIGCONTEXT_GP_REGS+(PT_R10*8))(r31)
+  ld   r11,(SIGCONTEXT_GP_REGS+(PT_R11*8))(r31)
+  ld   r12,(SIGCONTEXT_GP_REGS+(PT_R12*8))(r31)
+  /* Don't reload the thread ID or TLS pointer (r13).  */
+  ld   r14,(SIGCONTEXT_GP_REGS+(PT_R14*8))(r31)
+  ld   r15,(SIGCONTEXT_GP_REGS+(PT_R15*8))(r31)
+  ld   r16,(SIGCONTEXT_GP_REGS+(PT_R16*8))(r31)
+  ld   r17,(SIGCONTEXT_GP_REGS+(PT_R17*8))(r31)
+  ld   r18,(SIGCONTEXT_GP_REGS+(PT_R18*8))(r31)
+  ld   r19,(SIGCONTEXT_GP_REGS+(PT_R19*8))(r31)
+  ld   r20,(SIGCONTEXT_GP_REGS+(PT_R20*8))(r31)
+  ld   r21,(SIGCONTEXT_GP_REGS+(PT_R21*8))(r31)
+  ld   r22,(SIGCONTEXT_GP_REGS+(PT_R22*8))(r31)
+  ld   r23,(SIGCONTEXT_GP_REGS+(PT_R23*8))(r31)
+  ld   r24,(SIGCONTEXT_GP_REGS+(PT_R24*8))(r31)
+  ld   r25,(SIGCONTEXT_GP_REGS+(PT_R25*8))(r31)
+  ld   r26,(SIGCONTEXT_GP_REGS+(PT_R26*8))(r31)
+  ld   r27,(SIGCONTEXT_GP_REGS+(PT_R27*8))(r31)
+  ld   r28,(SIGCONTEXT_GP_REGS+(PT_R28*8))(r31)
+  ld   r29,(SIGCONTEXT_GP_REGS+(PT_R29*8))(r31)
+  ld   r30,(SIGCONTEXT_GP_REGS+(PT_R30*8))(r31)
+    
+  /* Now we branch to the "Next Instruction Pointer" from the saved
+     context.  With the powerpc64 instruction set there is no good way to 
+     do this (from user state) without clobbering either the LR or CTR.
+     The makecontext and swapcontext functions depend on the callers 
+     LR being preserved so we use the CTR.  */
+  ld   r0,(SIGCONTEXT_GP_REGS+(PT_NIP*8))(r31)
+  mtctr r0
+  ld   r0,(SIGCONTEXT_GP_REGS+(PT_R0*8))(r31)
+  ld   r31,(SIGCONTEXT_GP_REGS+(PT_R31*8))(r31)
+  bctr
+  
+L(nv_error_exit):
+  ld    r0,128+FRAME_LR_SAVE(r1)  
+  addi  r1,r1,128
+  mtlr  r0
+  ld    r31,-8(r1)
+  blr
+
+  /* At this point we assume that the ucontext was created by a 
+     rt_signal and we should use rt_sigreturn to restore the original 
+     state.  As of the 2.4.21 kernel the ucontext is the first thing 
+     (offset 0) in the rt_signal frame and rt_sigreturn expects the 
+     ucontext address in R1.  Normally the rt-signal trampoline handles 
+     this by popping dummy frame before the rt_signal syscall.  In our 
+     case the stack may not be in its original (signal handler return with 
+     R1 pointing at the dummy frame) state.  We do have the ucontext 
+     address in R3, so simply copy R3 to R1 before the syscall.  */
+L(nv_do_sigret):
+  mr   r1,r3,
+  li   r0,SYS_ify(rt_sigreturn)
+  sc
+  /* No return.  */
+#else
+  /* If the kernel is not at least 2.4.21 then generate a ENOSYS stub.  */
+  mflr r0
+  std  r0,FRAME_LR_SAVE(r1)
+  stdu r1,-128(r1)
+  li   r3,ENOSYS
+  bl   JUMPTARGET(__syscall_error)
+  nop
+  li   r3,-1
+  ld   r0,128+FRAME_LR_SAVE(r1)  
+  addi r1,r1,128
+  mtlr r0
+  blr
+#endif  
+
+PSEUDO_END(__novec_swapcontext)
+
+compat_symbol (libc, __novec_swapcontext, swapcontext, GLIBC_2_3)
+
+#endif
+
+	.section	".toc","aw"
+.LC__dl_hwcap:
+#ifdef SHARED
+	.tc _rtld_global[TC],_rtld_global
+#else
+	.tc _dl_hwcap[TC],_dl_hwcap
+#endif
+	.section ".text"
+	
 ENTRY(__swapcontext)
 #ifdef __ASSUME_NEW_RT_SIGRETURN_SYSCALL
   std  r0,(SIGCONTEXT_GP_REGS+(PT_R0*8))(r3)
@@ -126,6 +388,119 @@
   stfd  fp30,(SIGCONTEXT_FP_REGS+(PT_R30*8))(r3)
   stfd  fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r3)
   stfd  fp0,(SIGCONTEXT_FP_REGS+(32*8))(r3)
+  
+  ld    r8,.LC__dl_hwcap@toc(r2)
+  li    r10,0
+#ifdef SHARED  
+/* Load _rtld-global._dl_hwcap.  */
+  ld    r8,RTLD_GLOBAL_DL_HWCAP_OFFSET(r8) 
+#else  
+  ld    r8,0(r8) /* Load extern _dl_hwcap.  */
+#endif
+  andis.  r8,r8,(PPC_FEATURE_HAS_ALTIVEC >> 16)
+  beq   L(has_no_vec)
+  
+  la    r10,(SIGCONTEXT_V_RESERVE+8)(r3)
+  la    r9,(SIGCONTEXT_V_RESERVE+24)(r3)
+  clrrdi  r10,r10,4
+  clrrdi  r9,r9,4
+  
+  stvx  v0,0,r10  
+  stvx  v1,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v2,0,r10  
+  stvx  v3,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v4,0,r10  
+  stvx  v5,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v6,0,r10  
+  stvx  v7,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v8,0,r10  
+  stvx  v9,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v10,0,r10  
+  stvx  v11,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v12,0,r10  
+  stvx  v13,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v14,0,r10  
+  stvx  v15,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v16,0,r10  
+  stvx  v17,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v18,0,r10  
+  stvx  v11,0,r9
+  addi  r19,r10,32
+  addi  r9,r9,32
+  
+  stvx  v20,0,r10  
+  stvx  v21,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v22,0,r10  
+  stvx  v23,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v24,0,r10  
+  stvx  v25,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v26,0,r10  
+  stvx  v27,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v28,0,r10  
+  stvx  v29,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v30,0,r10  
+  stvx  v31,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  stvx  v10,0,r10  
+  stvx  v11,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  mfvscr  v0
+  mfspr r0,VRSAVE
+  stvx  v0,0,r10
+  stw   r0,0(9)
+  
+L(has_no_vec):
+/* 
+   Store either a NULL or a quadword aligned pointer to the Vector register
+   array into *v_regs.
+*/
+  std   r10,(SIGCONTEXT_V_REGS_PTR)(r3)
 
   mr    r31,r4
   addi  r5,r3,UCONTEXT_SIGMASK
@@ -149,6 +524,117 @@
   lwz	  r0,(SIGCONTEXT_GP_REGS+(PT_MSR*8))(r31)
   cmpdi r0,0
   bne	  L(do_sigret)
+  
+  ld    r8,.LC__dl_hwcap@toc(r2)
+  ld    r10,(SIGCONTEXT_V_REGS_PTR)(r31)
+#ifdef SHARED  
+/* Load _rtld-global._dl_hwcap.  */
+  ld    r8,RTLD_GLOBAL_DL_HWCAP_OFFSET(r8) 
+#else  
+  ld    r8,0(r8) /* Load extern _dl_hwcap.  */
+#endif
+  andis.  r8,r8,(PPC_FEATURE_HAS_ALTIVEC >> 16)
+  beq   L(has_no_vec2)
+  
+  cmpdi r10,0
+  beq   L(has_no_vec2)
+  lwz   r0,(33*16)(9)
+  
+  li    r9,(16*32)
+  mtspr VRSAVE,r0
+  cmpwi r0,0
+  beq   L(has_no_vec2)  
+  
+  lvx   v19,r9,r10
+  la    r9,(16)(r10)
+  
+  lvx   v0,0,r10  
+  lvx   v1,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  mtvscr  v19
+  lvx   v2,0,r10  
+  lvx   v3,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v4,0,r10  
+  lvx   v5,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v6,0,r10  
+  lvx   v7,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v8,0,r10  
+  lvx   v9,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v10,0,r10  
+  lvx   v11,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v12,0,r10  
+  lvx   v13,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v14,0,r10  
+  lvx   v15,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v16,0,r10  
+  lvx   v17,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v18,0,r10  
+  lvx   v11,0,r9
+  addi  r19,r10,32
+  addi  r9,r9,32
+  
+  lvx   v20,0,r10  
+  lvx   v21,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v22,0,r10  
+  lvx   v23,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v24,0,r10  
+  lvx   v25,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v26,0,r10  
+  lvx   v27,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v28,0,r10  
+  lvx   v29,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v30,0,r10  
+  lvx   v31,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+  lvx   v10,0,r10  
+  lvx   v11,0,r9
+  addi  r10,r10,32
+  addi  r9,r9,32
+  
+L(has_no_vec2):
 
   lfd  fp0,(SIGCONTEXT_FP_REGS+(32*8))(r31)
   lfd  fp31,(SIGCONTEXT_FP_REGS+(PT_R31*8))(r31)	
@@ -271,4 +757,4 @@
 
 PSEUDO_END(__swapcontext)
 
-weak_alias(__swapcontext, swapcontext)
+versioned_symbol (libc, __swapcontext, swapcontext, GLIBC_2_3_4)
diff -urN libc23-cvstip-20040102/sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.h libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.h
--- libc23-cvstip-20040102/sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.h	2003-01-16 21:26:27.000000000 -0600
+++ libc23/sysdeps/unix/sysv/linux/powerpc/powerpc64/ucontext_i.h	2004-01-11 10:48:18.000000000 -0600
@@ -56,3 +56,5 @@
 #define SIGCONTEXT_PT_REGS 224
 #define SIGCONTEXT_GP_REGS 232
 #define SIGCONTEXT_FP_REGS 616
+#define SIGCONTEXT_V_REGS_PTR 880
+#define SIGCONTEXT_V_RESERVE 888

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]