diff options
Diffstat (limited to 'mach')
| -rw-r--r-- | mach/Makefile | 16 | ||||
| -rw-r--r-- | mach/Versions | 5 | ||||
| -rw-r--r-- | mach/msg.c | 85 |
3 files changed, 89 insertions, 17 deletions
diff --git a/mach/Makefile b/mach/Makefile index 674250c9ad..a4e4c077f7 100644 --- a/mach/Makefile +++ b/mach/Makefile @@ -67,6 +67,9 @@ distribute += Machrules syscalls.awk shortcut.awk \ # Clear any environment value. generated = +# Translate GNU names for CPUs into the names used in Mach header files. +mach-machine = $(patsubst powerpc,ppc,$(base-machine)) + # Define mach-syscalls and sysno-*. ifndef no_deps ifndef inhibit_mach_syscalls @@ -80,7 +83,7 @@ $(objpfx)mach-syscalls.mk: syscalls.awk Makefile echo '#include <mach/syscall_sw.h>' | \ DEPENDENCIES_OUTPUT='$@-dep $@' \ $(CC) $(CFLAGS) $(CPPFLAGS) -E -x c-header - \ - -D_MACH_`echo $(base-machine) | tr a-z A-Z`_SYSCALL_SW_H_=1 | \ + -D_MACH_`echo $(mach-machine) | tr a-z A-Z`_SYSCALL_SW_H_=1 | \ sed -n -e 's/^kernel_trap(\(.*\),\([-0-9]*\),\([0-9]*\))$$/\1 \2 \3/p'\ | $(AWK) -f $< > $@-new cat $@-dep >> $@-new; rm -f $@-dep @@ -93,15 +96,20 @@ ifndef mach-syscalls no_deps=t else $(mach-syscalls:%=$(objpfx)%.S): $(objpfx)%.S: $(objpfx)mach-syscalls.mk - (echo '#include <sysdep.h>'; \ + (echo '#include <mach/machine/syscall_sw.h>'; \ echo 'kernel_trap(__$*,$(sysno-$*),$(nargs-$*))'; \ echo 'weak_alias (__$*, $*)') > $@-new mv -f $@-new $@ generated += $(mach-syscalls:=.S) endif # mach-syscalls -# syscall_device_writev_request has no RPC equivalent. -mach-shortcuts := $(filter-out device_writev_request,\ +# These syscalls that look like RPCs actually have no RPC equivalents. +mach-shortcuts := $(filter-out device_writev_request \ + device_read_overwrite_request \ + device_read_overwrite \ + vm_read_overwrite \ + thread_switch \ + ,\ $(patsubst syscall_%,%,$(filter syscall_%,$(mach-syscalls)))) ifndef mach-shortcuts diff --git a/mach/Versions b/mach/Versions index 4a7017fe22..18ec511d91 100644 --- a/mach/Versions +++ b/mach/Versions @@ -24,7 +24,7 @@ libc { %endif # functions used by RPC stubs - __mach_msg; + __mach_msg; __mach_msg_overwrite; __mig_allocate; __mig_deallocate; __mig_dealloc_reply_port; __mig_get_reply_port; __mig_put_reply_port; __mig_strncpy; @@ -40,7 +40,8 @@ libc { # m* mach_error; mach_error_string; mach_error_type; mach_host_self; - mach_msg; mach_msg_destroy; + mach_msg; mach_msg_overwrite; + mach_msg_destroy; mach_msg_send; mach_msg_receive; mach_msg_server; mach_msg_server_timeout; mach_open_devstream; diff --git a/mach/msg.c b/mach/msg.c index ece110868d..bccad7fd26 100644 --- a/mach/msg.c +++ b/mach/msg.c @@ -1,31 +1,94 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989, 1995 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ #include <mach/port.h> #include <mach/message.h> +#ifdef MACH_MSG_OVERWRITE +/* In variants with this feature, the actual system call is + __mach_msg_overwrite_trap. */ +mach_msg_return_t +__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) +{ + return __mach_msg_overwrite_trap (msg, option, send_size, + rcv_size, rcv_name, timeout, notify, + MACH_MSG_NULL, 0); +} +weak_alias (__mach_msg_trap, mach_msg_trap) + +/* See comments below in __mach_msg. */ +mach_msg_return_t +__mach_msg_overwrite (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, + mach_msg_header_t *rcv_msg, + mach_msg_size_t rcv_msg_size) + +{ + mach_msg_return_t ret; + + /* Consider the following cases: + 1. Errors in pseudo-receive (eg, MACH_SEND_INTERRUPTED + plus special bits). + 2. Use of MACH_SEND_INTERRUPT/MACH_RCV_INTERRUPT options. + 3. RPC calls with interruptions in one/both halves. + */ + + ret = __mach_msg_overwrite_trap (msg, option, send_size, + rcv_size, rcv_name, timeout, notify, + rcv_msg, rcv_msg_size); + if (ret == MACH_MSG_SUCCESS) + return MACH_MSG_SUCCESS; + + if (!(option & MACH_SEND_INTERRUPT)) + while (ret == MACH_SEND_INTERRUPTED) + ret = __mach_msg_overwrite_trap (msg, option, send_size, + rcv_size, rcv_name, timeout, notify, + rcv_msg, rcv_msg_size); + + if (!(option & MACH_RCV_INTERRUPT)) + while (ret == MACH_RCV_INTERRUPTED) + ret = __mach_msg_overwrite_trap (msg, option & ~MACH_SEND_MSG, + 0, rcv_size, rcv_name, timeout, notify, + rcv_msg, rcv_msg_size); + + return ret; +} +weak_alias (__mach_msg_overwrite, mach_msg_overwrite) +#endif + mach_msg_return_t __mach_msg (mach_msg_header_t *msg, mach_msg_option_t option, @@ -36,29 +99,29 @@ __mach_msg (mach_msg_header_t *msg, mach_port_t notify) { mach_msg_return_t ret; - + /* Consider the following cases: 1. Errors in pseudo-receive (eg, MACH_SEND_INTERRUPTED plus special bits). 2. Use of MACH_SEND_INTERRUPT/MACH_RCV_INTERRUPT options. 3. RPC calls with interruptions in one/both halves. */ - + ret = __mach_msg_trap (msg, option, send_size, rcv_size, rcv_name, timeout, notify); if (ret == MACH_MSG_SUCCESS) return MACH_MSG_SUCCESS; - + if (!(option & MACH_SEND_INTERRUPT)) while (ret == MACH_SEND_INTERRUPTED) ret = __mach_msg_trap (msg, option, send_size, rcv_size, rcv_name, timeout, notify); - + if (!(option & MACH_RCV_INTERRUPT)) while (ret == MACH_RCV_INTERRUPTED) ret = __mach_msg_trap (msg, option & ~MACH_SEND_MSG, 0, rcv_size, rcv_name, timeout, notify); - + return ret; } weak_alias (__mach_msg, mach_msg) |