Changeset 95870 in vbox for trunk/src/VBox/Runtime/common/compiler

Timestamp:

Jul 27, 2022 2:38:01 AM (2 years ago)

Author:

vboxsync

Message:

IPRT/nocrt: Split up the startup code and added the basic DLL startup code. bugref:10261

Location:

trunk/src/VBox/Runtime/common/compiler/vcc

Files:

• atexit-vcc.cpp (copied) (copied from trunk/src/VBox/Runtime/r3/win/nocrt-startup-exe-win.cpp ) (7 diffs)
• stacksup-vcc.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/compiler/vcc/atexit-vcc.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - No-CRT - Windows EXE startup code.
- *
- * @note Does not run static constructors and destructors!
+ * IPRT - Visual C++ Compiler - Simple atexit implementation.
  */
 
@@ -32 +30 @@
 *********************************************************************************************************************************/
 #include "internal/iprt.h"
-#include "internal/process.h"
 
-#include <iprt/nt/nt-and-windows.h>
-#include <iprt/getopt.h>
-#include <iprt/message.h>
-#include <iprt/path.h>
-#include <iprt/string.h>
-#include <iprt/utf16.h>
-
-#ifdef IPRT_NO_CRT
-# include <iprt/asm.h>
-# include <iprt/nocrt/stdlib.h>
-#endif
+#include <iprt/asm.h>
+#include <iprt/mem.h>
+#include <iprt/nocrt/stdlib.h>
 
 #include "internal/compiler-vcc.h"
@@ -52 +41 @@
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
-#ifdef IPRT_NO_CRT
 typedef struct RTNOCRTATEXITCHUNK
 {
     PFNRTNOCRTATEXITCALLBACK apfnCallbacks[256];
 } RTNOCRTATEXITCHUNK;
-#endif
 
 
@@ -63 +50 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-RT_C_DECLS_BEGIN
-DECL_HIDDEN_DATA(char)      g_szrtProcExePath[RTPATH_MAX] = "Unknown.exe";
-DECL_HIDDEN_DATA(size_t)    g_cchrtProcExePath = 11;
-DECL_HIDDEN_DATA(size_t)    g_cchrtProcExeDir = 0;
-DECL_HIDDEN_DATA(size_t)    g_offrtProcName = 0;
-RT_C_DECLS_END
-
-#ifdef IPRT_NO_CRT
 /** The first atexit() registration chunk. */
 static RTNOCRTATEXITCHUNK   g_aAtExitPrealloc;
@@ -77 +56 @@
 /** Chunk and callback index in one. */
 static volatile uint32_t    g_idxNextAtExit        = 0;
-#endif
 
 
-/*********************************************************************************************************************************
-*   External Symbols                                                                                                             *
-*********************************************************************************************************************************/
-extern DECLHIDDEN(void) InitStdHandles(PRTL_USER_PROCESS_PARAMETERS pParams); /* nocrt-streams-win.cpp */ /** @todo put in header */
-
-extern int main(int argc, char **argv, char **envp);    /* in program */
-
-
-#ifdef IPRT_NO_CRT
-extern "C"
-int rtnocrt_atexit(PFNRTNOCRTATEXITCALLBACK pfnCallback) RT_NOEXCEPT
+/* Note! not using atexit here because it'll clash with built-in prototype.  */
+extern "C" int rtnocrt_atexit(PFNRTNOCRTATEXITCALLBACK pfnCallback) RT_NOEXCEPT
 {
     AssertPtr(pfnCallback);
@@ -108 +77 @@
     if (!pChunk)
     {
-        pChunk = (RTNOCRTATEXITCHUNK *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pChunk));
+        pChunk = (RTNOCRTATEXITCHUNK *)RTMemAllocZ(sizeof(*pChunk)); /* ASSUMES that the allocator works w/o initialization! */
         AssertReturn(pChunk, -1); /* don't try decrement, someone could be racing us... */
 
         if (!ASMAtomicCmpXchgPtr(&g_apAtExit[idxChunk], pChunk, NULL))
         {
-            HeapFree(GetProcessHeap(), 0, pChunk);
+            RTMemFree(pChunk);
 
             pChunk = ASMAtomicReadPtrT(&g_apAtExit[idxChunk], RTNOCRTATEXITCHUNK *);
@@ -126 +95 @@
     return 0;
 }
-#endif
 
 
-static int rtTerminateProcess(int32_t rcExit, bool fDoAtExit)
+void rtVccTermRunAtExit(void) RT_NOEXCEPT
 {
-#ifdef IPRT_NO_CRT
-    /*
-     * Run atexit callback in reverse order.
-     */
-    if (fDoAtExit)
+    uint32_t idxAtExit = ASMAtomicReadU32(&g_idxNextAtExit);
+    if (idxAtExit-- > 0)
     {
-        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 (;;)
         {
-            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)
             {
-                RTNOCRTATEXITCHUNK *pChunk = ASMAtomicReadPtrT(&g_apAtExit[idxChunk], RTNOCRTATEXITCHUNK *);
-                if (pChunk)
+                do
                 {
-                    do
+                    g_idxNextAtExit = idxAtExit--; /* Make sure we don't try problematic atexit callbacks! */
+
+                    PFNRTNOCRTATEXITCALLBACK pfnCallback = pChunk->apfnCallbacks[idxCallback];
+                    if (pfnCallback) /* Can be NULL see registration code */
                     {
-                        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;
+                        pfnCallback();
+                        pChunk->apfnCallbacks[idxCallback] = NULL;
+                    }
+                } while (idxCallback-- > 0);
             }
+            else
+                idxAtExit -= RT_ELEMENTS(g_apAtExit[0]->apfnCallbacks);
+            if (idxChunk == 0)
+                break;
+            idxChunk--;
+            idxCallback = RT_ELEMENTS(g_apAtExit[0]->apfnCallbacks) - 1;
         }
 
-        rtVccInitializersRunTerm();
+        g_idxNextAtExit = 0;
     }
-#else
-    RT_NOREF(fDoAtExit);
-#endif
-
-    /*
-     * Terminate.
-     */
-    for (;;)
-        NtTerminateProcess(NtCurrentProcess(), rcExit);
 }
 
-
-DECL_NO_INLINE(static, void) initProcExecPath(void)
-{
-    WCHAR wszPath[RTPATH_MAX];
-    UINT cwcPath = GetModuleFileNameW(NULL, wszPath, RT_ELEMENTS(wszPath));
-    if (cwcPath)
-    {
-        char *pszDst = g_szrtProcExePath;
-        int rc = RTUtf16ToUtf8Ex(wszPath, cwcPath, &pszDst, sizeof(g_szrtProcExePath), &g_cchrtProcExePath);
-        if (RT_SUCCESS(rc))
-        {
-            g_cchrtProcExeDir = g_offrtProcName = RTPathFilename(pszDst) - g_szrtProcExePath;
-            while (   g_cchrtProcExeDir >= 2
-                   && RTPATH_IS_SLASH(g_szrtProcExePath[g_cchrtProcExeDir - 1])
-                   && g_szrtProcExePath[g_cchrtProcExeDir - 2] != ':')
-                g_cchrtProcExeDir--;
-        }
-        else
-            RTMsgError("initProcExecPath: RTUtf16ToUtf8Ex failed: %Rrc\n", rc);
-    }
-    else
-        RTMsgError("initProcExecPath: GetModuleFileNameW failed: %Rhrc\n", GetLastError());
-}
-
-
-DECLASM(void) CustomMainEntrypoint(PPEB pPeb)
-{
-    /*
-     * Initialize stuff.
-     */
-    InitStdHandles(pPeb->ProcessParameters);
-    initProcExecPath();
-
-    RTEXITCODE rcExit;
-#ifdef IPRT_NO_CRT
-    AssertCompile(sizeof(rcExit) == sizeof(int));
-    rcExit = (RTEXITCODE)rtVccInitializersRunInit();
-    if (rcExit == RTEXITCODE_SUCCESS)
-#endif
-    {
-        /*
-         * Get and convert the command line to argc/argv format.
-         */
-        UNICODE_STRING const *pCmdLine = pPeb->ProcessParameters ? &pPeb->ProcessParameters->CommandLine : NULL;
-        if (pCmdLine)
-        {
-            char *pszCmdLine = NULL;
-            int rc = RTUtf16ToUtf8Ex(pCmdLine->Buffer, pCmdLine->Length / sizeof(WCHAR), &pszCmdLine, 0, NULL);
-            if (RT_SUCCESS(rc))
-            {
-                char **papszArgv;
-                int    cArgs = 0;
-                rc = RTGetOptArgvFromString(&papszArgv, &cArgs, pszCmdLine,
-                                            RTGETOPTARGV_CNV_MODIFY_INPUT | RTGETOPTARGV_CNV_QUOTE_MS_CRT,  NULL);
-                if (RT_SUCCESS(rc))
-                {
-                    /*
-                     * Call the main function.
-                     */
-                    AssertCompile(sizeof(rcExit) == sizeof(int));
-                    rcExit = (RTEXITCODE)main(cArgs, papszArgv, NULL /*envp*/);
-                }
-                else
-                    rcExit = RTMsgErrorExitFailure("Error parsing command line: %Rrc\n", rc);
-            }
-            else
-                rcExit = RTMsgErrorExitFailure("Failed to convert command line to UTF-8: %Rrc\n", rc);
-        }
-        else
-            rcExit = RTMsgErrorExitFailure("No command line\n");
-        rtTerminateProcess(rcExit, true /*fDoAtExit*/);
-    }
-#ifdef IPRT_NO_CRT
-    else
-    {
-        RTMsgError("A C static initializor failed (%d)\n", rcExit);
-        rtTerminateProcess(rcExit, false /*fDoAtExit*/);
-    }
-#endif
-}
-

trunk/src/VBox/Runtime/common/compiler/vcc/stacksup-vcc.cpp

@@ -32 +32 @@
 
 #include <iprt/asm.h>
+#include <iprt/asm-amd64-x86.h>
 #include <iprt/assert.h>
 
@@ -92 +93 @@
 
 
+/**
+ * Initializes the security cookie value.
+ *
+ * This must be called as the first thing by the startup code.  We must also no
+ * do anything fancy here.
+ */
+void rtVccInitSecurityCookie(void) RT_NOEXCEPT
+{
+    __security_cookie = (uintptr_t)ASMReadTSC() ^ (uintptr_t)&__security_cookie;
+}
+
+
 DECLASM(void) _RTC_StackVarCorrupted(uint8_t *pbFrame, RTC_VAR_DESC_T const *pVar)
 {