Changeset 41054 in vbox for trunk/src/VBox/Runtime/r0drv/darwin

Timestamp:

Apr 25, 2012 3:11:33 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

77618

Message:

alloc-r0drv-darwin.cpp: Use RTR0MemObjAllocPage to satisfy RTMEMHDR_FLAG_EXEC requests.

File:

• trunk/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -32 +32 @@
 #include "internal/iprt.h"
 #include <iprt/mem.h>
+#include <iprt/memobj.h>
 
 #include <iprt/assert.h>
@@ -37 +38 @@
 #include <iprt/thread.h>
 #include "r0drv/alloc-r0drv.h"
+
+
+/*******************************************************************************
+*   Structures and Typedefs                                                    *
+*******************************************************************************/
+/**
+ * Extended header used for headers marked with RTMEMHDR_FLAG_EXEC.
+ *
+ * This is used with allocating executable memory, for things like generated
+ * code and loaded modules.
+ */
+typedef struct RTMEMDARWINHDREX
+{
+    /** The associated memory object. */
+    RTR0MEMOBJ          hMemObj;
+    /** Alignment padding. */
+    uint8_t             abPadding[ARCH_BITS == 32 ? 12 : 8];
+    /** The header we present to the generic API. */
+    RTMEMHDR            Hdr;
+} RTMEMDARWINHDREX;
+AssertCompileSize(RTMEMDARWINHDREX, 32);
+/** Pointer to an extended memory header. */
+typedef RTMEMDARWINHDREX *PRTMEMDARWINHDREX;
 
 
@@ -47 +71 @@
         return VERR_NOT_SUPPORTED;
 
-    PRTMEMHDR pHdr = (PRTMEMHDR)IOMalloc(cb + sizeof(*pHdr));
-    if (RT_UNLIKELY(!pHdr))
+    PRTMEMHDR pHdr;
+    if (fFlags & RTMEMHDR_FLAG_EXEC)
     {
-        printf("rtR0MemAllocEx(%#zx, %#x) failed\n", cb + sizeof(*pHdr), fFlags);
-        return VERR_NO_MEMORY;
+        RTR0MEMOBJ hMemObj;
+        int rc = RTR0MemObjAllocPage(&hMemObj, cb + sizeof(RTMEMDARWINHDREX), true /*fExecutable*/);
+        if (RT_FAILURE(rc))
+            return rc;
+        PRTMEMDARWINHDREX pExHdr = (PRTMEMDARWINHDREX)RTR0MemObjAddress(hMemObj);
+        pExHdr->hMemObj = hMemObj;
+        pHdr = &pExHdr->Hdr;
+    }
+    else
+    {
+
+        pHdr = (PRTMEMHDR)IOMalloc(cb + sizeof(*pHdr));
+        if (RT_UNLIKELY(!pHdr))
+        {
+            printf("rtR0MemAllocEx(%#zx, %#x) failed\n", cb + sizeof(*pHdr), fFlags);
+            return VERR_NO_MEMORY;
+        }
     }
 
@@ -69 +108 @@
 {
     pHdr->u32Magic += 1;
-    IOFree(pHdr, pHdr->cb + sizeof(*pHdr));
+    if (pHdr->fFlags & RTMEMHDR_FLAG_EXEC)
+    {
+        PRTMEMDARWINHDREX pExHdr = RT_FROM_MEMBER(pHdr, RTMEMDARWINHDREX, Hdr);
+        int rc = RTR0MemObjFree(pExHdr->hMemObj, false /*fFreeMappings*/);
+        AssertRC(rc);
+    }
+    else
+        IOFree(pHdr, pHdr->cb + sizeof(*pHdr));
 }