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] |
Hi
A stack of patches from David Mosberger and myself cleaning up a number
of ia64 specific files.
Jes
2001-03-23 Jes Sorensen <jes@linuxcare.com>
* sysdeps/unix/sysv/linux/ia64/sysdep.h (ENTRY): moved to ...
* sysdeps/ia64/sysdep.h: ... here.
* sysdeps/ia64/sysdep.h(LOCAL_ENTRY): Define.
* sysdeps/ia64/sysdep.h(LOCAL_LEAF): Define.
* sysdeps/ia64/_mcount.S(_mcount_ret_helper): Use LOCAL_LEAF() to
declare instead of LEAF(). Suggestion from David Mosberger.
2001-03-21 David Mosberger <davidm@hpl.hp.com>
* sysdeps/unix/sysv/linux/ia64/sysdep.h (CALL_MCOUNT): Add unwind
directives.
(PSEUDO): Drop .psr and .lsb directives.
* sysdeps/unix/sysv/linux/ia64/setjmp.S: Ditto. Add unwind
directives.
* sysdeps/unix/sysv/linux/ia64/sysdep.S: Ditto.
* sysdeps/ia64/elf/start.S: Misc cleanup: remove .psr and .lsb
directives etc.
* sysdeps/unix/sysv/linux/ia64/brk.S: Ditto.
* sysdeps/unix/sysv/linux/ia64/__longjmp.S: Ditto.
* sysdeps/ia64/_mcount.S: Remove .psr and .lsb directives (no
longer needed). Add unwind directives.
* sysdeps/ia64/sysdep.h: Define ASM_UNW_PRLG_RP, ASM_UNW_PRLG_PFS,
ASM_UNW_PRLG_PSP, ASM_UNW_PRLG_PR, and ASM_UNW_PRLG_GRSAVE.
diff -urN -X /home/jes/exclude-libc /home/jes/cygnus/libc-2.2-200301/sysdeps/ia64/_mcount.S libc-2.2/sysdeps/ia64/_mcount.S
--- /home/jes/cygnus/libc-2.2-200301/sysdeps/ia64/_mcount.S Thu Dec 7 20:26:31 2000
+++ libc-2.2/sysdeps/ia64/_mcount.S Fri Mar 23 15:07:17 2001
@@ -48,13 +48,11 @@
#undef ret
- .psr abi64
- .psr lsb
- .lsb
-
LEAF(_mcount)
- alloc loc0 = ar.pfs, 4, 4, 3, 0
- mov loc1 = rp
+ .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(4)
+ alloc loc1 = ar.pfs, 4, 4, 3, 0
+ mov loc0 = rp
+ .body
mov loc2 = r8 // gcc uses r8 to pass pointer to return structure
;;
mov loc3 = r15 // gcc uses r15 to pass the static link to nested functions
@@ -67,21 +65,27 @@
.mii
mov gp = in1
mov r2 = ip
- mov ar.pfs = loc0
+ mov ar.pfs = loc1
}
;;
- adds r2 = 1f - .here, r2
- mov b7 = loc1
+ adds r2 = _mcount_ret_helper - .here, r2
+ mov b7 = loc0
mov rp = in2
;;
mov r8 = loc2
mov r15 = loc3
mov b6 = r2
br.ret.sptk.few b6
+END(_mcount)
-1: alloc r2 = ar.pfs, 0, 0, 9, 0
+LOCAL_LEAF(_mcount_ret_helper)
+ .prologue
+ .altrp b7
+ .save ar.pfs, r40
+ .body
+ alloc r2 = ar.pfs, 0, 0, 9, 0
mov ar.pfs = r40
br b7
-END(_mcount)
+END(_mcount_ret_helper)
weak_alias (_mcount, mcount)
diff -urN -X /home/jes/exclude-libc /home/jes/cygnus/libc-2.2-200301/sysdeps/ia64/elf/start.S libc-2.2/sysdeps/ia64/elf/start.S
--- /home/jes/cygnus/libc-2.2-200301/sysdeps/ia64/elf/start.S Mon Dec 11 10:20:57 2000
+++ libc-2.2/sysdeps/ia64/elf/start.S Thu Mar 22 14:43:48 2001
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Jes Sorensen, <Jes.Sorensen@cern.ch>, April 1999.
@@ -31,14 +31,8 @@
* out6: stack_end
*/
- .psr abi64
- .psr lsb
- .lsb
-
- .text
-
- .global _start#
- .proc _start#
+ .global _start
+ .proc _start
_start:
{ .mlx
@@ -59,11 +53,11 @@
}
{ .mfi
mov ar.fpsr = r3
- addl out0 = @ltoff(@fptr(main#)), gp
+ addl out0 = @ltoff(@fptr(main)), gp
}
{ .mfi
- addl out4 = @ltoff(@fptr(_fini#)), gp
- addl out3 = @ltoff(@fptr(_init#)), gp
+ addl out4 = @ltoff(@fptr(_fini)), gp
+ addl out3 = @ltoff(@fptr(_init)), gp
;;
}
{ .mmi
@@ -74,14 +68,14 @@
{ .mib
ld8 out4 = [out4] /* pointer to `fini' function descriptor */
mov out5 = ret0 /* dynamic linker destructor */
- br.call.sptk.few rp = __libc_start_main#
+ br.call.sptk.few rp = __libc_start_main
}
{ .mib
mov rp = r0
br.ret.sptk.few rp /* break miserably if we ever return */
;;
}
- .endp _start#
+ .endp _start
/* Define a symbol for the first piece of initialized data. */
.data
diff -urN -X /home/jes/exclude-libc /home/jes/cygnus/libc-2.2-200301/sysdeps/ia64/sysdep.h libc-2.2/sysdeps/ia64/sysdep.h
--- /home/jes/cygnus/libc-2.2-200301/sysdeps/ia64/sysdep.h Mon Jul 31 23:11:48 2000
+++ libc-2.2/sysdeps/ia64/sysdep.h Fri Mar 23 15:06:25 2001
@@ -21,11 +21,39 @@
#ifdef __ASSEMBLER__
+/* Macros to help writing .prologue directives in assembly code. */
+#define ASM_UNW_PRLG_RP 0x8
+#define ASM_UNW_PRLG_PFS 0x4
+#define ASM_UNW_PRLG_PSP 0x2
+#define ASM_UNW_PRLG_PR 0x1
+#define ASM_UNW_PRLG_GRSAVE(ninputs) (32+(ninputs))
+
+#define ENTRY(name) \
+ .text; \
+ .align 32; \
+ .proc C_SYMBOL_NAME(name); \
+ .global C_SYMBOL_NAME(name); \
+ C_LABEL(name) \
+ CALL_MCOUNT
+
+#define LOCAL_ENTRY(name) \
+ .text; \
+ .align 32; \
+ .proc C_SYMBOL_NAME(name); \
+ C_LABEL(name) \
+ CALL_MCOUNT
+
#define LEAF(name) \
.text; \
.align 32; \
.proc C_SYMBOL_NAME(name); \
.global name; \
+ C_LABEL(name)
+
+#define LOCAL_LEAF(name) \
+ .text; \
+ .align 32; \
+ .proc C_SYMBOL_NAME(name); \
C_LABEL(name)
/* Mark the end of function SYM. */
diff -urN -X /home/jes/exclude-libc /home/jes/cygnus/libc-2.2-200301/sysdeps/unix/sysv/linux/ia64/__longjmp.S libc-2.2/sysdeps/unix/sysv/linux/ia64/__longjmp.S
--- /home/jes/cygnus/libc-2.2-200301/sysdeps/unix/sysv/linux/ia64/__longjmp.S Sun Mar 18 22:19:56 2001
+++ libc-2.2/sysdeps/unix/sysv/linux/ia64/__longjmp.S Thu Mar 22 14:43:54 2001
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
The GNU C Library is free software; you can redistribute it and/or
@@ -39,16 +39,9 @@
# define pNeg p7 /* is rotate count negative? */
- .psr abi64
- .psr lsb
- .lsb
-
/* __longjmp(__jmp_buf buf, int val) */
- .text
- .align 32
- .global __longjmp
- .proc __longjmp
-__longjmp:
+
+LEAF(__longjmp)
alloc r8=ar.pfs,2,1,0,0
mov r27=ar.rsc
add r2=0x98,in0 // r2 <- &jmpbuf.orig_jmp_buf_addr
@@ -164,5 +157,4 @@
invala // virt. -> phys. regnum mapping may change
mov pr=r24,-1
ret
- .endp __longjmp
-
+END(__longjmp)
diff -urN -X /home/jes/exclude-libc /home/jes/cygnus/libc-2.2-200301/sysdeps/unix/sysv/linux/ia64/brk.S libc-2.2/sysdeps/unix/sysv/linux/ia64/brk.S
--- /home/jes/cygnus/libc-2.2-200301/sysdeps/unix/sysv/linux/ia64/brk.S Fri Jun 9 20:10:09 2000
+++ libc-2.2/sysdeps/unix/sysv/linux/ia64/brk.S Thu Mar 22 14:43:58 2001
@@ -1,5 +1,5 @@
/* brk system call for Linux/ia64
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Stephane Eranian <eranian@hpl.hp.com> and
Jes Sorensen, <Jes.Sorensen@cern.ch>, April 1999.
@@ -19,31 +19,26 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <sysdep.h>
+
#include <asm/unistd.h>
#include <asm/errno.h>
- .text
- .psr abi64
- .psr lsb
- .lsb
.global __curbrk
.data
.align 8
__curbrk:
data8 0
- .weak ___brk_addr
-___brk_addr = __curbrk
- .text
- .align 16
- .global __brk
- .proc __brk
-__brk:
+
+weak_alias (__curbrk, ___brk_addr)
+
+LEAF(__brk)
mov r15=__NR_brk
break.i __BREAK_SYSCALL
;;
cmp.ltu p6,p0=ret0,r32 /* r32 is the input register, even though we
haven't allocated a frame */
- addl r9=@ltoff(__curbrk#),gp
+ addl r9=@ltoff(__curbrk),gp
;;
ld8 r9=[r9]
(p6) mov ret0=ENOMEM
@@ -51,8 +46,7 @@
;;
st8 [r9]=ret0
mov ret0=0
- br.ret.sptk.few rp
- .endp __brk
+ ret
+END(__brk)
- .weak brk
-brk = __brk
+weak_alias (__brk, brk)
diff -urN -X /home/jes/exclude-libc /home/jes/cygnus/libc-2.2-200301/sysdeps/unix/sysv/linux/ia64/setjmp.S libc-2.2/sysdeps/unix/sysv/linux/ia64/setjmp.S
--- /home/jes/cygnus/libc-2.2-200301/sysdeps/unix/sysv/linux/ia64/setjmp.S Wed Nov 22 14:01:28 2000
+++ libc-2.2/sysdeps/unix/sysv/linux/ia64/setjmp.S Thu Mar 22 14:44:03 2001
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
The GNU C Library is free software; you can redistribute it and/or
@@ -19,7 +19,7 @@
The layout of the jmp_buf is as follows. This is subject to change
and user-code should never depend on the particular layout of
jmp_buf!
-
+
offset: description:
------- ------------
@@ -67,34 +67,25 @@
#include <sysdep.h>
#include <features.h>
- .text
- .psr abi64
- .psr lsb
- .lsb
-
/* The following two entry points are the traditional entry points: */
- .global setjmp
- .proc setjmp
-setjmp: alloc r8=ar.pfs,2,0,0,0
+LEAF(setjmp)
+ alloc r8=ar.pfs,2,0,0,0
mov in1=1
br.cond.sptk.many __sigsetjmp
- .endp setjmp
+END(setjmp)
- .global _setjmp
- .proc _setjmp
-_setjmp:
+LEAF(_setjmp)
alloc r8=ar.pfs,2,0,0,0
mov in1=0
br.cond.sptk.many __sigsetjmp
- .endp _setjmp
+END(_setjmp)
/* __sigsetjmp(__jmp_buf buf, int savemask) */
- .align 32
- .global __sigsetjmp
- .proc __sigsetjmp
-__sigsetjmp:
- alloc loc0=ar.pfs,2,2,2,0
+
+ENTRY(__sigsetjmp)
+ .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(2)
+ alloc loc1=ar.pfs,2,2,2,0
mov r16=ar.unat
;;
mov r17=ar.fpsr
@@ -114,7 +105,8 @@
;;
stf.spill.nta [r8]=f2,32
stf.spill.nta [r9]=f3,32
- mov loc1=rp
+ mov loc0=rp
+ .body
;;
stf.spill.nta [r8]=f4,32
stf.spill.nta [r9]=f5,32
@@ -157,7 +149,7 @@
mov r25=ar.unat
mov out0=in0
- st8.nta [r2]=loc1,16 // b0
+ st8.nta [r2]=loc0,16 // b0
st8.nta [r3]=r17,16 // b1
mov out1=in1
;;
@@ -167,7 +159,7 @@
st8.nta [r2]=r20,16 // b4
st8.nta [r3]=r21,16 // b5
;;
- st8.nta [r2]=loc0,16 // ar.pfs
+ st8.nta [r2]=loc1,16 // ar.pfs
st8.nta [r3]=r22,16 // ar.lc
;;
st8.nta [r2]=r24,16 // pr
@@ -178,10 +170,10 @@
br.call.dpnt.few rp=__sigjmp_save
.ret0: // force a new bundle ::q
mov r8=0
- mov rp=loc1
- mov ar.pfs=loc0
+ mov rp=loc0
+ mov ar.pfs=loc1
ret
- .endp __sigsetjmp
+END(__sigsetjmp)
weak_extern(_setjmp)
weak_extern(setjmp)
diff -urN -X /home/jes/exclude-libc /home/jes/cygnus/libc-2.2-200301/sysdeps/unix/sysv/linux/ia64/sysdep.S libc-2.2/sysdeps/unix/sysv/linux/ia64/sysdep.S
--- /home/jes/cygnus/libc-2.2-200301/sysdeps/unix/sysv/linux/ia64/sysdep.S Fri Sep 29 12:42:33 2000
+++ libc-2.2/sysdeps/unix/sysv/linux/ia64/sysdep.S Thu Mar 22 23:05:55 2001
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
The GNU C Library is free software; you can redistribute it and/or
@@ -19,10 +19,6 @@
#include <sysdep.h>
#include <features.h>
- .psr abi64
- .psr lsb
- .lsb
-
.global errno
.common errno,4,4
.type errno, @object
@@ -34,16 +30,11 @@
.global _errno
_errno = errno
- .text
-
- .align 8
-
- .global __syscall_error
- .proc __syscall_error
-__syscall_error:
+ENTRY(__syscall_error)
#ifdef _LIBC_REENTRANT
+ .prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(0)
alloc r35=ar.pfs, 0, 4, 0, 0
- mov r32=b0
+ mov r32=rp
mov r33=r8
mov r34=r1
;;
@@ -51,7 +42,7 @@
.Lret0: /* force new bundle */
st4 [r8]=r33
mov r1=r34
- mov b0=r32
+ mov rp=r32
mov r8=-1
mov ar.pfs=r35
#else /* _LIBC_REENTRANT */
@@ -71,8 +62,7 @@
st4 [r2]=r3
#endif /* _LIBC_REENTRANT */
ret // ret is #define'd in syscall.h!
- .endp __syscall_error
-
+END(__syscall_error)
ENTRY(__ia64_syscall)
mov r15=r37 /* syscall number */
diff -urN -X /home/jes/exclude-libc /home/jes/cygnus/libc-2.2-200301/sysdeps/unix/sysv/linux/ia64/sysdep.h libc-2.2/sysdeps/unix/sysv/linux/ia64/sysdep.h
--- /home/jes/cygnus/libc-2.2-200301/sysdeps/unix/sysv/linux/ia64/sysdep.h Fri Sep 29 12:43:57 2000
+++ libc-2.2/sysdeps/unix/sysv/linux/ia64/sysdep.h Fri Mar 23 15:04:19 2001
@@ -36,16 +36,20 @@
#undef CALL_MCOUNT
#ifdef PROF
-# define CALL_MCOUNT \
- .data; \
-1: data8 0; \
- .previous; \
- alloc out0 = ar.pfs, 8, 0, 4, 0; \
- mov out1 = gp; \
- mov out2 = rp; \
- ;; \
- addl out3 = @ltoff(1b), gp; \
- br.call.sptk.many rp = _mcount \
+# define CALL_MCOUNT \
+ .data; \
+1: data8 0; /* XXX fixme: use .xdata8 once labels work */ \
+ .previous; \
+ .prologue; \
+ .save ar.pfs, r40; \
+ alloc out0 = ar.pfs, 8, 0, 4, 0; \
+ mov out1 = gp; \
+ .save rp, out2; \
+ mov out2 = rp; \
+ .body; \
+ ;; \
+ addl out3 = @ltoff(1b), gp; \
+ br.call.sptk.many rp = _mcount \
;;
#else
# define CALL_MCOUNT /* Do nothing. */
@@ -72,17 +76,6 @@
cmp.eq p6,p0=-1,r10;; \
(p6) br.cond.spnt.few __syscall_error;
-#define ENTRY(name) \
- .psr abi64; \
- .psr lsb; \
- .lsb; \
- .text; \
- .align 32; \
- .proc C_SYMBOL_NAME(name); \
- .global C_SYMBOL_NAME(name); \
- C_LABEL(name) \
- CALL_MCOUNT
-
#define DO_CALL(num) \
mov r15=num; \
break __BREAK_SYSCALL;
| Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
|---|---|---|
| Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |