about summary refs log tree commit diff
path: root/sysdeps/mach
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/mach')
-rw-r--r--sysdeps/mach/hurd/Makefile3
-rw-r--r--sysdeps/mach/hurd/dl-sysdep.c8
-rw-r--r--sysdeps/mach/hurd/fchdir.c10
-rw-r--r--sysdeps/mach/hurd/fork.c6
-rw-r--r--sysdeps/mach/hurd/i386/intr-msg.h55
-rw-r--r--sysdeps/mach/hurd/i386/trampoline.c16
6 files changed, 76 insertions, 22 deletions
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 <assert.h>
 #include <errno.h>
 #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