aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/powerpc
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-09-22 06:07:26 +0000
committerUlrich Drepper <drepper@redhat.com>2006-09-22 06:07:26 +0000
commit4a132246b1a34c6fe5d777a810e332236977e66a (patch)
tree050ae55eddfe9707b9acf30602175dfba782b47c /sysdeps/powerpc
parentc69136aeed1f6e7ba0649b0e0a6ec425ded37df8 (diff)
downloadglibc-4a132246b1a34c6fe5d777a810e332236977e66a.tar
glibc-4a132246b1a34c6fe5d777a810e332236977e66a.tar.gz
glibc-4a132246b1a34c6fe5d777a810e332236977e66a.tar.bz2
glibc-4a132246b1a34c6fe5d777a810e332236977e66a.zip
2006-09-21 Jakub Jelinek <jakub@redhat.com> [BZ #3225] * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h (PTR_MANGLE3, PTR_DEMANGLE3): Define. * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h (PTR_MANGLE3, PTR_DEMANGLE3): Likewise. * sysdeps/powerpc/powerpc32/__longjmp-common.S (__longjmp): Use them. * sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S (__longjmp): Likewise. * sysdeps/powerpc/powerpc64/__longjmp-common.S (__longjmp): Likewise.
Diffstat (limited to 'sysdeps/powerpc')
-rw-r--r--sysdeps/powerpc/powerpc32/__longjmp-common.S8
-rw-r--r--sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S8
-rw-r--r--sysdeps/powerpc/powerpc64/__longjmp-common.S6
3 files changed, 16 insertions, 6 deletions
diff --git a/sysdeps/powerpc/powerpc32/__longjmp-common.S b/sysdeps/powerpc/powerpc32/__longjmp-common.S
index 411b6a20cb..2093b7e337 100644
--- a/sysdeps/powerpc/powerpc32/__longjmp-common.S
+++ b/sysdeps/powerpc/powerpc32/__longjmp-common.S
@@ -31,7 +31,11 @@
ENTRY (BP_SYM (__longjmp))
CHECK_BOUNDS_BOTH_WIDE_LIT (r3, r8, r9, JB_SIZE)
+#ifdef PTR_DEMANGLE
+ lwz r24,(JB_GPR1*4)(r3)
+#else
lwz r1,(JB_GPR1*4)(r3)
+#endif
lwz r0,(JB_LR*4)(r3)
lwz r14,((JB_GPRS+0)*4)(r3)
lwz r15,((JB_GPRS+1)*4)(r3)
@@ -41,8 +45,8 @@ ENTRY (BP_SYM (__longjmp))
lwz r19,((JB_GPRS+5)*4)(r3)
lwz r20,((JB_GPRS+6)*4)(r3)
#ifdef PTR_DEMANGLE
- PTR_DEMANGLE (r0, r25)
- PTR_DEMANGLE2 (r1, r25)
+ PTR_DEMANGLE3 (r1, r24, r25)
+ PTR_DEMANGLE2 (r0, r25)
#endif
mtlr r0
lwz r21,((JB_GPRS+7)*4)(r3)
diff --git a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
index aa24b059d1..404f403855 100644
--- a/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
+++ b/sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S
@@ -114,7 +114,11 @@ aligned_restore_vmx:
lvx v31,0,r6
L(no_vmx):
#endif
+#ifdef PTR_DEMANGLE
+ lwz r24,(JB_GPR1*4)(r3)
+#else
lwz r1,(JB_GPR1*4)(r3)
+#endif
lwz r0,(JB_LR*4)(r3)
lwz r14,((JB_GPRS+0)*4)(r3)
lfd fp14,((JB_FPRS+0*2)*4)(r3)
@@ -131,8 +135,8 @@ L(no_vmx):
lwz r20,((JB_GPRS+6)*4)(r3)
lfd fp20,((JB_FPRS+6*2)*4)(r3)
#ifdef PTR_DEMANGLE
- PTR_DEMANGLE (r0, r25)
- PTR_DEMANGLE2 (r1, r25)
+ PTR_DEMANGLE3 (r1, r24, r25)
+ PTR_DEMANGLE2 (r0, r25)
#endif
mtlr r0
lwz r21,((JB_GPRS+7)*4)(r3)
diff --git a/sysdeps/powerpc/powerpc64/__longjmp-common.S b/sysdeps/powerpc/powerpc64/__longjmp-common.S
index 31b1af34f9..700a2a543c 100644
--- a/sysdeps/powerpc/powerpc64/__longjmp-common.S
+++ b/sysdeps/powerpc/powerpc64/__longjmp-common.S
@@ -108,9 +108,11 @@ aligned_restore_vmx:
lvx v31,0,r6
L(no_vmx):
#endif
- ld r1,(JB_GPR1*8)(r3)
#ifdef PTR_DEMANGLE
- PTR_DEMANGLE (r1, r25)
+ ld r22,(JB_GPR1*8)(r3)
+ PTR_DEMANGLE3 (r1, r22, r25)
+#else
+ ld r1,(JB_GPR1*8)(r3)
#endif
ld r2,(JB_GPR2*8)(r3)
ld r0,(JB_LR*8)(r3)