From dd4b8913cd97d9f5c3852171189d05ecd925986e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 7 Nov 1996 01:34:35 +0000 Subject: [PATCH] update from 961105, second try --- sysdeps/unix/alpha/sysdep.h | 78 +++++++++---------- sysdeps/unix/sysv/linux/alpha/brk.S | 4 + sysdeps/unix/sysv/linux/alpha/clone.S | 4 + .../sysv/linux/alpha/ieee_get_fp_control.S | 18 ++++- .../sysv/linux/alpha/ieee_set_fp_control.S | 19 ++++- sysdeps/unix/sysv/linux/alpha/llseek.S | 12 ++- sysdeps/unix/sysv/linux/alpha/sigsuspend.S | 12 ++- sysdeps/unix/sysv/linux/alpha/syscall.S | 14 +++- sysdeps/unix/sysv/linux/m68k/syscall.S | 30 +++---- sysdeps/unix/sysv/linux/m68k/sysdep.S | 32 ++++---- sysdeps/unix/sysv/linux/m68k/sysdep.h | 7 +- 11 files changed, 146 insertions(+), 84 deletions(-) diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h index 72d84047c2..e27909ad9b 100644 --- a/sysdeps/unix/alpha/sysdep.h +++ b/sysdeps/unix/alpha/sysdep.h @@ -1,20 +1,21 @@ /* Copyright (C) 1992, 1995, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. Contributed by Brendan Kehoe (brendan@zen.org). -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include @@ -27,36 +28,24 @@ Cambridge, MA 02139, USA. */ #endif #ifdef __STDC__ -#define LEAF(name, framesize) \ - .globl name; \ - .align 3; \ - .ent name, 0; \ - name##: \ - .frame sp, framesize, ra +#define __LABEL(x) x##: #else +#define __LABEL(x) x/**/: +#endif + #define LEAF(name, framesize) \ .globl name; \ .align 3; \ .ent name, 0; \ - name/**/: \ + __LABEL(name) \ .frame sp, framesize, ra -#endif -#ifdef __STDC__ -#define ENTRY(name) \ - .globl name; \ - .align 3; \ - .ent name, 0; \ - name##: \ - .frame sp, 0, ra -#else #define ENTRY(name) \ .globl name; \ .align 3; \ .ent name, 0; \ - name/**/: \ + __LABEL(name) \ .frame sp, 0, ra -#endif /* Mark the end of function SYM. */ #undef END @@ -64,16 +53,20 @@ Cambridge, MA 02139, USA. */ /* Note that PSEUDO/PSEUDO_END use label number 1996---do not use a label of that number between those two macros! */ - -#ifdef __STDC__ + +#ifdef PROF #define PSEUDO(name, syscall_name, args) \ .globl name; \ .align 3; \ .ent name,0; \ - \ -name##: \ - .frame sp, 0, ra \ - .prologue 1; /* yes, we do use gp */ \ +__LABEL(name) \ + .frame sp, 0, ra; \ + ldgp gp,0(pv); \ + .set noat; \ + lda AT,_mcount; \ + jsr AT,(AT),_mcount; \ + .set at; \ + .prologue 1; \ ldiq v0, SYS_ify(syscall_name); \ .set noat; \ call_pal PAL_callsys; \ @@ -85,10 +78,9 @@ name##: \ .globl name; \ .align 3; \ .ent name,0; \ - \ -name/**/: \ +__LABEL(name) \ .frame sp, 0, ra \ - .prologue 1; /* yes, we do use gp */ \ + .prologue 0; \ ldiq v0, SYS_ify(syscall_name); \ .set noat; \ call_pal PAL_callsys; \ @@ -98,13 +90,19 @@ name/**/: \ #endif #undef PSEUDO_END - +#ifdef PROF +#define PSEUDO_END(sym) \ +1996: \ + jmp zero, __syscall_error; \ + END(sym) +#else #define PSEUDO_END(sym) \ 1996: \ br gp, 2f; \ 2: ldgp gp, 0(gp); \ jmp zero, __syscall_error; \ END(sym) +#endif #define r0 v0 #define r1 a4 diff --git a/sysdeps/unix/sysv/linux/alpha/brk.S b/sysdeps/unix/sysv/linux/alpha/brk.S index 75be949aff..d31d9e9b4d 100644 --- a/sysdeps/unix/sysv/linux/alpha/brk.S +++ b/sysdeps/unix/sysv/linux/alpha/brk.S @@ -38,6 +38,10 @@ __curbrk: .skip 8 .text LEAF(__brk, 0) ldgp gp, 0(t12) +#ifdef PROF + lda AT, _mcount + jsr AT, (AT), _mcount +#endif .prologue 1 ldiq v0, __NR_brk diff --git a/sysdeps/unix/sysv/linux/alpha/clone.S b/sysdeps/unix/sysv/linux/alpha/clone.S index 71d8053b12..9dbf3034c9 100644 --- a/sysdeps/unix/sysv/linux/alpha/clone.S +++ b/sysdeps/unix/sysv/linux/alpha/clone.S @@ -32,6 +32,10 @@ ENTRY(__clone) /* Save rest of argument registers for varargs-type work. */ stq a4,0(sp) stq a5,8(sp) +#ifdef PROF + lda AT, _mcount + jsr AT, (AT), _mcount +#endif .prologue 1 /* Sanity check arguments. */ diff --git a/sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S b/sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S index e09fa738e2..1176a2730f 100644 --- a/sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S +++ b/sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S @@ -22,9 +22,17 @@ Cambridge, MA 02139, USA. */ .text -LEAF(__ieee_get_fp_control, 8) - lda sp, -8(sp) +LEAF(__ieee_get_fp_control, 16) +#ifdef PROF + ldgp gp, 0(pv) + lda sp, -16(sp) + lda AT, _mcount + jsr AT, (AT), _mcount .prologue 1 +#else + lda sp, -16(sp) + .prologue 0 +#endif mov sp, a1 ldi a0, GSI_IEEE_FP_CONTROL @@ -33,12 +41,14 @@ LEAF(__ieee_get_fp_control, 8) bne a3, error ldq v0, 0(sp) - lda sp, 8(sp) + lda sp, 16(sp) ret -error: lda sp, 8(sp) +error: lda sp, 16(sp) +#ifndef PROF br gp, 1f 1: ldgp gp, 0(gp) +#endif jmp zero, __syscall_error END(__ieee_get_fp_control) diff --git a/sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S b/sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S index d748c81142..aa761ecaca 100644 --- a/sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S +++ b/sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S @@ -20,9 +20,17 @@ Cambridge, MA 02139, USA. */ #define SSI_IEEE_FP_CONTROL 14 -LEAF(__ieee_set_fp_control, 8) - lda sp, -8(sp) +LEAF(__ieee_set_fp_control, 16) +#ifdef PROF + ldgp gp, 0(sp) + lda sp, -16(sp) + lda AT, _mcount + jsr AT, (AT), _mcount .prologue 1 +#else + lda sp, -16(sp) + .prologue 0 +#endif stq a0, 0(sp) mov sp, a1 @@ -30,13 +38,16 @@ LEAF(__ieee_set_fp_control, 8) ldi v0, __NR_osf_setsysinfo call_pal PAL_callsys - lda sp, 8(sp) + lda sp, 16(sp) bne a3, error ret -error: br gp, 1f +error: +#ifndef PROF + br gp, 1f 1: ldgp gp, 0(gp) +#endif jmp zero, __syscall_error END(__ieee_set_fp_control) diff --git a/sysdeps/unix/sysv/linux/alpha/llseek.S b/sysdeps/unix/sysv/linux/alpha/llseek.S index 6020f263cd..45fb349236 100644 --- a/sysdeps/unix/sysv/linux/alpha/llseek.S +++ b/sysdeps/unix/sysv/linux/alpha/llseek.S @@ -24,7 +24,14 @@ Cambridge, MA 02139, USA. */ .text ENTRY(llseek) +#ifdef PROF + ldgp gp, 0(pv) + lda AT, _mcount + jsr AT, (AT), _mcount .prologue 1 +#else + .prologue 0 +#endif sll a1, 32, a1 /* build a 64 bit ofs out of 32 bit operands */ zap a2, 0xf0, a2 @@ -40,8 +47,11 @@ ENTRY(llseek) stq v0, 0(t0) ret -error: br gp, 1f +error: +#ifndef PROF + br gp, 1f 1: ldgp gp, 0(gp) +#endif jmp zero, __syscall_error END(llseek) diff --git a/sysdeps/unix/sysv/linux/alpha/sigsuspend.S b/sysdeps/unix/sysv/linux/alpha/sigsuspend.S index aaae9a308a..83d331fef0 100644 --- a/sysdeps/unix/sysv/linux/alpha/sigsuspend.S +++ b/sysdeps/unix/sysv/linux/alpha/sigsuspend.S @@ -24,7 +24,14 @@ Cambridge, MA 02139, USA. */ .text LEAF(sigsuspend, 0) +#ifdef PROF + ldgp gp, 0(pv) + lda AT, _mcount + jsr AT, (AT), _mcount .prologue 1 +#else + .prologue 0 +#endif ldq a0, 0(a0) ldi v0, __NR_sigsuspend @@ -32,8 +39,11 @@ LEAF(sigsuspend, 0) bne a3, error ret -error: br gp, 1f +error: +#ifndef PROF + br gp, 1f 1: ldgp gp, 0(gp) +#endif jmp zero, __syscall_error END(sigsuspend) diff --git a/sysdeps/unix/sysv/linux/alpha/syscall.S b/sysdeps/unix/sysv/linux/alpha/syscall.S index f1b36e9312..81043c2cdb 100644 --- a/sysdeps/unix/sysv/linux/alpha/syscall.S +++ b/sysdeps/unix/sysv/linux/alpha/syscall.S @@ -42,6 +42,15 @@ Cambridge, MA 02139, USA. */ LEAF(__syscall, 0) +#ifdef PROF + ldgp gp, 0(pv) + lda AT, _mcount + jsr AT, (AT), _mcount + .prologue 1 +#else + .prologue 0 +#endif + mov a0, v0 /* Syscall number -> v0 */ mov a1, a0 /* arg1-arg5 -> a0-a4 */ mov a2, a1 @@ -53,8 +62,11 @@ LEAF(__syscall, 0) bne a3, error ret -error: br gp, 2f +error: +#ifndef PROF + br gp, 2f 2: ldgp gp, 0(gp) +#endif jmp zero, __syscall_error weak_alias(__syscall, syscall) diff --git a/sysdeps/unix/sysv/linux/m68k/syscall.S b/sysdeps/unix/sysv/linux/m68k/syscall.S index b7417aa911..d2328dc545 100644 --- a/sysdeps/unix/sysv/linux/m68k/syscall.S +++ b/sysdeps/unix/sysv/linux/m68k/syscall.S @@ -1,25 +1,25 @@ /* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. + 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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include /* Please consult the file sysdeps/unix/sysv/linux/m68k/sysdep.h for - more information about the value -128 used below.*/ + more information about the value -4096 used below.*/ .text ENTRY (syscall) @@ -27,7 +27,7 @@ ENTRY (syscall) _DOARGS_5 (24) /* Frob arguments. */ trap &0 /* Do the system call. */ UNDOARGS_5 /* Unfrob arguments. */ - moveq.l &-128, %d1 + moveq.l &-4096, %d1 cmp.l %d1, %d0 /* Check %d0 for error. */ jcc syscall_error /* Jump to error handler if negative. */ rts /* Return to caller. */ diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.S b/sysdeps/unix/sysv/linux/m68k/sysdep.S index 7016a26a60..95e63542ee 100644 --- a/sysdeps/unix/sysv/linux/m68k/sysdep.S +++ b/sysdeps/unix/sysv/linux/m68k/sysdep.S @@ -1,20 +1,20 @@ /* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. + 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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include @@ -62,7 +62,11 @@ __syscall_error: END (__syscall_error) #endif /* PIC */ -ENTRY (__errno_location) + .weak __errno_location + .type __errno_location,@function + .align 4 +__errno_location: + CALL_MCOUNT #ifdef PIC move.l (%pc, errno@GOTPC), %a0 #else diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h index 3366caab45..46d5a7e48f 100644 --- a/sysdeps/unix/sysv/linux/m68k/sysdep.h +++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h @@ -74,14 +74,13 @@ Cambridge, MA 02139, USA. */ even if the call succeeded. E.g., the `lseek' system call might return a large offset. Therefore we must not anymore test for < 0, but test for a real error by making sure the value in %d0 is a real error - number. For now (as of 2.1.1) 122 is the largest defined error number. - We allow for a bit of room for development and treat -128 to -1 as - error values. */ + number. Linus said he will make sure the no syscall returns a value + in -1 .. -4095 as a valid result so we can savely test with -4096. */ #define PSEUDO(name, syscall_name, args) \ .text; \ ENTRY (name) \ DO_CALL (&SYS_ify (syscall_name), args); \ - moveq.l &-128, %d1; \ + moveq.l &-4096, %d1; \ cmp.l %d1, %d0; \ jcc syscall_error -- 2.43.5