Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys separate the freebsd syscall code similarily to other em...
details: https://anonhg.NetBSD.org/src/rev/a91f015e322c
branches: trunk
changeset: 500794:a91f015e322c
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Mon Dec 18 20:38:27 2000 +0000
description:
separate the freebsd syscall code similarily to other emulations
diffstat:
sys/arch/i386/conf/files.i386 | 3 +-
sys/arch/i386/i386/freebsd_syscall.c | 255 +++++++++++++++++++++++++++++++++++
sys/compat/freebsd/freebsd_exec.c | 4 +-
3 files changed, 259 insertions(+), 3 deletions(-)
diffs (294 lines):
diff -r 39803de484e5 -r a91f015e322c sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386 Mon Dec 18 20:32:08 2000 +0000
+++ b/sys/arch/i386/conf/files.i386 Mon Dec 18 20:38:27 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.178 2000/12/11 05:28:59 mycroft Exp $
+# $NetBSD: files.i386,v 1.179 2000/12/18 20:38:27 jdolecek Exp $
#
# new style config file for i386 architecture
#
@@ -326,6 +326,7 @@
include "compat/freebsd/files.freebsd"
file arch/i386/i386/freebsd_machdep.c compat_freebsd
file arch/i386/i386/freebsd_sigcode.s compat_freebsd
+file arch/i386/i386/freebsd_syscall.c compat_freebsd
# a.out binary compatibility (COMPAT_AOUT)
include "compat/aout/files.aout"
diff -r 39803de484e5 -r a91f015e322c sys/arch/i386/i386/freebsd_syscall.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/i386/freebsd_syscall.c Mon Dec 18 20:38:27 2000 +0000
@@ -0,0 +1,255 @@
+/* $NetBSD: freebsd_syscall.c,v 1.1 2000/12/18 20:38:28 jdolecek Exp $ */
+
+/*-
+ * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles M. Hannum.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "opt_syscall_debug.h"
+#include "opt_vm86.h"
+#include "opt_ktrace.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/user.h>
+#include <sys/signal.h>
+#ifdef KTRACE
+#include <sys/ktrace.h>
+#endif
+#include <sys/syscall.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <machine/cpu.h>
+#include <machine/psl.h>
+#include <machine/userret.h>
+
+void freebsd_syscall_intern __P((struct proc *));
+void freebsd_syscall_plain __P((struct trapframe));
+void freebsd_syscall_fancy __P((struct trapframe));
+
+void
+freebsd_syscall_intern(p)
+ struct proc *p;
+{
+
+#ifdef KTRACE
+ if (p->p_traceflag & (KTRFAC_SYSCALL | KTRFAC_SYSRET))
+ p->p_md.md_syscall = freebsd_syscall_fancy;
+ else
+#endif
+ p->p_md.md_syscall = freebsd_syscall_plain;
+}
+
+/*
+ * syscall(frame):
+ * System call request from POSIX system call gate interface to kernel.
+ * Like trap(), argument is call by reference.
+ */
+void
+freebsd_syscall_plain(frame)
+ struct trapframe frame;
+{
+ register caddr_t params;
+ register const struct sysent *callp;
+ register struct proc *p;
+ int error;
+ size_t argsize;
+ register_t code, args[8], rval[2];
+
+ uvmexp.syscalls++;
+ p = curproc;
+
+ code = frame.tf_eax;
+ callp = p->p_emul->e_sysent;
+ params = (caddr_t)frame.tf_esp + sizeof(int);
+
+ switch (code) {
+ case SYS_syscall:
+ /*
+ * Code is first argument, followed by actual args.
+ */
+ code = fuword(params);
+ params += sizeof(int);
+ break;
+ case SYS___syscall:
+ /*
+ * Like syscall, but code is a quad, so as to maintain
+ * quad alignment for the rest of the arguments.
+ */
+ code = fuword(params + _QUAD_LOWWORD * sizeof(int));
+ params += sizeof(quad_t);
+ break;
+ default:
+ break;
+ }
+
+ code &= (SYS_NSYSENT - 1);
+ callp += code;
+ argsize = callp->sy_argsize;
+ if (argsize) {
+ error = copyin(params, (caddr_t)args, argsize);
+ if (error)
+ goto bad;
+ }
+
+#ifdef SYSCALL_DEBUG
+ scdebug_call(p, code, args);
+#endif /* SYSCALL_DEBUG */
+
+ rval[0] = 0;
+ rval[1] = frame.tf_edx; /* need to keep edx for shared FreeBSD bins */
+ error = (*callp->sy_call)(p, args, rval);
+ switch (error) {
+ case 0:
+ frame.tf_eax = rval[0];
+ frame.tf_edx = rval[1];
+ frame.tf_eflags &= ~PSL_C; /* carry bit */
+ break;
+ case ERESTART:
+ /*
+ * The offset to adjust the PC by depends on whether we entered
+ * the kernel through the trap or call gate. We pushed the
+ * size of the instruction into tf_err on entry.
+ */
+ frame.tf_eip -= frame.tf_err;
+ break;
+ case EJUSTRETURN:
+ /* nothing to do */
+ break;
+ default:
+ bad:
+ frame.tf_eax = error;
+ frame.tf_eflags |= PSL_C; /* carry bit */
+ break;
+ }
+
+#ifdef SYSCALL_DEBUG
+ scdebug_ret(p, code, error, rval);
+#endif /* SYSCALL_DEBUG */
+ userret(p);
+}
+
+void
+freebsd_syscall_fancy(frame)
+ struct trapframe frame;
+{
+ register caddr_t params;
+ register const struct sysent *callp;
+ register struct proc *p;
+ int error;
+ size_t argsize;
+ register_t code, args[8], rval[2];
+
+ uvmexp.syscalls++;
+ p = curproc;
+
+ code = frame.tf_eax;
+ callp = p->p_emul->e_sysent;
+ params = (caddr_t)frame.tf_esp + sizeof(int);
+
+ switch (code) {
+ case SYS_syscall:
+ /*
+ * Code is first argument, followed by actual args.
+ */
+ code = fuword(params);
+ params += sizeof(int);
+ break;
+ case SYS___syscall:
+ /*
+ * Like syscall, but code is a quad, so as to maintain
+ * quad alignment for the rest of the arguments.
+ */
+ code = fuword(params + _QUAD_LOWWORD * sizeof(int));
+ params += sizeof(quad_t);
+ break;
+ default:
+ break;
+ }
+
+ code &= (SYS_NSYSENT - 1);
+ callp += code;
+ argsize = callp->sy_argsize;
+ if (argsize) {
+ error = copyin(params, (caddr_t)args, argsize);
+ if (error)
+ goto bad;
+ }
+
+#ifdef SYSCALL_DEBUG
+ scdebug_call(p, code, args);
+#endif /* SYSCALL_DEBUG */
+#ifdef KTRACE
+ if (KTRPOINT(p, KTR_SYSCALL))
+ ktrsyscall(p, code, argsize, args);
+#endif /* KTRACE */
+
+ rval[0] = 0;
+ rval[1] = frame.tf_edx; /* need to keep edx for shared FreeBSD bins */
+ error = (*callp->sy_call)(p, args, rval);
+ switch (error) {
+ case 0:
+ frame.tf_eax = rval[0];
+ frame.tf_edx = rval[1];
+ frame.tf_eflags &= ~PSL_C; /* carry bit */
+ break;
+ case ERESTART:
+ /*
+ * The offset to adjust the PC by depends on whether we entered
+ * the kernel through the trap or call gate. We pushed the
+ * size of the instruction into tf_err on entry.
+ */
+ frame.tf_eip -= frame.tf_err;
+ break;
+ case EJUSTRETURN:
+ /* nothing to do */
+ break;
+ default:
+ bad:
+ frame.tf_eax = error;
+ frame.tf_eflags |= PSL_C; /* carry bit */
+ break;
+ }
+
+#ifdef SYSCALL_DEBUG
+ scdebug_ret(p, code, error, rval);
+#endif /* SYSCALL_DEBUG */
+ userret(p);
+#ifdef KTRACE
+ if (KTRPOINT(p, KTR_SYSRET))
+ ktrsysret(p, code, error, rval[0]);
+#endif /* KTRACE */
+}
diff -r 39803de484e5 -r a91f015e322c sys/compat/freebsd/freebsd_exec.c
--- a/sys/compat/freebsd/freebsd_exec.c Mon Dec 18 20:32:08 2000 +0000
+++ b/sys/compat/freebsd/freebsd_exec.c Mon Dec 18 20:38:27 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_exec.c,v 1.13 2000/12/11 05:29:00 mycroft Exp $ */
+/* $NetBSD: freebsd_exec.c,v 1.14 2000/12/18 20:38:28 jdolecek Exp $ */
/*
* Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -65,7 +65,7 @@
NULL,
NULL,
#ifdef __HAVE_SYSCALL_INTERN
- syscall_intern,
+ freebsd_syscall_intern,
#else
syscall,
#endif
Home |
Main Index |
Thread Index |
Old Index