From 4ca84cff3b3e184164acde81deaad1fe52eabd14 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 8 Feb 1996 02:10:15 +0000 Subject: Wed Feb 7 18:48:30 1996 Roland McGrath * hurd/hurdmsg.c (_S_msg_report_wait): Function removed. * hurd/report-wait.c: New file. * hurd/Makefile (routines): Added report-wait. * sysdeps/mach/hurd/Makefile (inhibit-unix-syscalls): New variable. * sysdeps/mach/hurd/i386/intr-msg.h (struct mach_msg_trap_args): New type. (SYSCALL_EXAMINE, MSG_EXAMINE): New inline functions. * sysdeps/mach/hurd/i386/trampoline.c (struct mach_msg_trap_args): Structure moved to intr-msg.h; include that. * time/Makefile (CFLAGS-ialloc.c): Add -Wno-unused. (CFLAGS-scheck.c): New variable. * sysdeps/mach/hurd/dl-sysdep.c (__hurd_sigthread_stack_base, __hurd_sigthread_stack_end, __hurd_sigthread_variables, __hurd_threadvar_stack_mask): New variables. * sysdeps/mach/hurd/fork.c: Set the new task's exception port to its new message port. * misc/init-misc.c: Put __init_misc in the __libc_subinit set. * configure.in (uname): Add quoting. * sysdeps/mach/hurd/fchdir.c: Don't consult errno unless lookup fails. * hurd/fchroot.c: Likewise. * posix/sys/types.h [GCC >= 2.7]: Define intN_t/u_intN_t using __attribute__ ((__mode__ (__XX__))). Wed Feb 7 03:24:05 1996 Torbjorn Granlund * sysdeps/i386/i586/memcopy.h (WORD_COPY_FWD): Manually allocate destination cache lines. (WORD_COPY_BWD): Likewise. Wed Feb 7 14:16:36 1996 Roland McGrath * sysdeps/generic/Makefile (make_siglist): Get signum.h absolute file name first thing, before $(native-compile) changes directories. From Gord Matzigkeit : * sysdeps/unix/make_errlist.c: Use strerror if available. * sysdeps/unix/configure.in: New file * sysdeps/unix/bsd/sun/syscalls.list: Added sigvec. * sysdeps/unix/bsd/sun/sigvec.S: File removed. * sysdeps/stub/sendto.c: Make sockaddr arg pointer to const. * sysdeps/stub/connect.c: Likewise. * sysdeps/stub/bind.c: Likewise. * hurd/hurdlookup.c (__hurd_file_name_lookup_retry): RETRYNAME of "" is only special for FS_RETRY_NORMAL; for FS_RETRY_REAUTH, do another dir_lookup of "". --- sysdeps/generic/Makefile | 5 ++-- sysdeps/i386/i586/memcopy.h | 26 ++++++++++-------- sysdeps/mach/hurd/Makefile | 3 +- sysdeps/mach/hurd/dl-sysdep.c | 8 ++++-- sysdeps/mach/hurd/fchdir.c | 10 ++++--- sysdeps/mach/hurd/fork.c | 6 ++++ sysdeps/mach/hurd/i386/intr-msg.h | 55 ++++++++++++++++++++++++++++++++++++- sysdeps/mach/hurd/i386/trampoline.c | 16 ++--------- sysdeps/stub/bind.c | 4 +-- sysdeps/stub/connect.c | 4 +-- sysdeps/stub/sendto.c | 4 +-- sysdeps/unix/bsd/sun/sigvec.S | 26 ------------------ sysdeps/unix/bsd/sun/syscalls.list | 1 + sysdeps/unix/configure.in | 8 ++++++ sysdeps/unix/make_errlist.c | 10 ++++++- 15 files changed, 118 insertions(+), 68 deletions(-) delete mode 100644 sysdeps/unix/bsd/sun/sigvec.S create mode 100644 sysdeps/unix/configure.in (limited to 'sysdeps') diff --git a/sysdeps/generic/Makefile b/sysdeps/generic/Makefile index 665d1cc53e..5e1032a054 100644 --- a/sysdeps/generic/Makefile +++ b/sysdeps/generic/Makefile @@ -53,9 +53,10 @@ $(objpfx)siglist.c: $(objpfx)make_siglist mv $@-tmp $@ $(objpfx)make_siglist: $(sysdep_dir)/generic/make_siglist.c + signum_h=`cd $(dir $(firstword $(wildcard \ + $(+sysdep_dirs:%=%/signum.h)))); pwd`/signum.h; \ $(native-compile) \ - -DSIGNUM_H=\"`cd $(dir $(firstword $(wildcard \ - $(+sysdep_dirs:%=%/signum.h)))); pwd`/signum.h\" + -DSIGNUM_H=\"$${signum_h}\" generated := $(generated) make_siglist siglist.c endif diff --git a/sysdeps/i386/i586/memcopy.h b/sysdeps/i386/i586/memcopy.h index 0a8768788e..d8928988f3 100644 --- a/sysdeps/i386/i586/memcopy.h +++ b/sysdeps/i386/i586/memcopy.h @@ -1,5 +1,5 @@ /* memcopy.h -- definitions for memory copy functions. Pentium version. - Copyright (C) 1994, 1995 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. Contributed by Torbjorn Granlund (tege@sics.se). This file is part of the GNU C Library. @@ -33,11 +33,14 @@ Cambridge, MA 02139, USA. */ { \ asm volatile ("subl $32,%2\n" \ "js 2f\n" \ + "movl 0(%0),%%edx\n" /* alloc dest line */ \ "1:\n" \ - "movl 0(%1),%%eax\n" \ - "movl 4(%1),%%edx\n" \ - "movl %%eax,0(%0)\n" \ - "movl %%edx,4(%0)\n" \ + "movl 28(%0),%%eax\n" /* alloc dest line */ \ + "subl $32,%2\n" /* decr loop count */ \ + "movl 0(%1),%%eax\n" /* U pipe */ \ + "movl 4(%1),%%edx\n" /* V pipe */ \ + "movl %%eax,0(%0)\n" /* U pipe */ \ + "movl %%edx,4(%0)\n" /* V pipe */ \ "movl 8(%1),%%eax\n" \ "movl 12(%1),%%edx\n" \ "movl %%eax,8(%0)\n" \ @@ -50,9 +53,8 @@ Cambridge, MA 02139, USA. */ "movl 28(%1),%%edx\n" \ "movl %%eax,24(%0)\n" \ "movl %%edx,28(%0)\n" \ - "addl $32,%1\n" \ - "addl $32,%0\n" \ - "subl $32,%2\n" \ + "leal 32(%1),%1\n" /* update src ptr */ \ + "leal 32(%0),%0\n" /* update dst ptr */ \ "jns 1b\n" \ "2: addl $32,%2" : \ "=r" (dst_bp), "=r" (src_bp), "=r" (nbytes_left) : \ @@ -66,7 +68,10 @@ Cambridge, MA 02139, USA. */ { \ asm volatile ("subl $32,%2\n" \ "js 2f\n" \ + "movl -4(%0),%%edx\n" \ "1:\n" \ + "movl -32(%0),%%eax\n" \ + "subl $32,%2\n" \ "movl -4(%1),%%eax\n" \ "movl -8(%1),%%edx\n" \ "movl %%eax,-4(%0)\n" \ @@ -83,9 +88,8 @@ Cambridge, MA 02139, USA. */ "movl -32(%1),%%edx\n" \ "movl %%eax,-28(%0)\n" \ "movl %%edx,-32(%0)\n" \ - "subl $32,%1\n" \ - "subl $32,%0\n" \ - "subl $32,%2\n" \ + "leal -32(%1),%1\n" \ + "leal -32(%0),%0\n" \ "jns 1b\n" \ "2: addl $32,%2" : \ "=r" (dst_ep), "=r" (src_ep), "=r" (nbytes_left) : \ diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile index c650f5f392..462eb23b0e 100644 --- a/sysdeps/mach/hurd/Makefile +++ b/sysdeps/mach/hurd/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc. +# Copyright (C) 1993, 1994, 1995, 1996 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 @@ -65,6 +65,7 @@ vpath hurd/%.h $(hurd-srcdir) # This bypasses all the system call stubs and uses any existing posix or # generic C files instead. inhibit-sysdep-asm += unix* +inhibit-unix-syscalls = yes # Don't try to generate anything from the installed Unix system and its # libraries. That is only of use when building for a Unix system, so as to diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index fece47ba97..21f94f812a 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -48,14 +48,18 @@ unsigned int __hurd_threadvar_max = _HURD_THREADVAR_MAX; static unsigned long int threadvars[_HURD_THREADVAR_MAX]; unsigned long int __hurd_threadvar_stack_offset = (unsigned long int) &threadvars; +unsigned long int __hurd_sigthread_stack_base; +unsigned long int __hurd_sigthread_stack_end; +unsigned long int *__hurd_sigthread_variables; +unsigned long int __hurd_threadvar_stack_mask; /* XXX loser kludge for vm_map kernel bug */ static vm_address_t fmha; static vm_size_t fmhs; -static void unfmh(){ +static void unfmh(void){ __vm_deallocate(__mach_task_self(),fmha,fmhs);} -static void fmh() { +static void fmh(void) { error_t err;int x;mach_port_t p; vm_address_t a=0x08000000U,max=VM_MAX_ADDRESS; while (!(err=__vm_region(__mach_task_self(),&a,&fmhs,&x,&x,&x,&x,&p,&x))){ diff --git a/sysdeps/mach/hurd/fchdir.c b/sysdeps/mach/hurd/fchdir.c index 7c1be4fdd3..23fde24f4f 100644 --- a/sysdeps/mach/hurd/fchdir.c +++ b/sysdeps/mach/hurd/fchdir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 95, 96 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 @@ -31,9 +31,11 @@ DEFUN(fchdir, (fd), int fd) error_t err; file_t dir; - err = HURD_DPORT_USE (fd, (dir = __file_name_lookup_under (port, "", - O_EXEC, 0), - errno)); + err = HURD_DPORT_USE (fd, + ({ + dir = __file_name_lookup_under (port, "", O_EXEC, 0); + dir == MACH_PORT_NULL ? errno : 0; + })); if (! err) _hurd_port_set (&_hurd_ports[INIT_PORT_CWDIR], dir); diff --git a/sysdeps/mach/hurd/fork.c b/sysdeps/mach/hurd/fork.c index 8c6ef12d10..8d730ae4fb 100644 --- a/sysdeps/mach/hurd/fork.c +++ b/sysdeps/mach/hurd/fork.c @@ -252,6 +252,12 @@ __fork (void) if (old != MACH_PORT_NULL) /* XXX what to do here? */ __mach_port_deallocate (__mach_task_self (), old); + /* The new task will receive its own exceptions + on its message port. */ + if (err = __task_set_special_port (newtask, + TASK_EXCEPTION_PORT, + port)) + LOSE; } if (err = __mach_port_insert_right (newtask, portnames[i], diff --git a/sysdeps/mach/hurd/i386/intr-msg.h b/sysdeps/mach/hurd/i386/intr-msg.h index 353a6d2acd..43d244a182 100644 --- a/sysdeps/mach/hurd/i386/intr-msg.h +++ b/sysdeps/mach/hurd/i386/intr-msg.h @@ -1,5 +1,5 @@ /* Machine-dependent details of interruptible RPC messaging. i386 version. -Copyright (C) 1995 Free Software Foundation, Inc. +Copyright (C) 1995, 1996 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 @@ -45,3 +45,56 @@ INTR_MSG_BACK_OUT (struct i386_thread_state *state) else state->ecx = state->uesp; } + +#include "hurdfault.h" + +static inline int +SYSCALL_EXAMINE (struct i386_thread_state *state, int *callno) +{ + struct { unsigned int c[2]; } *p = (void *) (state->eip - 7); + int result; + if (_hurdsig_catch_memory_fault (p)) + return 0; + if (result = p->c[0] == 0x0000009a && (p->c[1] & 0x00ffffff) == 0x00000700) + /* The PC is just after an `lcall $7,$0' instruction. + This is a system call in progress; %eax holds the call number. */ + *callno = state->eax; + _hurdsig_end_catch_fault (); + return result; +} + + +struct mach_msg_trap_args + { + void *retaddr; /* Address mach_msg_trap will return to. */ + /* This is the order of arguments to mach_msg_trap. */ + mach_msg_header_t *msg; + mach_msg_option_t option; + mach_msg_size_t send_size; + mach_msg_size_t rcv_size; + mach_port_t rcv_name; + mach_msg_timeout_t timeout; + mach_port_t notify; + }; + + +static inline mach_port_t +MSG_EXAMINE (struct i386_thread_state *state, int *msgid) +{ + const struct mach_msg_trap_args *args = (const void *) state->uesp; + mach_msg_header_t *msg; + mach_port_t send_port; + + if (_hurdsig_catch_memory_fault (args)) + return MACH_PORT_NULL; + msg = args->msg; + _hurdsig_end_catch_fault (); + + if (_hurdsig_catch_memory_fault (msg)) + return MACH_PORT_NULL; + send_port = msg->msgh_remote_port; + *msgid = msg->msgh_id; + _hurdsig_end_catch_fault (); + + return send_port; +} diff --git a/sysdeps/mach/hurd/i386/trampoline.c b/sysdeps/mach/hurd/i386/trampoline.c index f64539a384..bd91c24304 100644 --- a/sysdeps/mach/hurd/i386/trampoline.c +++ b/sysdeps/mach/hurd/i386/trampoline.c @@ -23,21 +23,9 @@ Cambridge, MA 02139, USA. */ #include #include #include "hurdfault.h" +#include "intr-msg.h" -struct mach_msg_trap_args - { - void *retaddr; /* Address mach_msg_trap will return to. */ - /* This is the order of arguments to mach_msg_trap. */ - mach_msg_header_t *msg; - mach_msg_option_t option; - mach_msg_size_t send_size; - mach_msg_size_t rcv_size; - mach_port_t rcv_name; - mach_msg_timeout_t timeout; - mach_port_t notify; - }; - struct sigcontext * _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, int signo, long int sigcode, @@ -94,7 +82,7 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, per-thread variables, cthreads. */ } /* This code has intimate knowledge of the special mach_msg system call - done in intr-msg.c; that code does: + done in intr-msg.c; that code does (see intr-msg.h): movl %esp, %ecx leal ARGS, %esp _hurd_intr_rpc_msg_cx_sp: movl $-25, %eax diff --git a/sysdeps/stub/bind.c b/sysdeps/stub/bind.c index 9a744ef209..38ad46aa87 100644 --- a/sysdeps/stub/bind.c +++ b/sysdeps/stub/bind.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996 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 @@ -23,7 +23,7 @@ Cambridge, MA 02139, USA. */ /* Give the socket FD the local address ADDR (which is LEN bytes long). */ int DEFUN(bind, (fd, addr, len), - int fd AND struct sockaddr *addr AND size_t len) + int fd AND const struct sockaddr *addr AND size_t len) { errno = ENOSYS; return -1; diff --git a/sysdeps/stub/connect.c b/sysdeps/stub/connect.c index 8e6c7243b4..49300f3a09 100644 --- a/sysdeps/stub/connect.c +++ b/sysdeps/stub/connect.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996 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 @@ -26,7 +26,7 @@ Cambridge, MA 02139, USA. */ Return 0 on success, -1 for errors. */ int DEFUN(connect, (fd, addr, len), - int fd AND struct sockaddr *addr AND size_t len) + int fd AND const struct sockaddr *addr AND size_t len) { errno = ENOSYS; return -1; diff --git a/sysdeps/stub/sendto.c b/sysdeps/stub/sendto.c index f2253b12b9..e26c88751c 100644 --- a/sysdeps/stub/sendto.c +++ b/sysdeps/stub/sendto.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996 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 @@ -25,7 +25,7 @@ Cambridge, MA 02139, USA. */ int DEFUN(sendto, (fd, buf, n, flags, addr, addr_len), int fd AND PTR buf AND size_t n AND int flags AND - struct sockaddr *addr AND size_t addr_len) + const struct sockaddr *addr AND size_t addr_len) { errno = ENOSYS; return -1; diff --git a/sysdeps/unix/bsd/sun/sigvec.S b/sysdeps/unix/bsd/sun/sigvec.S deleted file mode 100644 index c09397486f..0000000000 --- a/sysdeps/unix/bsd/sun/sigvec.S +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (C) 1991, 1992, 1995 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 -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. - -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. */ - -#include - -/* __sigvec is defined by sigtramp.c. */ - -PSEUDO (__raw_sigvec, sigvec, 3) - ret - -weak_alias (__sigvec, sigvec) diff --git a/sysdeps/unix/bsd/sun/syscalls.list b/sysdeps/unix/bsd/sun/syscalls.list index b9dca13bf7..1c0d44d8d9 100644 --- a/sysdeps/unix/bsd/sun/syscalls.list +++ b/sysdeps/unix/bsd/sun/syscalls.list @@ -1,3 +1,4 @@ # File name Caller Syscall name # args Strong name Weak names getdents - getdirentries 4 __getdirentries getdirentries +sigvec - sigvec 3 __raw_sigvec diff --git a/sysdeps/unix/configure.in b/sysdeps/unix/configure.in new file mode 100644 index 0000000000..37b6a5bbb9 --- /dev/null +++ b/sysdeps/unix/configure.in @@ -0,0 +1,8 @@ +sinclude(./aclocal.m4)dnl Autoconf lossage +GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. +# Local configure fragment for sysdeps/unix. + +if test -z "$inhibit_glue"; then +# For make_errlist.c, used in make_errlist. +AC_CHECK_FUNCS(strerror) +fi diff --git a/sysdeps/unix/make_errlist.c b/sysdeps/unix/make_errlist.c index 8c2b250134..0c6a7d948f 100644 --- a/sysdeps/unix/make_errlist.c +++ b/sysdeps/unix/make_errlist.c @@ -21,7 +21,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Make a definition for sys_errlist. */ extern int sys_nerr; +#ifndef HAVE_STRERROR extern char *sys_errlist[]; +#endif int main () @@ -35,7 +37,13 @@ main () puts ("CONST char *CONST _sys_errlist[] =\n {"); for (i = 0; i < sys_nerr; ++i) - printf (" \"%s\",\n", sys_errlist[i]); + printf (" \"%s\",\n", +#ifdef HAVE_STRERROR + strerror (i) +#else /* ! HAVE_STRERROR */ + sys_errlist[i] +#endif /* HAVE_STRERROR */ + ); puts (" NULL\n };\n"); -- cgit 1.4.1