[src/trunk]: src/sys/compat/mach First attempt at mach_make_memory_entry. Unt...

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

details:   https://anonhg.NetBSD.org/src/rev/2bef4a5d09c6
branches:  trunk
changeset: 554892:2bef4a5d09c6
user:      manu <manu%NetBSD.org@localhost>
date:      Mon Nov 03 20:58:18 2003 +0000

description:
First attempt at mach_make_memory_entry. Untested

diffstat:

 sys/compat/mach/mach_port.h |   5 +++--
 sys/compat/mach/mach_vm.c   |  31 +++++++++++++++++++++++--------
 sys/compat/mach/mach_vm.h   |   6 +++++-
 3 files changed, 31 insertions(+), 11 deletions(-)

diffs (113 lines):

diff -r 9a08aa8c1f72 -r 2bef4a5d09c6 sys/compat/mach/mach_port.h
--- a/sys/compat/mach/mach_port.h       Mon Nov 03 20:32:17 2003 +0000
+++ b/sys/compat/mach/mach_port.h       Mon Nov 03 20:58:18 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mach_port.h,v 1.26 2003/11/01 18:41:25 manu Exp $ */
+/*     $NetBSD: mach_port.h,v 1.27 2003/11/03 20:58:18 manu Exp $ */
 
 /*-
  * Copyright (c) 2002-2003 The NetBSD Foundation, Inc.
@@ -297,9 +297,10 @@
 /* mp_datatype for struct mach_port */
 #define        MACH_MP_NONE            0x0     /* No data */
 #define MACH_MP_DEVICE_ITERATOR        0x2     /* (struct mach_device_iterator *) */
-#define MACH_MP_IOKIT_DEVCLASS 0x3     /* (struct mach_iokit_devclass **) */
+#define MACH_MP_IOKIT_DEVCLASS 0x3     /* (struct mach_iokit_devclass *) */
 #define MACH_MP_PROC           0x4     /* (struct proc *) */
 #define MACH_MP_NOTIFY_SYNC    0x5     /* int */
+#define MACH_MP_MEMORY_ENTRY   0x6     /* (struct mach_memory_entry *) */
 
 void mach_port_init(void);
 struct mach_port *mach_port_get(void);
diff -r 9a08aa8c1f72 -r 2bef4a5d09c6 sys/compat/mach/mach_vm.c
--- a/sys/compat/mach/mach_vm.c Mon Nov 03 20:32:17 2003 +0000
+++ b/sys/compat/mach/mach_vm.c Mon Nov 03 20:58:18 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mach_vm.c,v 1.31 2003/09/06 23:52:27 manu Exp $ */
+/*     $NetBSD: mach_vm.c,v 1.32 2003/11/03 20:58:18 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.31 2003/09/06 23:52:27 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_vm.c,v 1.32 2003/11/03 20:58:18 manu Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -46,6 +46,7 @@
 #include <sys/proc.h>
 #include <sys/sa.h>
 #include <sys/mman.h>
+#include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
@@ -64,6 +65,7 @@
 #include <compat/mach/mach_clock.h> 
 #include <compat/mach/mach_vm.h> 
 #include <compat/mach/mach_errno.h> 
+#include <compat/mach/mach_port.h> 
 #include <compat/mach/mach_syscallargs.h>
 
 int
@@ -481,20 +483,33 @@
        mach_vm_make_memory_entry_reply_t *rep = args->rmsg;
        size_t *msglen = args->rsize;
        struct lwp *l = args->l;
+       struct mach_port *mp;
+       struct mach_right *mr;
+       struct mach_memory_entry *mme;
        
-       /* 
-        * XXX Find some documentation about what 
-        * this is supposed to do, and implement it.
-        */
-       printf("pid %d.%d: Unimplemented mach_vm_make_memory_entry\n",
-           l->l_proc->p_pid, l->l_lid);
+       printf("mach_vm_make_memory_entry, offset 0x%lx, size 0x%lx\n",
+           (u_long)req->req_offset, (u_long)req->req_size);
+
+       mp = mach_port_get();
+       mp->mp_flags |= (MACH_MP_INKERNEL | MACH_MP_DATA_ALLOCATED);
+       mp->mp_datatype = MACH_MP_MEMORY_ENTRY;
 
+       mme = malloc(sizeof(*mme), M_EMULDATA, M_WAITOK);
+       mme->mme_offset = req->req_offset;
+       mme->mme_size = req->req_size;
+       mp->mp_data = mme;
+
+       mr = mach_right_get(mp, l, MACH_PORT_TYPE_SEND, 0);
+       
        rep->rep_msgh.msgh_bits =
            MACH_MSGH_REPLY_LOCAL_BITS(MACH_MSG_TYPE_MOVE_SEND_ONCE) |
            MACH_MSGH_BITS_COMPLEX;
        rep->rep_msgh.msgh_size = sizeof(*rep) - sizeof(rep->rep_trailer);
        rep->rep_msgh.msgh_local_port = req->req_msgh.msgh_local_port;
        rep->rep_msgh.msgh_id = req->req_msgh.msgh_id + 100;
+       rep->rep_obj_handle.name = (mach_port_t)mr->mr_name;
+       rep->rep_obj_handle.disposition = 0x11; /* XXX */
+       rep->rep_size = req->req_size;
        rep->rep_trailer.msgh_trailer_size = 8;
 
        *msglen = sizeof(*rep);
diff -r 9a08aa8c1f72 -r 2bef4a5d09c6 sys/compat/mach/mach_vm.h
--- a/sys/compat/mach/mach_vm.h Mon Nov 03 20:32:17 2003 +0000
+++ b/sys/compat/mach/mach_vm.h Mon Nov 03 20:58:18 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mach_vm.h,v 1.15 2003/09/06 23:52:27 manu Exp $ */
+/*     $NetBSD: mach_vm.h,v 1.16 2003/11/03 20:58:18 manu Exp $ */
 
 /*-
  * Copyright (c) 2002-2003 The NetBSD Foundation, Inc.
@@ -326,4 +326,8 @@
 int mach_vm_msync(struct mach_trap_args *);
 int mach_vm_copy(struct mach_trap_args *);
 
+struct mach_memory_entry {
+       vaddr_t mme_offset;
+       size_t mme_size;
+};
 #endif /* _MACH_VM_H_ */