Changeset 97907 in vbox for trunk

Timestamp:

Dec 29, 2022 6:33:45 PM (2 years ago)

Author:

vboxsync

Message:

IPRT: Removed the RTMemExecAlloc interface.

Location:

trunk

Files:

• include/iprt/mangling.h (modified) (1 diff)
• include/iprt/mem.h (modified) (1 diff)
• src/VBox/Runtime/VBox/VBoxRTImp.def (modified) (1 diff)
• src/VBox/Runtime/r0drv/alloc-r0drv.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-heap-posix.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-posix.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/win/alloc-win.cpp (modified) (1 diff)

trunk/include/iprt/mangling.h

@@ -1601 +1601 @@
 # define RTMemEfTmpFreeZ                                RT_MANGLER(RTMemEfTmpFreeZ)
 # define RTMemEfTmpFreeZNP                              RT_MANGLER(RTMemEfTmpFreeZNP)
-# define RTMemExecAllocTag                              RT_MANGLER(RTMemExecAllocTag)
-# define RTMemExecFree                                  RT_MANGLER(RTMemExecFree)
 # define RTMemFree                                      RT_MANGLER(RTMemFree)
 # define RTMemFreeZ                                     RT_MANGLER(RTMemFreeZ)

trunk/include/iprt/mem.h

@@ -438 +438 @@
 RTDECL(void) RTMemFreeEx(void *pv, size_t cb) RT_NO_THROW_PROTO;
 
-
-
-/**
- * Allocates memory which may contain code (default tag).
- *
- * @returns Pointer to the allocated memory.
- * @returns NULL on failure.
- * @param   cb      Size in bytes of the memory block to allocate.
- */
-#define RTMemExecAlloc(cb)              RTMemExecAllocTag((cb), RTMEM_TAG)
-
-/**
- * Allocates memory which may contain code (custom tag).
- *
- * @returns Pointer to the allocated memory.
- * @returns NULL on failure.
- * @param   cb      Size in bytes of the memory block to allocate.
- * @param   pszTag  Allocation tag used for statistics and such.
- */
-RTDECL(void *)  RTMemExecAllocTag(size_t cb, const char *pszTag) RT_NO_THROW_PROTO;
-
-/**
- * Free executable/read/write memory allocated by RTMemExecAlloc().
- *
- * @param   pv      Pointer to memory block.
- * @param   cb      The allocation size.
- */
-RTDECL(void)    RTMemExecFree(void *pv, size_t cb) RT_NO_THROW_PROTO;
-
 /**
  * Allocate page aligned memory with default tag.

trunk/src/VBox/Runtime/VBox/VBoxRTImp.def

@@ -1392 +1392 @@
     RTMemEfTmpFree
     RTMemEfTmpFreeNP
-    RTMemExecAllocTag
-    RTMemExecFree
     RTMemFree
     RTMemPageAllocTag

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

@@ -322 +322 @@
 }
 RT_EXPORT_SYMBOL(RTMemFreeZ);
-
-
-
-
-
-
-RTDECL(void *)    RTMemExecAllocTag(size_t cb, const char *pszTag) RT_NO_THROW_DEF
-{
-    PRTMEMHDR pHdr;
-#ifdef RT_OS_SOLARIS /** @todo figure out why */
-    RT_ASSERT_INTS_ON();
-#else
-    RT_ASSERT_PREEMPTIBLE();
-#endif
-    RT_NOREF_PV(pszTag);
-
-
-    pHdr = rtR0MemAlloc(cb + RTR0MEM_FENCE_EXTRA, RTMEMHDR_FLAG_EXEC);
-    if (pHdr)
-    {
-#ifdef RTR0MEM_STRICT
-        pHdr->cbReq = (uint32_t)cb; Assert(pHdr->cbReq == cb);
-        memcpy((uint8_t *)(pHdr + 1) + cb, &g_abFence[0], RTR0MEM_FENCE_EXTRA);
-#endif
-        return pHdr + 1;
-    }
-    return NULL;
-}
-RT_EXPORT_SYMBOL(RTMemExecAllocTag);
-
-
-RTDECL(void)      RTMemExecFree(void *pv, size_t cb) RT_NO_THROW_DEF
-{
-    PRTMEMHDR pHdr;
-    RT_ASSERT_INTS_ON();
-    RT_NOREF_PV(cb);
-
-    if (!pv)
-        return;
-    pHdr = (PRTMEMHDR)pv - 1;
-    if (pHdr->u32Magic == RTMEMHDR_MAGIC)
-    {
-        Assert(!(pHdr->fFlags & RTMEMHDR_FLAG_ALLOC_EX));
-#ifdef RTR0MEM_STRICT
-        AssertReleaseMsg(!memcmp((uint8_t *)(pHdr + 1) + pHdr->cbReq, &g_abFence[0], RTR0MEM_FENCE_EXTRA),
-                         ("pHdr=%p pv=%p cbReq=%u cb=%u fFlags=%#x\n"
-                          "fence:    %.*Rhxs\n"
-                          "expected: %.*Rhxs\n",
-                          pHdr, pv, pHdr->cbReq, pHdr->cb, pHdr->fFlags,
-                          RTR0MEM_FENCE_EXTRA, (uint8_t *)(pHdr + 1) + pHdr->cbReq,
-                          RTR0MEM_FENCE_EXTRA, &g_abFence[0]));
-#endif
-        rtR0MemFree(pHdr);
-    }
-    else
-        AssertMsgFailed(("pHdr->u32Magic=%RX32 pv=%p\n", pHdr->u32Magic, pv));
-}
-RT_EXPORT_SYMBOL(RTMemExecFree);
-
-
 
 

trunk/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-heap-posix.cpp

@@ -1 @@
-/* $Id$ */
+* $Id$ */
 /** @file
  * IPRT - RTMemPage*, POSIX with heap.
@@ -796 +796 @@
 }
 
-
-
-
-
-RTDECL(void *) RTMemExecAllocTag(size_t cb, const char *pszTag) RT_NO_THROW_DEF
-{
-    return rtMemPagePosixAlloc(cb, pszTag, 0, &g_MemExecPosixHeap);
-}
-
-
-RTDECL(void) RTMemExecFree(void *pv, size_t cb) RT_NO_THROW_DEF
-{
-    return rtMemPagePosixFree(pv, cb, &g_MemExecPosixHeap);
-}
-

trunk/src/VBox/Runtime/r3/posix/rtmempage-exec-mmap-posix.cpp

@@ -181 +181 @@
 }
 
-
-
-
-
-RTDECL(void *) RTMemExecAllocTag(size_t cb, const char *pszTag) RT_NO_THROW_DEF
-{
-    return rtMemPagePosixAlloc(cb, pszTag, 0, PROT_EXEC);
-}
-
-
-RTDECL(void) RTMemExecFree(void *pv, size_t cb) RT_NO_THROW_DEF
-{
-    return rtMemPagePosixFree(pv, cb);
-}
-

trunk/src/VBox/Runtime/r3/win/alloc-win.cpp

@@ -56 +56 @@
 
 
-RTDECL(void *) RTMemExecAllocTag(size_t cb, const char *pszTag) RT_NO_THROW_DEF
-{
-    RT_NOREF_PV(pszTag);
-
-    /*
-     * Allocate first.
-     */
-    AssertMsg(cb, ("Allocating ZERO bytes is really not a good idea! Good luck with the next assertion!\n"));
-#ifdef USE_VIRTUAL_ALLOC
-    cb = RT_ALIGN_Z(cb, PAGE_SIZE);
-    void *pv = VirtualAlloc(NULL, cb, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
-    AssertMsg(pv, ("VirtualAlloc(%zx) failed!!!\n", cb));
-#else
-    cb = RT_ALIGN_Z(cb, 32);
-    void *pv = malloc(cb);
-    AssertMsg(pv, ("malloc(%d) failed!!!\n", cb));
-    if (pv)
-    {
-        memset(pv, 0xcc, cb);
-        void   *pvProt = (void *)((uintptr_t)pv & ~(uintptr_t)PAGE_OFFSET_MASK);
-        size_t  cbProt = ((uintptr_t)pv & PAGE_OFFSET_MASK) + cb;
-        cbProt = RT_ALIGN_Z(cbProt, PAGE_SIZE);
-        DWORD fFlags = 0;
-        if (!VirtualProtect(pvProt, cbProt, PAGE_EXECUTE_READWRITE, &fFlags))
-        {
-            AssertMsgFailed(("VirtualProtect(%p, %#x,,) -> lasterr=%d\n", pvProt, cbProt, GetLastError()));
-            free(pv);
-            pv = NULL;
-        }
-    }
-#endif
-    return pv;
-}
-
-
-RTDECL(void)    RTMemExecFree(void *pv, size_t cb) RT_NO_THROW_DEF
-{
-    RT_NOREF_PV(cb);
-
-    if (pv)
-#ifdef USE_VIRTUAL_ALLOC
-        if (!VirtualFree(pv, 0, MEM_RELEASE))
-            AssertMsgFailed(("pv=%p lasterr=%d\n", pv, GetLastError()));
-#else
-        free(pv);
-#endif
-}
-
-
 RTDECL(void *) RTMemPageAllocTag(size_t cb, const char *pszTag) RT_NO_THROW_DEF
 {