Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/compat/irix - We now use irix_sys_mmap instead of svr4_s...
details: https://anonhg.NetBSD.org/src/rev/f8ac6018ea5e
branches: trunk
changeset: 525940:f8ac6018ea5e
user: manu <manu%NetBSD.org@localhost>
date: Mon Apr 22 05:58:46 2002 +0000
description:
- We now use irix_sys_mmap instead of svr4_sys_mmap
- initial support for MAP_AUTOGROW flag. When mapping beyond the end of file is
requested with MAP_AUTOGROW, if pages beyond the end of file are touched, the
file should be resized. We are not able to emulate this yet, so we immediatly
resize the file to fit the whole mapping.
- implements mmap64
diffstat:
sys/compat/irix/files.irix | 3 +-
sys/compat/irix/irix_mman.c | 211 +++++++++++++++++++++++++++++++++++++
sys/compat/irix/irix_mman.h | 59 ++++++++++
sys/compat/irix/irix_syscall.h | 9 +-
sys/compat/irix/irix_syscallargs.h | 26 ++++-
sys/compat/irix/irix_syscalls.c | 8 +-
sys/compat/irix/irix_sysent.c | 14 +-
sys/compat/irix/syscalls.master | 10 +-
8 files changed, 318 insertions(+), 22 deletions(-)
diffs (truncated from 500 to 300 lines):
diff -r d297756c134b -r f8ac6018ea5e sys/compat/irix/files.irix
--- a/sys/compat/irix/files.irix Mon Apr 22 03:37:12 2002 +0000
+++ b/sys/compat/irix/files.irix Mon Apr 22 05:58:46 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.irix,v 1.19 2002/04/16 20:15:47 manu Exp $
+# $NetBSD: files.irix,v 1.20 2002/04/22 05:58:46 manu Exp $
#
file arch/mips/mips/irix_syscall.c compat_irix
@@ -10,6 +10,7 @@
file compat/irix/irix_fcntl.c compat_irix
file compat/irix/irix_ioctl.c compat_irix
file compat/irix/irix_kmem.c compat_irix
+file compat/irix/irix_mman.c compat_irix
file compat/irix/irix_misc.c compat_irix
file compat/irix/irix_mount.c compat_irix
file compat/irix/irix_prctl.c compat_irix
diff -r d297756c134b -r f8ac6018ea5e sys/compat/irix/irix_mman.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/compat/irix/irix_mman.c Mon Apr 22 05:58:46 2002 +0000
@@ -0,0 +1,211 @@
+/* $NetBSD: irix_mman.c,v 1.1 2002/04/22 05:58:46 manu Exp $ */
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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 <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: irix_mman.c,v 1.1 2002/04/22 05:58:46 manu Exp $");
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/signal.h>
+#include <sys/proc.h>
+#include <sys/filedesc.h>
+#include <sys/file.h>
+#include <sys/vnode.h>
+#include <sys/vnode_if.h>
+#include <sys/mount.h>
+#include <sys/systm.h>
+#include <sys/syscallargs.h>
+
+#include <compat/irix/irix_types.h>
+#include <compat/irix/irix_signal.h>
+#include <compat/irix/irix_mman.h>
+#include <compat/irix/irix_syscallargs.h>
+
+int irix_mmap __P((struct proc *, void *, size_t, int ,
+ int, int, off_t, register_t *));
+
+int
+irix_sys_mmap(p, v, retval)
+ struct proc *p;
+ void *v;
+ register_t *retval;
+{
+ struct irix_sys_mmap_args /* {
+ syscallarg(void *) addr;
+ syscallarg(irix_size_t) len;
+ syscallarg(int) prot;
+ syscallarg(int) flags;
+ syscallarg(int) fd;
+ syscallarg(irix_off_t) pos;
+ } */ *uap = v;
+
+ return irix_mmap(p, SCARG(uap, addr), SCARG(uap, len),
+ SCARG(uap, prot), SCARG(uap, flags), SCARG(uap, fd),
+ SCARG(uap, pos), retval);
+}
+
+int
+irix_sys_mmap64(p, v, retval)
+ struct proc *p;
+ void *v;
+ register_t *retval;
+{
+ struct irix_sys_mmap64_args /* {
+ syscallarg(void *) addr;
+ syscallarg(irix_size_t) len;
+ syscallarg(int) prot;
+ syscallarg(int) flags;
+ syscallarg(int) fd;
+ syscallarg(int) pad1;
+ syscallarg(irix_off64_t) pos;
+ } */ *uap = v;
+ return irix_mmap(p, SCARG(uap, addr), SCARG(uap, len),
+ SCARG(uap, prot), SCARG(uap, flags), SCARG(uap, fd),
+ SCARG(uap, pos), retval);
+}
+
+int
+irix_mmap(p, addr, len, prot, flags, fd, pos, retval)
+ struct proc *p;
+ void *addr;
+ size_t len;
+ int prot;
+ int flags;
+ int fd;
+ off_t pos;
+ register_t *retval;
+{
+ struct sys_mmap_args cup;
+ int bsd_flags = 0;
+
+ bsd_flags = 0;
+ if (flags & IRIX_MAP_SHARED)
+ bsd_flags |= MAP_SHARED;
+ if (flags & IRIX_MAP_PRIVATE)
+ bsd_flags |= MAP_PRIVATE;
+ if (flags & IRIX_MAP_COPY)
+ bsd_flags |= MAP_PRIVATE;
+
+ /*
+ * Note about MAP_FIXED: IRIX's mmap(2) states that
+ * when MAP_FIXED is unset, range 0x30000000 to 0x40000000
+ * will not be used except if MAP_SGI_ANYADDR is set
+ * or if syssgi(SGI_UNSUPPORTED_MAP_RESERVED_RANGE) was
+ * enabled. We do not emulate this behavior for now.
+ */
+ if (flags & IRIX_MAP_FIXED)
+ bsd_flags |= MAP_FIXED;
+ if (flags & IRIX_MAP_RENAME)
+ bsd_flags |= MAP_RENAME;
+
+ if (flags & IRIX_MAP_LOCAL)
+ printf("Warning: unsupported IRIX mmap() flag MAP_LOCAL\n");
+ if (flags & IRIX_MAP_AUTORESRV)
+ printf("Warning: unsupported IRIX mmap() flag MAP_AUTORESV\n");
+ if (flags & IRIX_MAP_TEXT)
+ printf("Warning: unsupported IRIX mmap() flag MAP_TEXT\n");
+ if (flags & IRIX_MAP_BRK)
+ printf("Warning: unsupported IRIX mmap() flag MAP_BRK\n");
+ if (flags & IRIX_MAP_PRIMARY)
+ printf("Warning: unsupported IRIX mmap() flag MAP_PRIMARY\n");
+ if (flags & IRIX_MAP_SGI_ANYADDR)
+ printf("Warning: unsupported IRIX mmap() flag IRIX_MAP_SGI_ANYADDR\n");
+
+ /*
+ * When AUTOGROW is set and the mapping is bigger than
+ * the file, if pages beyond the end of file are touched,
+ * IRIX will increase the file size accordingly. We are
+ * not able to emulate this (yet), hence we immediatly
+ * grow the file to fit the mapping, before mapping it.
+ */
+ if (flags & IRIX_MAP_AUTOGROW) {
+ struct file *fp;
+ struct vnode *vp;
+ struct vattr vattr;
+ int error = 0;
+
+ /* getvnode does FILE_USE */
+ if ((error = getvnode(p->p_fd, fd, &fp)) != 0)
+ return error;
+
+ if ((fp->f_flag & FWRITE) == 0) {
+ error = EINVAL;
+ goto out;
+ }
+
+ vp = (struct vnode *)fp->f_data;
+ if (fp->f_type != DTYPE_VNODE || vp->v_type == VFIFO) {
+ error = ESPIPE;
+ goto out;
+ }
+
+ if (vp->v_type == VDIR) {
+ error = EISDIR;
+ goto out;
+ }
+
+ if ((error = VOP_GETATTR(vp, &vattr, p->p_ucred, p)) != 0)
+ goto out;
+
+ if (pos + len > vattr.va_size) {
+ VATTR_NULL(&vattr);
+ vattr.va_size = round_page(pos + len);
+
+ VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
+ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+
+ error = VOP_SETATTR(vp, &vattr, p->p_ucred, p);
+
+ VOP_UNLOCK(vp, 0);
+ }
+out:
+ FILE_UNUSE(fp, p);
+ if (error)
+ return error;
+
+ }
+
+ SCARG(&cup, addr) = addr;
+ SCARG(&cup, len) = len;
+ SCARG(&cup, prot) = prot;
+ SCARG(&cup, flags) = bsd_flags;
+ SCARG(&cup, fd) = fd;
+ SCARG(&cup, pos) = pos;
+
+ return sys_mmap(p, &cup, retval);
+}
diff -r d297756c134b -r f8ac6018ea5e sys/compat/irix/irix_mman.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/compat/irix/irix_mman.h Mon Apr 22 05:58:46 2002 +0000
@@ -0,0 +1,59 @@
+/* $NetBSD: irix_mman.h,v 1.1 2002/04/22 05:58:47 manu Exp $ */
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Emmanuel Dreyfus.
+ *
+ * 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.
+ */
+
+#ifndef _IRIX_MMAN_H_
+#define _IRIX_MMAN_H_
+
+#include <sys/mman.h>
+
+/* From IRIX's <sys/mman.h> */
+
+#define IRIX_MAP_SHARED MAP_SHARED
+#define IRIX_MAP_PRIVATE MAP_PRIVATE
+#define IRIX_MAP_COPY 0x0004
+#define IRIX_MAP_FIXED MAP_FIXED
+#define IRIX_MAP_RENAME MAP_RENAME
+#define IRIX_MAP_AUTOGROW 0x0040
+#define IRIX_MAP_LOCAL 0x0080
+#define IRIX_MAP_AUTORESRV 0x0100
+#define IRIX_MAP_TEXT 0x0200
+#define IRIX_MAP_BRK 0x0400
+#define IRIX_MAP_PRIMARY 0x0800
+#define IRIX_MAP_SGI_ANYADDR 0x1000
+
+#endif /* _IRIX_MMAN_H_ */
diff -r d297756c134b -r f8ac6018ea5e sys/compat/irix/irix_syscall.h
--- a/sys/compat/irix/irix_syscall.h Mon Apr 22 03:37:12 2002 +0000
+++ b/sys/compat/irix/irix_syscall.h Mon Apr 22 05:58:46 2002 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: irix_syscall.h,v 1.37 2002/04/20 16:56:28 manu Exp $ */
Home |
Main Index |
Thread Index |
Old Index