Changeset 33269 in vbox for trunk/src/recompiler

Timestamp:

Oct 20, 2010 3:42:28 PM (14 years ago)

Author:

vboxsync

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

66829

Message:

IPRT: A quick replacement of the RTMemPage* and RTMemExec* APIs on posix. (Turned out to be a bit more work than expected because of the electric fence heap and init dependencies.)

File:

• trunk/src/recompiler/VBoxREMWrapper.cpp (modified) (8 diffs)

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -339 +339 @@
 /** Pointer to the memory containing the loaded REM2 object/DLL. */
 static void    *g_pvREM2 = NULL;
+/** The size of the memory g_pvREM2 is pointing to. */
+static size_t   g_cbREM2 = 0;
 # ifdef VBOX_WITHOUT_REM_LDR_CYCLE
 /** Loader handle of the VBoxVMM DLL. */
@@ -402 +404 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(const char *),       NULL }
 };
+static const REMPARMDESC g_aArgsPTR_SIZE_T[] =
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(void *),             NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(size_t),             NULL }
+};
 static const REMPARMDESC g_aArgsVM[] =
 {
@@ -1085 +1092 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(size_t),             NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(unsigned),           NULL }
-};
-static const REMPARMDESC g_aArgsRTMemPageFree[] =
-{
-    { REMPARMDESC_FLAGS_INT,        sizeof(void *),             NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(size_t),             NULL }
 };
 static const REMPARMDESC g_aArgsRTStrPrintf[] =
@@ -1320 +1322 @@
     { "RTMemReallocTag",                        (void *)(uintptr_t)&RTMemReallocTag,                &g_aArgsRTMemReallocTag[0],                 RT_ELEMENTS(g_aArgsRTMemReallocTag),                   REMFNDESC_FLAGS_RET_INT,    sizeof(void *),     NULL },
     { "RTMemExecAllocTag",                      (void *)(uintptr_t)&RTMemExecAllocTag,              &g_aArgsSIZE_TTag[0],                       RT_ELEMENTS(g_aArgsSIZE_TTag),                         REMFNDESC_FLAGS_RET_INT,    sizeof(void *),     NULL },
-    { "RTMemExecFree",                          (void *)(uintptr_t)&RTMemExecFree,                  &g_aArgsPTR[0],                             RT_ELEMENTS(g_aArgsPTR),                               REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
+    { "RTMemExecFree",                          (void *)(uintptr_t)&RTMemExecFree,                  &g_aArgsPTR_SIZE_T[0],                      RT_ELEMENTS(g_aArgsPTR_SIZE_T),                        REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "RTMemFree",                              (void *)(uintptr_t)&RTMemFree,                      &g_aArgsPTR[0],                             RT_ELEMENTS(g_aArgsPTR),                               REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "RTMemPageAllocTag",                      (void *)(uintptr_t)&RTMemPageAllocTag,              &g_aArgsSIZE_TTag[0],                       RT_ELEMENTS(g_aArgsSIZE_TTag),                         REMFNDESC_FLAGS_RET_INT,    sizeof(void *),     NULL },
-    { "RTMemPageFree",                          (void *)(uintptr_t)&RTMemPageFree,                  &g_aArgsRTMemPageFree[0],                   RT_ELEMENTS(g_aArgsRTMemPageFree),                     REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
+    { "RTMemPageFree",                          (void *)(uintptr_t)&RTMemPageFree,                  &g_aArgsPTR_SIZE_T[0],                      RT_ELEMENTS(g_aArgsPTR_SIZE_T),                        REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "RTMemProtect",                           (void *)(uintptr_t)&RTMemProtect,                   &g_aArgsRTMemProtect[0],                    RT_ELEMENTS(g_aArgsRTMemProtect),                      REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "RTStrPrintf",                            (void *)(uintptr_t)&RTStrPrintf,                    &g_aArgsRTStrPrintf[0],                     RT_ELEMENTS(g_aArgsRTStrPrintf),                       REMFNDESC_FLAGS_RET_INT | REMFNDESC_FLAGS_ELLIPSIS, sizeof(size_t), NULL },
@@ -1998 +2000 @@
     if (RT_SUCCESS(rc))
     {
-        g_pvREM2 = RTMemExecAlloc(RTLdrSize(g_ModREM2));
+        g_cbREM2 = RTLdrSize(g_ModREM2);
+        g_pvREM2 = RTMemExecAlloc(g_cbREM);
         if (g_pvREM2)
         {
@@ -2028 +2031 @@
                 return rc;
             }
-            RTMemExecFree(g_pvREM2);
+
+            RTMemExecFree(g_pvREM2, g_cbREM2);
+            g_pvREM2 = NULL;
         }
+        g_cbREM2 = 0;
         RTLdrClose(g_ModREM2);
         g_ModREM2 = NIL_RTLDRMOD;
@@ -2049 +2055 @@
     RTLdrClose(g_ModREM2);
     g_ModREM2 = NIL_RTLDRMOD;
-    RTMemExecFree(g_pvREM2);
+    RTMemExecFree(g_pvREM2, g_cbREM2);
     g_pvREM2 = NULL;
+    g_cbREM2 = 0;
 
     /* clear the pointers. */
@@ -2069 +2076 @@
         g_pExecMemHead = pCur->pNext;
         memset(pCur, 0xcc, pCur->cb);
-        RTMemExecFree(pCur);
+        RTMemExecFree(pCur, pCur->cb);
     }
 #  endif