Changeset 100275 in vbox for trunk/src/bldprogs/VBoxDef2LazyLoad.cpp

Timestamp:

Jun 23, 2023 10:54:34 PM (17 months ago)

Author:

vboxsync

Message:

VBoxDef2LazyLoad,iprt/asmdefs-arm.h: Added a NAME() macro to asdefs-arm.h and got rid of the RTLDRFMT stuff added in r157968. bugref:10457

File:

• trunk/src/bldprogs/VBoxDef2LazyLoad.cpp (modified) (20 diffs)

trunk/src/bldprogs/VBoxDef2LazyLoad.cpp

@@ -78 +78 @@
 #elif defined(RT_ARCH_ARM64)
 static RTLDRARCH    g_enmTarget = RTLDRARCH_ARM64;
-#else
-# error "Port me!"
-#endif
-#if      defined(RT_OS_DARWIN)
-static RTLDRFMT     g_enmLdrFmt = RTLDRFMT_MACHO;
-#elif    defined(RT_OS_WINDOWS)
-static RTLDRFMT     g_enmLdrFmt = RTLDRFMT_PE;
-#elif    defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(RT_OS_SOLARIS) \
-      || defined(RT_OS_NETBSD) || defined(RT_OS_OPENBSD)
-static RTLDRFMT     g_enmLdrFmt = RTLDRFMT_ELF;
-#elif    defined(RT_OS_OS2)
-static RTLDRFMT     g_enmLdrFmt = RTLDRFMT_LX;
 #else
 # error "Port me!"
@@ -1114 +1102 @@
 static RTEXITCODE generateOutputInnerArm64(FILE *pOutput)
 {
-    const char *pszNmPfx = g_enmLdrFmt == RTLDRFMT_ELF ? "" : "_";
-
     fprintf(pOutput, "/*\n");
     for (unsigned i = 0; i < g_cInputs; i++)
@@ -1141 +1127 @@
             fprintf(pOutput,
                     ".p2align 3\n"
-                    ".globl %s%s\n"
-                    "%s%s:\n"
-                    "    adrp    x9, PAGE(%sg_pfn%s)\n"
-                    "    ldr     x9, [x9, PAGEOFF(%sg_pfn%s)]\n"
+                    ".globl NAME(%s)\n"
+                    "NAME(%s):\n"
+                    "    adrp    x9, PAGE(NAME(g_pfn%s))\n"
+                    "    ldr     x9, [x9, PAGEOFF(NAME(g_pfn%s))]\n"
                     "    br      x9\n",
-                    pszNmPfx, pExp->szName, pszNmPfx, pExp->szName, pszNmPfx, pExp->szName, pszNmPfx, pExp->szName);
+                    pExp->szName, pExp->szName, pExp->szName, pExp->szName);
         else
             fprintf(pOutput,
                     ".p2align 3\n"
-                    ".globl %sLazyGetPtr_%s\n"
-                    "%sLazyGetPtr_%s:\n"
-                    "    adrp    x9, PAGE(%sg_LazyPtr_%s)\n"
-                    "    ldr     x9, [x9, PAGEOFF(%sg_LazyPtr_%s)]\n"
+                    ".globl NAME(LazyGetPtr_%s)\n"
+                    "NAME(LazyGetPtr_%s):\n"
+                    "    adrp    x9, PAGE(NAME(g_LazyPtr_%s))\n"
+                    "    ldr     x9, [x9, PAGEOFF(NAME(g_LazyPtr_%s))]\n"
                     "    cmp     x9, #0\n"
                     "    b.eq    ___LazyLoad___%s\n"
                     "    mov     x0, x9\n"
                     "    ret\n",
-                    pszNmPfx, pExp->szName, pszNmPfx, pExp->szName, pszNmPfx, pExp->szName, pszNmPfx, pExp->szName, pExp->pszExportedNm);
+                    pExp->szName, pExp->szName, pExp->szName, pExp->szName, pExp->pszExportedNm);
     fprintf(pOutput,
             "ENDCODE\n"
@@ -1179 +1165 @@
                     ".globl __imp_%s\n"
                     "__imp_%s:\n"
-                    ".globl %sg_pfn%s\n"
-                    "%sg_pfn%s:\n"
+                    ".globl NAME(g_pfn%s)\n"
+                    "NAME(g_pfn%s):\n"
                     "    .quad ___LazyLoad___%s\n"
                     "\n",
                     pExp->szName, pExp->szName,
-                    pszNmPfx, pExp->szName, pszNmPfx, pExp->szName,
+                    pExp->szName, pExp->szName,
                     pExp->pszExportedNm);
         else
             fprintf(pOutput,
-                    ".globl %sg_LazyPtr_%s\n"
-                    "%sg_LazyPtr_%s:\n"
+                    ".globl NAME(g_LazyPtr_%s)\n"
+                    "NAME(g_LazyPtr_%s):\n"
                     "    .quad 0\n"
                     "\n",
-                    pszNmPfx, pExp->szName, pszNmPfx, pExp->szName);
+                    pExp->szName, pExp->szName);
     fprintf(pOutput,
             "    .quad 0 /* Terminator entry for traversal. */\n"
@@ -1245 +1231 @@
                     "    adrp    x9, PAGE(g_sz%s)\n"
                     "    add     x9, x9, PAGEOFF(g_sz%s)\n"
-                    "    adrp    x10, PAGE(%s%s%s)\n"
-                    "    add     x10, x10, PAGEOFF(%s%s%s)\n"
+                    "    adrp    x10, PAGE(NAME(%s%s))\n"
+                    "    add     x10, x10, PAGEOFF(NAME(%s%s))\n"
                     "    mov     x16, x30\n"
                     "    bl      LazyLoadResolver\n"
@@ -1252 +1238 @@
                     , pExp->pszExportedNm,
                     pExp->pszExportedNm, pExp->pszExportedNm,
-                    pszNmPfx, !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm,
-                    pszNmPfx, !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm);
+                    !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm,
+                    !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm);
         else
             fprintf(pOutput,
                     "___LazyLoad___%s:\n"
                     "    movk    w9, #%u\n"
-                    "    adrp    x10, PAGE(%s%s%s)\n"
-                    "    add     x10, x10, PAGEOFF(%s%s%s)\n"
+                    "    adrp    x10, PAGE(NAME(%s%s))\n"
+                    "    add     x10, x10, PAGEOFF(NAME(%s%s))\n"
                     , pExp->pszExportedNm,
                     pExp->uOrdinal,
-                    pszNmPfx, !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm,
-                    pszNmPfx, !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm);
+                    !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm,
+                    !pExp->fData ? "g_pfn" : "g_LazyPtr_", pExp->pszExportedNm);
         if (!pExp->fData)
-            fprintf(pOutput, "    b       %s%s\n", pszNmPfx, pExp->szName);
+            fprintf(pOutput, "    b       NAME(%s)\n", pExp->szName);
         else
-            fprintf(pOutput, "    b       %sLazyGetPtr_%s\n", pszNmPfx, pExp->szName);
+            fprintf(pOutput, "    b       NAME(LazyGetPtr_%s)\n", pExp->szName);
         fprintf(pOutput, "\n");
     }
@@ -1350 +1336 @@
             "    mov     x1, x19\n"
             "    mov     x2, x20\n"
-            "    bl      %sRTLdrGetSymbol\n"
+            "    bl      NAME(RTLdrGetSymbol)\n"
             "\n"
             "    cmp     w0, #0\n"
@@ -1364 +1350 @@
             "    stp     x1, x2, [sp]\n"
             "    str     x3,     [sp, #16]\n"
-            "    bl      %sRTAssertMsg2Weak\n"
+            "    bl      NAME(RTAssertMsg2Weak)\n"
             "Lbadsymloop:\n"
             "    brk     #0x1\n"
@@ -1405 +1391 @@
             "    .cfi_endproc\n"
             "\n"
-            "\n"
-            , pszNmPfx, pszNmPfx);
+            "\n");
 
     fprintf(pOutput,
@@ -1433 +1418 @@
                 "    adrp    x0, PAGE(g_szLibrary)\n"
                 "    add     x0, x0, PAGEOFF(g_szLibrary)\n"
-                "    bl      %sSUPR3HardenedLdrLoadAppPriv\n"
-                , pszNmPfx);
+                "    bl      NAME(SUPR3HardenedLdrLoadAppPriv)\n");
     else
         fprintf(pOutput,
@@ -1443 +1427 @@
                 "    adrp    x0, PAGE(g_szLibrary)\n"
                 "    add     x0, x0, PAGEOFF(g_szLibrary)\n"
-                "    bl      %sRTLdrLoadSystem\n"
-                , pszNmPfx);
+                "    bl      NAME(RTLdrLoadSystem)\n");
 
     fprintf(pOutput,
@@ -1457 +1440 @@
             "    add     x0, x0, PAGEOFF(g_szFailResolveFmt)\n"
             "    stp     x1, x2, [sp]\n"
-            "    bl      %sRTAssertMsg2Weak\n"
+            "    bl      NAME(RTAssertMsg2Weak)\n"
             "Lbadloadloop:\n"
             "    brk     #0x1\n"
@@ -1472 +1455 @@
             "ENDCODE\n"
             "\n"
-            "\n"
-            , pszNmPfx);
+            "\n");
 
     /*
@@ -1488 +1470 @@
                 "BEGINCODE\n"
                 ".p2align 3\n"
-                ".globl %sExplicitlyLoad%.*s\n"
-                "%sExplicitlyLoad%.*s:\n"
+                ".globl NAME(ExplicitlyLoad%.*s)\n"
+                "NAME(ExplicitlyLoad%.*s):\n"
                 "    .cfi_startproc\n"
                 "    /* Create frame. */\n"
@@ -1520 +1502 @@
                 ,
                 cchLibBaseName, g_pszLibrary,
-                pszNmPfx, cchLibBaseName, g_pszLibrary,
-                pszNmPfx, cchLibBaseName, g_pszLibrary);
+                cchLibBaseName, g_pszLibrary,
+                cchLibBaseName, g_pszLibrary);
         fprintf(pOutput,
                 "Lexplicit_load_module:\n");
@@ -1533 +1515 @@
                     "    adrp    x0, PAGE(g_szLibrary)\n"
                     "    add     x0, x0, PAGEOFF(g_szLibrary)\n"
-                    "    bl      %sSUPR3HardenedLdrLoadAppPriv\n"
-                    , pszNmPfx);
+                    "    bl      NAME(SUPR3HardenedLdrLoadAppPriv)\n");
         else
             fprintf(pOutput,
@@ -1543 +1524 @@
                     "    adrp    x0, PAGE(g_szLibrary)\n"
                     "    add     x0, x0, PAGEOFF(g_szLibrary)\n"
-                    "    bl      %sRTLdrLoadSystem\n"
-                    , pszNmPfx);
+                    "    bl      NAME(RTLdrLoadSystem)\n");
         fprintf(pOutput,
                 "    cmp     x0, #0\n"
@@ -1572 +1552 @@
                 "    mov     x1, x22\n"
                 "    mov     x2, x23\n"
-                "    bl      %sRTLdrGetSymbol\n"
+                "    bl      NAME(RTLdrGetSymbol)\n"
                 "    cmp     x0, #0\n"
                 "    b.ne    Lexplicit_load_symbol_error\n"
@@ -1592 +1572 @@
                 "    mov     x1, x0\n"
                 "    mov     x0, x21\n"
-                "    bl      %sRTErrInfoSet\n"
+                "    bl      NAME(RTErrInfoSet)\n"
                 "    b       Lexplicit_load_return"
                 "    "
@@ -1612 +1592 @@
                 "ENDCODE\n"
                 "\n"
-                "\n"
-                , pszNmPfx, pszNmPfx);
+                "\n");
     }