Changeset 40619 in vbox

Timestamp:

Mar 25, 2012 7:55:20 PM (13 years ago)

Author:

vboxsync

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

77034

Message:

VBoxTpG: probe name unmangling.

File:

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

trunk/src/bldprogs/VBoxTpG.cpp

@@ -65 +65 @@
 {
     RTLISTNODE      ListEntry;
-    const char     *pszName;
+    char           *pszMangledName;
+    const char     *pszUnmangledName;
     RTLISTANCHOR    ArgHead;
     uint32_t        cArgs;
@@ -522 +523 @@
                             "VTG_GLOBAL g_fVTGProbeEnabled_%s_%s, data\n"
                             "    db 0\n",
-                            pProvider->pszName, pProbe->pszName);
+                            pProvider->pszName, pProbe->pszMangledName);
             cProbes++;
         }
@@ -638 +639 @@
                             "    dd 0       ; for the application\n"
                             ,
-                            pProvider->pszName, pProbe->pszName, iProbe,
-                            strtabGetOff(pProbe->pszName),
+                            pProvider->pszName, pProbe->pszMangledName, iProbe,
+                            strtabGetOff(pProbe->pszUnmangledName),
                             pProbe->offArgList,
-                            pProvider->pszName, pProbe->pszName,
+                            pProvider->pszName, pProbe->pszMangledName,
                             iProvider);
             pProbe->iProbe = iProbe;
@@ -707 +708 @@
                             "\n"
                             "VTG_GLOBAL VTGProbeStub_%s_%s, function; (VBOXTPGPROBELOC pVTGProbeLoc",
-                            pProvider->pszName, pProbe->pszName);
+                            pProvider->pszName, pProbe->pszMangledName);
             RTListForEach(&pProbe->ArgHead, pArg, VTGARG, ListEntry)
             {
@@ -889 +890 @@
                             "extern uint8_t g_VTGProbeData_%s_%s;\n"
                             "DECLASM(void)  VTGProbeStub_%s_%s(PVTGPROBELOC",
-                            pProv->pszName, pProbe->pszName,
-                            pProv->pszName, pProbe->pszName,
-                            pProv->pszName, pProbe->pszName);
+                            pProv->pszName, pProbe->pszMangledName,
+                            pProv->pszName, pProbe->pszMangledName,
+                            pProv->pszName, pProbe->pszMangledName);
             RTListForEach(&pProbe->ArgHead, pArg, VTGARG, ListEntry)
             {
                 ScmStreamPrintf(pStrm, ", %s", pArg->pszType);
             }
-            generateProbeDefineName(szTmp, sizeof(szTmp), pProv->pszName, pProbe->pszName);
+            generateProbeDefineName(szTmp, sizeof(szTmp), pProv->pszName, pProbe->pszMangledName);
             ScmStreamPrintf(pStrm,
                             ");\n"
@@ -903 +904 @@
                             "# define %s("
                             , szTmp,
-                            pProv->pszName, pProbe->pszName,
+                            pProv->pszName, pProbe->pszMangledName,
                             szTmp);
             RTListForEach(&pProbe->ArgHead, pArg, VTGARG, ListEntry)
@@ -920 +921 @@
                             "            { __LINE__, 0, UINT32_MAX, __PRETTY_FUNCTION__, __FILE__, &g_VTGProbeData_%s_%s }; \\\n"
                             "            VTGProbeStub_%s_%s(&s_VTGProbeLoc",
-                            pProv->pszName, pProbe->pszName,
-                            pProv->pszName, pProbe->pszName,
-                            pProv->pszName, pProbe->pszName);
+                            pProv->pszName, pProbe->pszMangledName,
+                            pProv->pszName, pProbe->pszMangledName,
+                            pProv->pszName, pProbe->pszMangledName);
             RTListForEach(&pProbe->ArgHead, pArg, VTGARG, ListEntry)
             {
@@ -952 +953 @@
         RTListForEach(&pProv->ProbeHead, pProbe, VTGPROBE, ListEntry)
         {
-            generateProbeDefineName(szTmp, sizeof(szTmp), pProv->pszName, pProbe->pszName);
+            generateProbeDefineName(szTmp, sizeof(szTmp), pProv->pszName, pProbe->pszMangledName);
             ScmStreamPrintf(pStrm,
                             "# define %s_ENABLED() (false)\n"
@@ -1514 +1515 @@
 
 /**
+ * Unmangles the probe name. 
+ *  
+ * This involves translating double underscore to dash.
+ *  
+ * @returns Pointer to the unmangled name in the string table.
+ * @param   pszMangled          The mangled name.
+ */
+static const char *parseUnmangleProbeName(const char *pszMangled)
+{
+    size_t      cchMangled = strlen(pszMangled);
+    char       *pszTmp     = (char *)alloca(cchMangled + 2);
+    const char *pszSrc     = pszMangled;
+    char       *pszDst     = pszTmp;
+
+    while (*pszSrc)
+    {
+        if (pszSrc[0] == '_' && pszSrc[1] == '_' && pszSrc[2] != '_')
+        {
+            *pszDst++ = '-';
+            pszSrc   += 2;
+        }
+        else
+            *pszDst++ = *pszSrc++;
+    }
+    *pszDst = '\0';
+
+    return strtabInsertN(pszTmp, pszDst - pszTmp);
+}
+
+
+/**
  * Parses a D probe statement.
  *
@@ -1542 +1574 @@
     RTListAppend(&pProv->ProbeHead, &pProbe->ListEntry);
     pProbe->offArgList = UINT32_MAX;
-    pProbe->pszName    = strtabInsertN(pszProbe, cchProbe);
-    if (!pProbe->pszName)
+    pProbe->pszMangledName = RTStrDupN(pszProbe, cchProbe);
+    if (!pProbe->pszMangledName)
         return parseError(pStrm, 0, "Out of memory");
-
+    pProbe->pszUnmangledName = parseUnmangleProbeName(pProbe->pszMangledName);
+    if (!pProbe->pszUnmangledName)
+        return parseError(pStrm, 0, "Out of memory");
+    
     /*
      * Parse loop for the argument.