Changeset 40975 in vbox for trunk/src/bldprogs

Timestamp:

Apr 18, 2012 2:49:24 PM (13 years ago)

Author:

vboxsync

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

77533

Message:

VBoxTpG,SUPDrv,VBoxVMM: Working on static user land probes for the non-native platforms.

File:

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

trunk/src/bldprogs/VBoxTpG.cpp

@@ -183 +183 @@
 static const char          *g_pszProbeFnName            = "SUPR0TracerFireProbe";
 static bool                 g_fProbeFnImported          = true;
+static bool                 g_fPic                      = false;
 /** @} */
 
@@ -750 +751 @@
                     g_fProbeFnImported ? "IMP" : "",
                     g_pszProbeFnName);
-    if (fMachO64 && g_fProbeFnImported)
+    if (fMachO64 && g_fProbeFnImported && !g_fPic)
         ScmStreamPrintf(pStrm,
                         "g_pfnVtgProbeFn:\n"
@@ -792 +793 @@
              */
             if (g_cBits == 32)
-                ScmStreamPrintf(pStrm, g_fProbeFnImported ?
+                ScmStreamPrintf(pStrm, g_fPic ?
+                                "        call    .mov_ecx_eip_plus_5\n"
+                                ".got_eip:\n"
+                                "        add     ecx, _GLOBAL_OFFSET_TABLE + ($$ - .got_eip) wrt ..gotpc\n"
+                                "        mov     ecx, [%s@GOT + ecx]\n"
+                                "        jmp     ecx\n"
+                                ".mov_ecx_eip_plus_5:\n"
+                                "        pop     ecx\n"
+                                "        jmp     ecx\n"
+                                : g_fProbeFnImported ?
                                 "        mov     ecx, IMP2(%s)\n"
                                 "        jmp     ecx\n"
@@ -809 +819 @@
                                 "        jmp     [g_pfnVtgProbeFn wrt rip]\n");
             else
-                ScmStreamPrintf(pStrm, g_fProbeFnImported ?
-                                "        lea     rax, [IMP2(%s)]\n" //??? macho64?
+                ScmStreamPrintf(pStrm, g_fPic ?
+                                "        jmp     [rel %s wrt ..got]\n"
+                                : g_fProbeFnImported ?
+                                "        lea     rax, [IMP2(%s)]\n"
                                 "        jmp     rax\n"
                                 :
@@ -2043 +2055 @@
         kVBoxTpGOpt_AssemblerOutputOpt,
         kVBoxTpGOpt_AssemblerOption,
+        kVBoxTpGOpt_Pic,
         kVBoxTpGOpt_ProbeFnName,
         kVBoxTpGOpt_ProbeFnImported,
+        kVBoxTpGOpt_ProbeFnNotImported,
         kVBoxTpGOpt_End
     };
@@ -2065 +2079 @@
         { "--assembler-output-opt",             kVBoxTpGOpt_AssemblerOutputOpt,         RTGETOPT_REQ_STRING  },
         { "--assembler-option",                 kVBoxTpGOpt_AssemblerOption,            RTGETOPT_REQ_STRING  },
+        { "--pic",                              kVBoxTpGOpt_Pic,                        RTGETOPT_REQ_NOTHING },
         { "--probe-fn-name",                    kVBoxTpGOpt_ProbeFnName,                RTGETOPT_REQ_STRING  },
-        { "--probe-fn-imported",                kVBoxTpGOpt_ProbeFnImported,            RTGETOPT_REQ_BOOL    },
+        { "--probe-fn-imported",                kVBoxTpGOpt_ProbeFnImported,            RTGETOPT_REQ_NOTHING },
+        { "--probe-fn-not-imported",            kVBoxTpGOpt_ProbeFnNotImported,         RTGETOPT_REQ_NOTHING },
         /** @todo We're missing a bunch of assembler options! */
     };
@@ -2189 +2205 @@
                 break;
 
+            case kVBoxTpGOpt_Pic:
+                g_fPic = true;
+                break;
+
             case kVBoxTpGOpt_ProbeFnName:
                 g_pszProbeFnName = ValueUnion.psz;
@@ -2194 +2214 @@
 
             case kVBoxTpGOpt_ProbeFnImported:
-                g_pszProbeFnName = ValueUnion.psz;
+                g_fProbeFnImported = true;
+                break;
+
+            case kVBoxTpGOpt_ProbeFnNotImported:
+                g_fProbeFnImported = false;
                 break;