Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Do the md_syscall, __HAVE_MINIMAL_EMUL and __HAVE_SYSCAL...
details: https://anonhg.NetBSD.org/src/rev/af4aac4c344f
branches: trunk
changeset: 500516:af4aac4c344f
user: mycroft <mycroft%NetBSD.org@localhost>
date: Wed Dec 13 03:16:36 2000 +0000
description:
Do the md_syscall, __HAVE_MINIMAL_EMUL and __HAVE_SYSCALL_INTERN thangs.
diffstat:
sys/arch/alpha/alpha/db_trace.c | 25 +--
sys/arch/alpha/alpha/genassym.cf | 3 +-
sys/arch/alpha/alpha/locore.s | 13 +-
sys/arch/alpha/alpha/osf1_syscall.c | 252 ++++++++++++++++++++++++++++++++
sys/arch/alpha/alpha/syscall.c | 275 ++++++++++++++++++++++++++++++++++++
sys/arch/alpha/alpha/trap.c | 178 +-----------------------
sys/arch/alpha/conf/files.alpha | 4 +-
sys/arch/alpha/include/alpha.h | 3 +-
sys/arch/alpha/include/proc.h | 3 +-
sys/arch/alpha/include/types.h | 4 +-
sys/compat/osf1/osf1_exec.c | 14 +-
11 files changed, 563 insertions(+), 211 deletions(-)
diffs (truncated from 969 to 300 lines):
diff -r a39267413e30 -r af4aac4c344f sys/arch/alpha/alpha/db_trace.c
--- a/sys/arch/alpha/alpha/db_trace.c Wed Dec 13 03:09:06 2000 +0000
+++ b/sys/arch/alpha/alpha/db_trace.c Wed Dec 13 03:16:36 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.8 2000/11/22 04:28:13 enami Exp $ */
+/* $NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.8 2000/11/22 04:28:13 enami Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -173,27 +173,8 @@
static void
decode_syscall(int number, struct proc *p, void (*pr)(const char *, ...))
{
- db_sym_t sym;
- db_expr_t diff;
- char *symname;
- const char *ename;
- int (*f) __P((struct proc *, void *, register_t *));
- (*pr)(" (%d", number); /* ) */
- if (!p)
- goto out;
- if (0 <= number && number < p->p_emul->e_nsysent) {
- ename = p->p_emul->e_name;
- f = p->p_emul->e_sysent[number].sy_call;
- sym = db_search_symbol((db_addr_t)f, DB_STGY_ANY, &diff);
- if (sym == DB_SYM_NULL || diff != 0)
- goto out;
- db_symbol_values(sym, &symname, NULL);
- (*pr)(", %s.%s", ename, symname);
- }
-out:
- (*pr)(")");
- return;
+ (*pr)(" (%d)", number);
}
void
diff -r a39267413e30 -r af4aac4c344f sys/arch/alpha/alpha/genassym.cf
--- a/sys/arch/alpha/alpha/genassym.cf Wed Dec 13 03:09:06 2000 +0000
+++ b/sys/arch/alpha/alpha/genassym.cf Wed Dec 13 03:16:36 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.1 2000/11/29 12:55:12 jdolecek Exp $
+# $NetBSD: genassym.cf,v 1.2 2000/12/13 03:16:37 mycroft Exp $
#
# Copyright (c) 1994, 1995 Gordon W. Ross
@@ -122,6 +122,7 @@
define P_CPU offsetof(struct proc, p_cpu)
define P_MD_FLAGS offsetof(struct proc, p_md.md_flags)
define P_MD_PCBPADDR offsetof(struct proc, p_md.md_pcbpaddr)
+define P_MD_SYSCALL offsetof(struct proc, p_md.md_syscall)
define PH_LINK offsetof(struct prochd, ph_link)
define PH_RLINK offsetof(struct prochd, ph_rlink)
diff -r a39267413e30 -r af4aac4c344f sys/arch/alpha/alpha/locore.s
--- a/sys/arch/alpha/alpha/locore.s Wed Dec 13 03:09:06 2000 +0000
+++ b/sys/arch/alpha/alpha/locore.s Wed Dec 13 03:16:36 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.86 2000/12/13 00:38:20 mycroft Exp $ */
+/* $NetBSD: locore.s,v 1.87 2000/12/13 03:16:37 mycroft Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.86 2000/12/13 00:38:20 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.87 2000/12/13 03:16:37 mycroft Exp $");
#include "assym.h"
@@ -527,9 +527,12 @@
stq ra,(FRAME_RA*8)(sp)
/* syscall number, passed in v0, is first arg, frame pointer second */
- mov v0,a0
- mov sp,a1 ; .loc 1 __LINE__
- CALL(syscall)
+ mov v0,a1
+ GET_CURPROC
+ ldq a0,0(v0)
+ mov sp,a2 ; .loc 1 __LINE__
+ ldq t12,P_MD_SYSCALL(a0)
+ CALL((t12))
jmp zero, exception_return
END(XentSys)
diff -r a39267413e30 -r af4aac4c344f sys/arch/alpha/alpha/osf1_syscall.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/alpha/alpha/osf1_syscall.c Wed Dec 13 03:16:36 2000 +0000
@@ -0,0 +1,252 @@
+/* $NetBSD: osf1_syscall.c,v 1.1 2000/12/13 03:16:37 mycroft Exp $ */
+
+/*-
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+ * NASA Ames Research Center, and 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.
+ */
+
+/*
+ * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
+ *
+ * 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 Christopher G. Demetriou
+ * for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+/*
+ * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ *
+ * 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@localhost
+ * School of Computer Science
+ * Carnegie Mellon University
+ * Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+#include "opt_syscall_debug.h"
+#include "opt_ktrace.h"
+
+#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
+
+__KERNEL_RCSID(0, "$NetBSD: osf1_syscall.c,v 1.1 2000/12/13 03:16:37 mycroft Exp $");
+
+#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/reg.h>
+#include <machine/alpha.h>
+
+#include <compat/osf1/osf1.h>
+#include <compat/osf1/osf1_cvt.h>
+#include <compat/osf1/osf1_syscall.h>
+
+void userret __P((struct proc *));
+void osf1_syscall_intern __P((struct proc *));
+void osf1_syscall __P((struct proc *, u_int64_t, struct trapframe *));
+
+void
+osf1_syscall_intern(p)
+ struct proc *p;
+{
+
+ p->p_md.md_syscall = osf1_syscall;
+}
+
+/*
+ * Process a system call.
+ *
+ * System calls are strange beasts. They are passed the syscall number
+ * in v0, and the arguments in the registers (as normal). They return
+ * an error flag in a3 (if a3 != 0 on return, the syscall had an error),
+ * and the return value (if any) in v0.
+ *
+ * The assembly stub takes care of moving the call number into a register
+ * we can get to, and moves all of the argument registers into their places
+ * in the trap frame. On return, it restores the callee-saved registers,
+ * a3, and v0 from the frame before returning to the user process.
+ */
+void
+osf1_syscall(p, code, framep)
+ struct proc *p;
+ u_int64_t code;
+ struct trapframe *framep;
+{
+ const struct sysent *callp;
+ int error;
+ u_int64_t rval[2];
+ u_int64_t *args, copyargs[10]; /* XXX */
+ u_int hidden, nargs;
+
+ KERNEL_PROC_LOCK(p);
+
+ uvmexp.syscalls++;
+ p->p_md.md_tf = framep;
+
+ callp = p->p_emul->e_sysent;
+
+ switch (code) {
+ case OSF1_SYS_syscall:
+ /* OSF/1 syscall() */
+ code = framep->tf_regs[FRAME_A0];
+ hidden = 1;
+ break;
+ default:
+ hidden = 0;
+ break;
+ }
+
+ code &= (OSF1_SYS_NSYSENT - 1);
+ callp += code;
+
+ nargs = callp->sy_narg + hidden;
+ switch (nargs) {
+ default:
+ error = copyin((caddr_t)alpha_pal_rdusp(), ©args[6],
+ (nargs - 6) * sizeof(u_int64_t));
+ if (error)
+ goto bad;
+ case 6:
+ copyargs[5] = framep->tf_regs[FRAME_A5];
+ case 5:
+ copyargs[4] = framep->tf_regs[FRAME_A4];
+ case 4:
+ copyargs[3] = framep->tf_regs[FRAME_A3];
+ copyargs[2] = framep->tf_regs[FRAME_A2];
+ copyargs[1] = framep->tf_regs[FRAME_A1];
+ copyargs[0] = framep->tf_regs[FRAME_A0];
+ args = copyargs;
Home |
Main Index |
Thread Index |
Old Index