Changeset 40569 in vbox for trunk/src/bldprogs

Timestamp:

Mar 21, 2012 4:13:52 PM (13 years ago)

Author:

vboxsync

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

76963

Message:

string table and a bit more.

File:

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

trunk/src/bldprogs/VBoxTpG.cpp

@@ -35 +35 @@
 #include <iprt/stream.h>
 #include <iprt/string.h>
-#include <iprt/strcache.h>
 
 #include "scmstream.h"
@@ -86 +85 @@
     RTLISTNODE      ListEntry;
     const char     *pszName;
-    char           *pszType;
+    const char     *pszType;
 } VTGARG;
 typedef VTGARG *PVTGARG;
@@ -114 +113 @@
 typedef VTGPROVIDER *PVTGPROVIDER;
 
+/**
+ * A string table string.
+ */
+typedef struct VTGSTRING
+{
+    /** The string space core. */
+    RTSTRSPACECORE  Core;
+    /** The string table offset. */
+    uint32_t        offStrTab;
+    /** The actual string. */
+    char            szString[1];
+} VTGSTRING;
+typedef VTGSTRING *PVTGSTRING;
+
 
 /*******************************************************************************
 *   Global Variables                                                           *
 *******************************************************************************/
-/** String cache used for storing strings when parsing. */
-static RTSTRCACHE       g_hStrCache = NIL_RTSTRCACHE;
+/** The string space organizing the string table strings. Each node is a VTGSTRING. */
+static RTSTRSPACE       g_StrSpace = NULL;
+/** Used by the string table enumerator to set VTGSTRING::offStrTab. */
+static uint32_t         g_offStrTab;
 /** List of providers created by the parser. */
 static RTLISTANCHOR     g_ProviderHead;
@@ -165 +180 @@
 
 
+/**
+ * Inserts a string into the string table, reusing any matching existing string
+ * if possible.
+ *
+ * @returns Read only string.
+ * @param   pch                 The string to insert (need not be terminated).
+ * @param   cch                 The length of the string.
+ */
+static const char *strtabInsertN(const char *pch, size_t cch)
+{
+    PVTGSTRING pStr = (PVTGSTRING)RTStrSpaceGetN(&g_StrSpace, pch, cch);
+    if (pStr)
+        return pStr->szString;
+
+    /*
+     * Create a new entry.
+     */
+    pStr = (PVTGSTRING)RTMemAlloc(RT_OFFSETOF(VTGSTRING, szString[cch + 1]));
+    if (!pStr)
+        return NULL;
+
+    pStr->Core.pszString = pStr->szString;
+    memcpy(pStr->szString, pch, cch);
+    pStr->szString[cch]  = '\0';
+    pStr->offStrTab      = UINT32_MAX;
+
+    bool fRc = RTStrSpaceInsert(&g_StrSpace, &pStr->Core);
+    Assert(fRc); NOREF(fRc);
+    return pStr->szString;
+}
+
+
 static RTEXITCODE generateInvokeAssembler(const char *pszOutput, const char *pszTempAsm)
 {
@@ -236 +283 @@
 
 
+/**
+ * @callback_method_impl{FNRTSTRSPACECALLBACK, Writes the string table strings.}
+ */
+static DECLCALLBACK(int) generateAssemblyStrTabCallback(PRTSTRSPACECORE pStr, void *pvUser)
+{
+    PVTGSTRING pVtgStr = (PVTGSTRING)pStr;
+    PSCMSTREAM pStrm   = (PSCMSTREAM)pvUser;
+
+    pVtgStr->offStrTab = g_offStrTab;
+    g_offStrTab += pVtgStr->Core.cchString + 1;
+
+    ScmStreamPrintf(pStrm,
+                    "    db '%s', 0 ; off=%u len=%zu\n",
+                    pVtgStr->szString, pVtgStr->offStrTab, pVtgStr->Core.cchString);
+    return VINF_SUCCESS;
+}
+
+
 static RTEXITCODE generateAssembly(PSCMSTREAM pStrm)
 {
@@ -252 +317 @@
                     "%include \"iprt/asmdefs.h\"\n"
                     "\n"
+                    "%ifdef ASM_FORMAT_OMF\n"
+                    " segment VTGObject public CLASS=VTGObject align=16 use32"
                     ,
                     g_pszScript);
+
+    /*
+     * Dump the string table to set the offsets before we use them anywhere.
+     */
+    ScmStreamPrintf(pStrm,
+                    ";\n"
+                    "; The string table.\n"
+                    ";\n"
+                    "BEGINDATA\n"
+                    "GLOBALNAME g_achVTGStringTable\n");
+    g_offStrTab = 0;
+    RTStrSpaceEnumerate(&g_StrSpace, generateAssemblyStrTabCallback, pStrm);
+    ScmStreamPrintf(pStrm,
+                    "GLOBALNAME g_achVTGStringTable_End\n");
 
     /*
@@ -291 +372 @@
                     ";\n"
                     "BEGINDATA\n"
-                    "GLOBALNAME g_aVTGProbeData\n"
+                    "GLOBALNAME g_abVTGProbeData\n"
                     "\n");
     RTListForEach(&g_ProviderHead, pProv, VTGPROVIDER, ListEntry)
@@ -305 +386 @@
         }
     }
-    ScmStreamPrintf(pStrm, "GLOBALNAME g_aVTGProbeData_End\n");
-
-    /*
-     * Write the string table.
-     */
-    ScmStreamPrintf(pStrm,
-                    "\n"
-                    ";\n"
-                    "; String table.\n"
-                    ";\n"
-                    "BEGINDATA\n"
-                    "GLOBALNAME g_abVTGProbeStrings\n"
-                    "\n");
-    /** @todo  */
-    ScmStreamPrintf(pStrm, "GLOBALNAME g_abVTGProbeStrings_End\n");
+    ScmStreamPrintf(pStrm, "GLOBALNAME g_abVTGProbeData_End\n");
 
     return RTEXITCODE_SUCCESS;
@@ -1061 +1128 @@
     RTListInit(&pProbe->ArgHead);
     RTListAppend(&pProv->ProbeHead, &pProbe->ListEntry);
-    pProbe->pszName = RTStrCacheEnterN(g_hStrCache, pszProbe, cchProbe);
+    pProbe->pszName = strtabInsertN(pszProbe, cchProbe);
     if (!pProbe->pszName)
         return parseError(pStrm, 0, "Out of memory");
@@ -1070 +1137 @@
     PVTGARG pArg    = NULL;
     size_t  cchName = 0;
+    size_t  cchArg  = 0;
+    char    szArg[4096];
     for (;;)
     {
@@ -1083 +1152 @@
                     if (!cchName)
                         return parseError(pStrm, 1, "Argument has no name");
-                    char *pszName;
-                    pArg->pszName = pszName = strchr(pArg->pszType, '\0') - cchName;
-                    pszName[-1] = '\0';
+                    pArg->pszType = strtabInsertN(szArg, cchArg - cchName - 1);
+                    pArg->pszName = strtabInsertN(&szArg[cchArg - cchName], cchName);
+                    if (!pArg->pszType || !pArg->pszName)
+                        return parseError(pStrm, 1, "Out of memory");
                     pArg = NULL;
+                    cchName = cchArg = 0;
                 }
                 if (ch == ')')
@@ -1101 +1172 @@
             default:
             {
-                int         rc;
                 size_t      cchWord;
                 const char *pszWord = ScmStreamCGetWordM1(pStrm, &cchWord);
@@ -1114 +1184 @@
                     pProbe->cArgs++;
 
-                    rc = RTStrAAppendN(&pArg->pszType, pszWord, cchWord);
+                    if (cchWord + 1 > sizeof(szArg))
+                        return parseError(pStrm, 1, "Too long parameter declaration");
+                    memcpy(szArg, pszWord, cchWord);
+                    szArg[cchWord] = '\0';
+                    cchArg  = cchWord;
                     cchName = 0;
                 }
                 else
                 {
-                    rc = RTStrAAppendExN(&pArg->pszType, 2, RT_STR_TUPLE(" "), pszWord, cchWord);
+                    if (cchArg + 1 + cchWord + 1 > sizeof(szArg))
+                        return parseError(pStrm, 1, "Too long parameter declaration");
+
+                    szArg[cchArg++] = ' ';
+                    memcpy(&szArg[cchArg], pszWord, cchWord);
+                    cchArg += cchWord;
+                    szArg[cchArg] = '\0';
                     cchName = cchWord;
                 }
-                if (RT_FAILURE(rc))
-                    return parseError(pStrm, 1, "Out of memory");
                 break;
             }
@@ -1131 +1209 @@
                 if (!pArg)
                     return parseError(pStrm, 1, "A parameter type does not start with an asterix");
-                int rc = RTStrAAppend(&pArg->pszType, " *");
-                if (RT_FAILURE(rc))
-                    return parseError(pStrm, 1, "Out of memory");
+                if (cchArg + sizeof(" *") >= sizeof(szArg))
+                    return parseError(pStrm, 1, "Too long parameter declaration");
+                szArg[cchArg++] = ' ';
+                szArg[cchArg++] = '*';
+                szArg[cchArg  ] = '\0';
                 cchName = 0;
                 break;
@@ -1177 +1257 @@
     RTListInit(&pProv->ProbeHead);
     RTListAppend(&g_ProviderHead, &pProv->ListEntry);
-    pProv->pszName = RTStrCacheEnterN(g_hStrCache, pszName, cchName);
+    pProv->pszName = strtabInsertN(pszName, cchName);
     if (!pProv->pszName)
         return parseError(pStrm, 0, "Out of memory");
@@ -1467 +1547 @@
          * Parse the script.
          */
-        rc = RTStrCacheCreate(&g_hStrCache, "VBoxTpG");
-        if (RT_SUCCESS(rc))
+        RTListInit(&g_ProviderHead);
+        rcExit = parseScript(g_pszScript);
+        if (rcExit == RTEXITCODE_SUCCESS)
         {
-            RTListInit(&g_ProviderHead);
-            rcExit = parseScript(g_pszScript);
-            if (rcExit == RTEXITCODE_SUCCESS)
-            {
-                /*
-                 * Take action.
-                 */
-                if (g_enmAction == kVBoxTpGAction_GenerateHeader)
-                    rcExit = generateHeader(g_pszOutput);
-                else
-                    rcExit = generateObject(g_pszOutput, g_pszTempAsm);
-            }
-            RTStrCacheDestroy(g_hStrCache);
+            /*
+             * Take action.
+             */
+            if (g_enmAction == kVBoxTpGAction_GenerateHeader)
+                rcExit = generateHeader(g_pszOutput);
+            else
+                rcExit = generateObject(g_pszOutput, g_pszTempAsm);
         }
     }