Changeset 93501 in vbox for trunk/src/VBox

Timestamp:

Jan 31, 2022 2:19:12 PM (3 years ago)

Author:

vboxsync

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

149624

Message:

IPRT/log: Define LOG_USE_C99 everywhere but on OS/2 and stop allocating executable memory when we don't need it.

File:

• trunk/src/VBox/Runtime/common/log/log.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -1086 +1086 @@
     if (pLoggerInt)
     {
-# if defined(RT_ARCH_X86) && (!defined(LOG_USE_C99) || !defined(RT_WITHOUT_EXEC_ALLOC))
+# if defined(RT_ARCH_X86) && !defined(LOG_USE_C99)
         uint8_t *pu8Code;
 # endif
@@ -1170 +1170 @@
         pLoggerInt->idxBufDesc = 0;
 
-# if defined(RT_ARCH_X86) && (!defined(LOG_USE_C99) || !defined(RT_WITHOUT_EXEC_ALLOC))
+# if defined(RT_ARCH_X86) && !defined(LOG_USE_C99)
         /*
          * Emit wrapper code.
@@ -1320 +1320 @@
             RTFileClose(pLoggerInt->hFile);
 # endif
-# if defined(LOG_USE_C99) && defined(RT_WITHOUT_EXEC_ALLOC)
-            RTMemFree(*(void **)&pLoggerInt->Core.pfnLogger);
-# else
-            RTMemExecFree(*(void **)&pLoggerInt->Core.pfnLogger, 64);
+# if defined(RT_ARCH_X86) && !defined(LOG_USE_C99)
+            if (pLoggerInt->Core.pfnLogger)
+            {
+                RTMemExecFree(*(void **)&pLoggerInt->Core.pfnLogger, 64);
+                pLoggerInt->Core.pfnLogger = NULL;
+            }
 # endif
         }
@@ -1430 +1432 @@
     }
 
+# if defined(RT_ARCH_X86) && !defined(LOG_USE_C99)
     if (pLoggerInt->Core.pfnLogger)
     {
-# if defined(LOG_USE_C99) && defined(RT_WITHOUT_EXEC_ALLOC)
-        RTMemFree(*(void **)&pLoggerInt->Core.pfnLogger);
-# else
         RTMemExecFree(*(void **)&pLoggerInt->Core.pfnLogger, 64);
+        pLoggerInt->Core.pfnLogger = NULL;
+    }
 # endif
-        pLoggerInt->Core.pfnLogger = NULL;
-    }
     RTMemFree(pLoggerInt);