fix the setjmp fix
David Mosberger
davidm@napali.hpl.hp.com
Wed May 14 17:12:00 GMT 2003
My previous fix for setjmp() introduced another bug. Embarrasing, but
true: ar.unat was saved in a scratch register, but I forgot that
setjmp is not a leaf (it calls __sigjmp_save). The patch below should
help.
Thanks to Gwenole Beauchesne from Mandrake for discovering and
reporting this problem.
--david
2003-05-13 David Mosberger <davidm@hpl.hp.com>
* sysdeps/unix/sysv/linux/ia64/setjmp.S: Fix the fix from
2003-03-27: setjmp is NOT a leaf-routine (due to the call to
__sigjmp_save) so we can't keep the saved unat value in a scratch
register (r16). Use loc2 instead.
Index: sysdeps/unix/sysv/linux/ia64/setjmp.S
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/ia64/setjmp.S,v
retrieving revision 1.8
diff -u -r1.8 setjmp.S
--- sysdeps/unix/sysv/linux/ia64/setjmp.S 27 Mar 2003 19:50:25 -0000 1.8
+++ sysdeps/unix/sysv/linux/ia64/setjmp.S 13 May 2003 17:49:28 -0000
@@ -86,9 +86,9 @@
ENTRY(__sigsetjmp)
.prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(2)
- alloc loc1=ar.pfs,2,2,2,0
- .save ar.unat, r16
- mov r16=ar.unat
+ alloc loc1=ar.pfs,2,3,2,0
+ .save ar.unat, loc2
+ mov loc2=ar.unat
;;
mov r17=ar.fpsr
mov r2=in0
@@ -97,7 +97,7 @@
.mem.offset 8,0; st8.spill.nta [r2]=sp,16 // r12 (sp)
.mem.offset 0,0; st8.spill.nta [r3]=gp,16 // r1 (gp)
;;
- st8.nta [r2]=r16,16 // save caller's unat
+ st8.nta [r2]=loc2,16 // save caller's unat
st8.nta [r3]=r17,16 // save fpsr
add r8=0xa0,in0
;;
@@ -171,7 +171,7 @@
st8.nta [r3]=in0 // &__jmp_buf
br.call.dpnt.few rp=__sigjmp_save
.ret0: // force a new bundle ::q
- mov.m ar.unat=r16 // restore caller's unat
+ mov.m ar.unat=loc2 // restore caller's unat
mov rp=loc0
mov ar.pfs=loc1
mov r8=0
More information about the Libc-hacker
mailing list