Changeset 40860 in vbox

Timestamp:

Apr 10, 2012 11:46:03 PM (13 years ago)

Author:

vboxsync

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

77393

Message:

VBoxTpG: another darwin fix.

File:

• trunk/src/bldprogs/VBoxTpG.cpp (modified) (6 diffs)

trunk/src/bldprogs/VBoxTpG.cpp

@@ -726 +726 @@
      * Emit code for the stub functions.
      */
+    bool const fWin64   = g_cBits == 64 && (!strcmp(g_pszAssemblerFmtVal, "win64") || !strcmp(g_pszAssemblerFmtVal, "pe64"));
+    bool const fMachO64 = g_cBits == 64 && !strcmp(g_pszAssemblerFmtVal, "macho64");
+    bool const fMachO32 = g_cBits == 32 && !strcmp(g_pszAssemblerFmtVal, "macho32");
     ScmStreamPrintf(pStrm,
                     "\n"
@@ -735 +738 @@
                     g_fProbeFnImported ? "IMP" : "",
                     g_pszProbeFnName);
+    if (fMachO64 && g_fProbeFnImported)
+        ScmStreamPrintf(pStrm,
+                        "g_pfnVtgProbeFn:\n"
+                        "   dq NAME(%s)\n",
+                        g_pszProbeFnName);
+
     RTListForEach(&g_ProviderHead, pProvider, VTGPROVIDER, ListEntry)
     {
@@ -749 +758 @@
             ScmStreamPrintf(pStrm,
                             ");\n");
-
-            bool const fWin64   = g_cBits == 64 && (!strcmp(g_pszAssemblerFmtVal, "win64") || !strcmp(g_pszAssemblerFmtVal, "pe64"));
-            bool const fMachO32 = g_cBits == 32 && !strcmp(g_pszAssemblerFmtVal, "macho32");
 
             /*
@@ -770 +776 @@
                                 "        jz      .return            ; jump on false\n");
 
-#if 0
-            /*
-             * Shuffle the arguments around, replacing the location pointer with the probe ID.
-             */
-            if (fMachO32)
-            {
-                /* Need to recreate the stack frame entirely here as the probe
-                   function differs by taking all uint64_t arguments instead
-                   of uintptr_t.  Understandable, but real PITA. */
-                ScmStreamPrintf(pStrm, "int3\n");
-            }
-            else if (g_cBits == 32)
-                /* Assumes the size of the arguments are no larger than a
-                   pointer.  This is asserted in the header. */
-                ScmStreamPrintf(pStrm, g_fProbeFnImported ?
-                                "        mov     edx, [eax + 4]     ; idProbe\n"
-                                "        mov     ecx, IMP2(%s)\n"
-                                "        mov     [esp + 4], edx     ; Replace pVTGProbeLoc with idProbe.\n"
-                                "        jmp     ecx\n"
-                                :
-                                "        mov     edx, [eax + 4]     ; idProbe\n"
-                                "        mov     [esp + 4], edx     ; Replace pVTGProbeLoc with idProbe.\n"
-                                "        jmp     NAME(%s)\n"
-                                , g_pszProbeFnName);
-            else if (fWin64)
-                ScmStreamPrintf(pStrm, g_fProbeFnImported ?
-                                "        mov     rax, IMP2(%s)\n"
-                                "        mov     ecx, [rcx + 4]     ; idProbe replaces pVTGProbeLoc.\n"
-                                "        jmp     rax\n"
-                                :
-                                "        mov     ecx, [rcx + 4]     ; idProbe replaces pVTGProbeLoc.\n"
-                                "        jmp     NAME(%s)\n"
-                                , g_pszProbeFnName);
-            else
-                ScmStreamPrintf(pStrm, g_fProbeFnImported ?
-                                "        lea     rax, [IMP2(%s)]\n" //??? macho64?
-                                "        mov     edi, [rdi + 4]     ; idProbe replaces pVTGProbeLoc.\n"
-                                "        jmp     rax\n"
-                                :
-                                "        mov     edi, [rdi + 4]     ; idProbe replaces pVTGProbeLoc.\n"
-                                "        jmp     NAME(%s)\n"
-                                , g_pszProbeFnName);
-#else
             /*
              * Jump to the fire-probe function.
@@ -830 +793 @@
                                 "        jmp     NAME(%s)\n"
                                 , g_pszProbeFnName);
+            else if (fMachO64 && g_fProbeFnImported)
+                ScmStreamPrintf(pStrm,
+                                "        jmp     [g_pfnVtgProbeFn wrt rip]\n");
             else
                 ScmStreamPrintf(pStrm, g_fProbeFnImported ?
@@ -837 +803 @@
                                 "        jmp     NAME(%s)\n"
                                 , g_pszProbeFnName);
-#endif
 
             ScmStreamPrintf(pStrm,