Changeset 40830 in vbox

Timestamp:

Apr 8, 2012 7:51:45 PM (13 years ago)

Author:

vboxsync

Message:

SUPR0TracerFireProbe takes a VTG probe location pointer, not a dtrace ID.

File:

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

trunk/src/bldprogs/VBoxTpG.cpp

@@ -743 +743 @@
                                 "        jz      .return            ; jump on false\n");
 
+#if 0
             /*
              * Shuffle the arguments around, replacing the location pointer with the probe ID.
@@ -773 +774 @@
                                 :
                                 "        mov     ecx, [rcx + 4]     ; idProbe replaces pVTGProbeLoc.\n"
-                                "        jmp     NAME(SUPR0FireProbe)\n"
+                                "        jmp     NAME(%s)\n"
                                 , g_pszProbeFnName);
             else
@@ -782 +783 @@
                                 :
                                 "        mov     edi, [rdi + 4]     ; idProbe replaces pVTGProbeLoc.\n"
-                                "        jmp     NAME(SUPR0FireProbe)\n"
+                                "        jmp     NAME(%s)\n"
                                 , g_pszProbeFnName);
+#else
+            /*
+             * Jump to the fire-probe function.
+             */
+            if (g_cBits == 32)
+                ScmStreamPrintf(pStrm, g_fProbeFnImported ?
+                                "        mov     ecx, IMP2(%s)\n"
+                                "        jmp     ecx\n"
+                                :
+                                "        jmp     NAME(%s)\n"
+                                , g_pszProbeFnName);
+            else if (fWin64)
+                ScmStreamPrintf(pStrm, g_fProbeFnImported ?
+                                "        mov     rax, IMP2(%s)\n"
+                                "        jmp     rax\n"
+                                :
+                                "        jmp     NAME(%s)\n"
+                                , g_pszProbeFnName);
+            else
+                ScmStreamPrintf(pStrm, g_fProbeFnImported ?
+                                "        lea     rax, [IMP2(%s)]\n" //??? macho64?
+                                "        jmp     rax\n"
+                                :
+                                "        jmp     NAME(%s)\n"
+                                , g_pszProbeFnName);
+#endif
 
             ScmStreamPrintf(pStrm,