Changeset 95818 in vbox

Timestamp:

Jul 25, 2022 2:48:00 PM (2 years ago)

Author:

vboxsync

Message:

IPRT: More IPRT_NO_CRT work on windows. bugref:10261

Location:

trunk

Files:

• include/iprt/nocrt/stdlib.h (modified) (2 diffs)
• src/VBox/Runtime/Makefile.kmk (modified) (2 diffs)
• src/VBox/Runtime/r3/alloc-ef.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/init.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/win/nocrt-alloc-win.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/win/nocrt-atexit.asm (added)
• src/VBox/Runtime/r3/win/nocrt-mainCRTStartup.asm (added)
• src/VBox/Runtime/r3/win/nocrt-stack.asm (added)
• src/VBox/Runtime/r3/win/nocrt-startup-exe-win.cpp (modified) (6 diffs)

trunk/include/iprt/nocrt/stdlib.h

@@ -35 +35 @@
 RT_C_DECLS_BEGIN
 
+typedef void FNRTNOCRTATEXITCALLBACK(void) /*RT_NOEXCEPT*/;
+typedef FNRTNOCRTATEXITCALLBACK *PFNRTNOCRTATEXITCALLBACK;
+#if defined(_MSC_VER) && defined(RT_WITHOUT_NOCRT_WRAPPERS) /* Clashes with compiler internal prototype or smth. */
+int          rtnocrt_atexit(PFNRTNOCRTATEXITCALLBACK) RT_NOEXCEPT;
+# define     atexit rtnocrt_atexit
+#else
+int          RT_NOCRT(atexit)(PFNRTNOCRTATEXITCALLBACK) RT_NOEXCEPT;
+#endif
+
+#if !defined(RT_WITHOUT_NOCRT_WRAPPERS) && !defined(RT_WITHOUT_NOCRT_WRAPPER_ALIASES)
+# define atexit     RT_NOCRT(atexit)
+#endif
+
+
 #ifdef IPRT_NO_CRT_FOR_3RD_PARTY
+/*
+ * Only for external libraries and such.
+ */
 
 DECLINLINE(void *) RT_NOCRT(malloc)(size_t cb)
@@ -66 +83 @@
 #endif /* IPRT_NO_CRT_FOR_3RD_PARTY */
 
+
 RT_C_DECLS_END
 

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2274 +2274 @@
         r3/win/nocrt-RTLogWriteStdOut-win.cpp
  RuntimeGuestR3_SOURCES.x86 += \
+        r3/win/nocrt-atexit.asm \
+        r3/win/nocrt-mainCRTStartup.asm \
+        r3/win/nocrt-stack.asm \
         common/string/memcpy.asm \
         common/string/memchr.asm \
@@ -2285 +2288 @@
         common/string/strcpy.asm
  RuntimeGuestR3_SOURCES.amd64 += \
+        r3/win/nocrt-atexit.asm \
+        r3/win/nocrt-mainCRTStartup.asm \
+        r3/win/nocrt-stack.asm \
         common/string/memcpy.asm \
         common/string/memchr.asm \

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

@@ -36 +36 @@
 #include <VBox/sup.h>
 #include <iprt/errcore.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
+#ifndef IPRT_NO_CRT
+# include <errno.h>
+# include <stdio.h>
+# include <stdlib.h>
+#endif
 
 #include <iprt/alloc.h>

trunk/src/VBox/Runtime/r3/init.cpp

@@ -89 +89 @@
 static bool volatile        g_fInitializing = false;
 
+#if !defined(IPRT_NO_CRT) || !defined(RT_OS_WINDOWS)
 /** The process path.
  * This is used by RTPathExecDir and RTProcGetExecutablePath and set by rtProcInitName. */
@@ -94 +95 @@
 /** The length of g_szrtProcExePath. */
 DECL_HIDDEN_DATA(size_t)    g_cchrtProcExePath;
+/** The offset of the process name into g_szrtProcExePath. */
+DECL_HIDDEN_DATA(size_t)    g_offrtProcName;
+#endif
 /** The length of directory path component of g_szrtProcExePath. */
 DECL_HIDDEN_DATA(size_t)    g_cchrtProcDir;
-/** The offset of the process name into g_szrtProcExePath. */
-DECL_HIDDEN_DATA(size_t)    g_offrtProcName;
 
 /** The IPRT init flags. */

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

@@ -104 +104 @@
 }
 
-
-#undef RTMemReallocZTag
-RTDECL(void *) RTMemReallocZTag(void *pvOld, size_t cbOld, size_t cbNew, const char *pszTag)
-{
-    RT_NOREF(pszTag, cbOld);
-    if (pvOld)
-        return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, pvOld, cbNew);
-    return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbNew);
-}
-

trunk/src/VBox/Runtime/r3/win/nocrt-startup-exe-win.cpp

@@ -41 +41 @@
 #include <iprt/utf16.h>
 
+#ifdef IPRT_NO_CRT
+# include <iprt/asm.h>
+# include <iprt/nocrt/stdlib.h>
+#endif
+
+
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
+#ifdef IPRT_NO_CRT
+typedef struct RTNOCRTATEXITCHUNK
+{
+    PFNRTNOCRTATEXITCALLBACK apfnCallbacks[256];
+} RTNOCRTATEXITCHUNK;
+#endif
+
 
 /*********************************************************************************************************************************
@@ -52 +68 @@
 RT_C_DECLS_END
 
+#ifdef IPRT_NO_CRT
+/** The first atexit() registration chunk. */
+static RTNOCRTATEXITCHUNK   g_aAtExitPrealloc;
+/** Array of atexit() callback chunk pointers. */
+static RTNOCRTATEXITCHUNK  *g_apAtExit[8192 / 256] = { &g_aAtExitPrealloc, };
+/** Chunk and callback index in one. */
+static volatile uint32_t    g_idxNextAtExit        = 0;
+#endif
+
 
 /*********************************************************************************************************************************
@@ -60 +85 @@
 extern int main(int argc, char **argv, char **envp);    /* in program */
 
+
+#ifdef IPRT_NO_CRT
+extern "C"
+int rtnocrt_atexit(PFNRTNOCRTATEXITCALLBACK pfnCallback) RT_NOEXCEPT
+{
+    AssertPtr(pfnCallback);
+
+    /*
+     * Allocate a table index.
+     */
+    uint32_t idx = ASMAtomicIncU32(&g_idxNextAtExit) - 1;
+    AssertReturnStmt(idx < RT_ELEMENTS(g_apAtExit) * RT_ELEMENTS(g_apAtExit[0]->apfnCallbacks),
+                     ASMAtomicDecU32(&g_idxNextAtExit), -1);
+
+    /*
+     * Make sure the table chunk is there.
+     */
+    uint32_t            idxChunk = idx / RT_ELEMENTS(g_apAtExit[0]->apfnCallbacks);
+    RTNOCRTATEXITCHUNK *pChunk   = ASMAtomicReadPtrT(&g_apAtExit[idxChunk], RTNOCRTATEXITCHUNK *);
+    if (!pChunk)
+    {
+        pChunk = (RTNOCRTATEXITCHUNK *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pChunk));
+        AssertReturn(pChunk, -1); /* don't try decrement, someone could be racing us... */
+
+        if (!ASMAtomicCmpXchgPtr(&g_apAtExit[idxChunk], pChunk, NULL))
+        {
+            HeapFree(GetProcessHeap(), 0, pChunk);
+
+            pChunk = ASMAtomicReadPtrT(&g_apAtExit[idxChunk], RTNOCRTATEXITCHUNK *);
+            Assert(pChunk);
+        }
+    }
+
+    /*
+     * Add our callback.
+     */
+    pChunk->apfnCallbacks[idxChunk % RT_ELEMENTS(pChunk->apfnCallbacks)] = pfnCallback;
+    return 0;
+}
+#endif
+
+
+static int rtTerminateProcess(int32_t rcExit, bool fDoAtExit)
+{
+#ifdef IPRT_NO_CRT
+    /*
+     * Run atexit callback in reverse order.
+     */
+    if (fDoAtExit)
+    {
+        uint32_t idxAtExit = ASMAtomicReadU32(&g_idxNextAtExit);
+        if (idxAtExit-- > 0)
+        {
+            uint32_t idxChunk    = idxAtExit / RT_ELEMENTS(g_apAtExit[0]->apfnCallbacks);
+            uint32_t idxCallback = idxAtExit % RT_ELEMENTS(g_apAtExit[0]->apfnCallbacks);
+            for (;;)
+            {
+                RTNOCRTATEXITCHUNK *pChunk = ASMAtomicReadPtrT(&g_apAtExit[idxChunk], RTNOCRTATEXITCHUNK *);
+                if (pChunk)
+                {
+                    do
+                    {
+                        PFNRTNOCRTATEXITCALLBACK pfnCallback = pChunk->apfnCallbacks[idxCallback];
+                        if (pfnCallback) /* Can be NULL see registration code */
+                            pfnCallback();
+                    } while (idxCallback-- > 0);
+                }
+                if (idxChunk == 0)
+                    break;
+                idxChunk--;
+                idxCallback = RT_ELEMENTS(g_apAtExit[0]->apfnCallbacks) - 1;
+            }
+        }
+    }
+#else
+    RT_NOREF(fDoAtExit);
+#endif
+
+    /*
+     * Terminate.
+     */
+    for (;;)
+        NtTerminateProcess(NtCurrentProcess(), rcExit);
+}
 
 
@@ -79 +188 @@
         }
         else
-            RTMsgErrorExitFailure("initProcExecPath: RTUtf16ToUtf8Ex failed: %Rrc\n", rc);
+            RTMsgError("initProcExecPath: RTUtf16ToUtf8Ex failed: %Rrc\n", rc);
     }
     else
-        RTMsgErrorExitFailure("initProcExecPath: GetModuleFileNameW failed: %Rhrc\n", GetLastError());
-}
-
-
-void CustomMainEntrypoint(PPEB pPeb)
+        RTMsgError("initProcExecPath: GetModuleFileNameW failed: %Rhrc\n", GetLastError());
+}
+
+
+DECLASM(void) CustomMainEntrypoint(PPEB pPeb)
 {
     /*
@@ -114 +223 @@
                  * Call the main function.
                  */
+                AssertCompile(sizeof(rcExit) == sizeof(int));
                 rcExit = (RTEXITCODE)main(cArgs, papszArgv, NULL /*envp*/);
             }
@@ -125 +235 @@
         rcExit = RTMsgErrorExitFailure("No command line\n");
 
-    for (;;)
-        NtTerminateProcess(NtCurrentProcess(), rcExit);
-}
-
+    rtTerminateProcess(rcExit, true /*fDoAtExit*/);
+}
+