[src/trunk]: src/sys/compat/mach Improved bahvior for map_fd. When Darin uses...

[manu <manu%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c2dcd6bf9dc1
branches:  trunk
changeset: 546048:c2dcd6bf9dc1
user:      manu <manu%NetBSD.org@localhost>
date:      Sat Apr 19 21:41:15 2003 +0000

description:
Improved bahvior for map_fd. When Darin uses findspace = 0, this seems to
request a mapping at fixed address, overlaying previously existing mappings.

The overlay is done by unmapping (sys_munmap) before mapping at fixed
location. This makes XDarwin able to link and run.

diffstat:

 sys/compat/mach/mach_vm.c |  16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diffs (57 lines):

diff -r ec7aaa0e63e5 -r c2dcd6bf9dc1 sys/compat/mach/mach_vm.c
--- a/sys/compat/mach/mach_vm.c Sat Apr 19 21:30:29 2003 +0000
+++ b/sys/compat/mach/mach_vm.c Sat Apr 19 21:41:15 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mach_vm.c,v 1.26 2003/03/05 22:39:48 manu Exp $ */
+/*     $NetBSD: mach_vm.c,v 1.27 2003/04/19 21:41:15 manu Exp $ */
 
 /*-
  * Copyright (c) 2002-2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mach_vm.c,v 1.26 2003/03/05 22:39:48 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_vm.c,v 1.27 2003/04/19 21:41:15 manu Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -332,7 +332,6 @@
        return 0;
 }
 
-/* XXX The findspace argument is not handled correctly */
 int
 mach_sys_map_fd(l, v, retval)
        struct lwp *l;
@@ -352,12 +351,21 @@
        struct exec_vmcmd evc;
        struct vm_map_entry *ret;
        struct proc *p = l->l_proc;
+       register_t dontcare;
+       struct sys_munmap_args cup;
        void *va;
        int error;
 
        if ((error = copyin(SCARG(uap, va), (void *)&va, sizeof(va))) != 0)
                return error;
 
+       if (SCARG(uap, findspace) == 0) {
+               /* Make some free space XXX probably not The Right Way */
+               SCARG(&cup, addr) = va;
+               SCARG(&cup, len) = SCARG(uap, size);
+               (void)sys_munmap(l, &cup, &dontcare);
+       }
+
        fdp = p->p_fd;
        fp = fd_getfile(fdp, SCARG(uap, fd));
        if (fp == NULL)
@@ -372,7 +380,7 @@
        evc.ev_addr = (u_long)va;
        evc.ev_len = SCARG(uap, size);
        evc.ev_prot = VM_PROT_ALL;
-       evc.ev_flags = 0;
+       evc.ev_flags = SCARG(uap, findspace) ? 0 : VMCMD_FIXED;
        evc.ev_proc = vmcmd_map_readvn;
        evc.ev_offset = SCARG(uap, offset);
        evc.ev_vp = vp;