Changeset 41609 in vbox

Timestamp:

Jun 7, 2012 2:27:31 AM (13 years ago)

Author:

vboxsync

Message:

Need to include the source file headers.

File:

• trunk/src/VBox/Devices/PC/BIOS-new/MakeDebianBiosAssembly.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/PC/BIOS-new/MakeDebianBiosAssembly.cpp

@@ -27 +27 @@
 #include <iprt/getopt.h>
 #include <iprt/initterm.h>
+#include <iprt/list.h>
 #include <iprt/mem.h>
 #include <iprt/message.h>
@@ -60 +61 @@
 /** Pointer to a BIOS segment. */
 typedef BIOSSEG *PBIOSSEG;
+
+
+/**
+ * A BIOS object file.
+ */
+typedef struct BIOSOBJFILE
+{
+    RTLISTNODE  Node;
+    char       *pszSource;
+    char       *pszObject;
+} BIOSOBJFILE;
+/** A BIOS object file. */
+typedef BIOSOBJFILE *PBIOSOBJFILE;
 
 
@@ -101 +115 @@
 /** Array of BIOS segments from the map file. */
 static BIOSSEG          g_aSegs[32];
+/** List of BIOSOBJFILE. */
+static RTLISTANCHOR     g_ObjList;
 
 /** The output stream. */
@@ -172 +188 @@
 static bool disFileHeader(void)
 {
-    return outputPrintf("; $Id$ \n"
-                        ";; @file\n"
-                        "; Auto Generated source file. Do not edit.\n"
-                        ";\n"
-                        "\n"
-                        "org 0xf000\n"
-                        "\n"
-                        );
+    bool fRc;
+    fRc = outputPrintf("; $Id$ \n"
+                       ";; @file\n"
+                       "; Auto Generated source file. Do not edit.\n"
+                       ";\n"
+                       );
+    if (!fRc)
+        return fRc;
+
+    /*
+     * List the header of each source file, up to and including the
+     * copyright notice.
+     */
+    PBIOSOBJFILE pObjFile;
+    RTListForEach(&g_ObjList, pObjFile, BIOSOBJFILE, Node)
+    {
+        PRTSTREAM hStrm;
+        int rc = RTStrmOpen(pObjFile->pszSource, "r", &hStrm);
+        if (RT_SUCCESS(rc))
+        {
+            fRc = outputPrintf("\n"
+                               ";\n"
+                               "; Source file: %Rbn\n"
+                               ";\n"
+                               , pObjFile->pszSource);
+            uint32_t    iLine           = 0;
+            bool        fSeenCopyright  = false;
+            char        szLine[4096];
+            while ((rc = RTStrmGetLine(hStrm, szLine, sizeof(szLine))) == VINF_SUCCESS)
+            {
+                iLine++;
+
+                /* Check if we're done. */
+                char *psz = RTStrStrip(szLine);
+                if (   fSeenCopyright
+                    && (   (psz[0] == '*' && psz[1] == '/')
+                        || psz[0] == '\0') )
+                    break;
+
+                /* Strip comment suffix. */
+                size_t cch = strlen(psz);
+                if (cch >= 2 && psz[cch - 1] == '/' && psz[cch - 2] == '*')
+                {
+                    psz[cch - 2] = '\0';
+                    RTStrStripR(psz);
+                }
+
+                /* Skip line prefix. */
+                if (psz[0] == '/' && psz[1] == '*')
+                    psz += 2;
+                else if (psz[0] == '*')
+                    psz += 1;
+                else
+                    while (*psz == ';')
+                        psz++;
+                if (RT_C_IS_SPACE(*psz))
+                    psz++;
+
+                /* Skip the doxygen file tag line. */
+                if (!strcmp(psz, "* @file") || !strcmp(psz, "@file"))
+                    continue;
+
+                /* Detect copyright section. */
+                if (    !fSeenCopyright
+                    && (   strstr(psz, "Copyright")
+                        || strstr(psz, "copyright")) )
+                    fSeenCopyright = true;
+
+                fRc = outputPrintf(";  %s\n", psz) && fRc;
+            }
+
+            RTStrmClose(hStrm);
+            if (rc != VINF_SUCCESS)
+                return disError("Error reading '%s': rc=%Rrc iLine=%u", pObjFile->pszSource, rc, iLine);
+        }
+    }
+
+    /*
+     * Set the org.
+     */
+    fRc = outputPrintf("\n"
+                       "\n"
+                       "\n"
+                       ) && fRc;
+    return fRc;
 }
 
@@ -973 +1066 @@
 static RTEXITCODE DisassembleBiosImage(void)
 {
-    if (!outputPrintf(""))
+    if (!disFileHeader())
         return RTEXITCODE_FAILURE;
 
@@ -1048 +1141 @@
 #endif
     return RTEXITCODE_SUCCESS;
+}
+
+
+/**
+ * Display an error with the mapfile name and current line, return false.
+ *
+ * @returns @c false.
+ * @param   pMap                The map file handle.
+ * @param   pszFormat           The format string.
+ * @param   ...                 Format arguments.
+ */
+static bool mapError(PBIOSMAP pMap, const char *pszFormat, ...)
+{
+    va_list va;
+    va_start(va, pszFormat);
+    RTMsgError("%s:%d: %N", pMap->pszMapFile, pMap->iLine, pszFormat, va);
+    va_end(va);
+    return false;
 }
 
@@ -1576 +1687 @@
             if (!pMap->szLine[0])
                 return true;
-            RTMsgError("%s:%u: Malformed symbol line", pMap->pszMapFile, pMap->iLine);
-            return false;
-        }
-
-        /* Skip the module name lines for now. */
+            return mapError(pMap, "Malformed symbol line");
+        }
+
         if (!strncmp(pMap->szLine, RT_STR_TUPLE("Module: ")))
-            continue;
-
-        /* Parse the segment line. */
-        char    szName[4096];
-        RTFAR16 Addr;
-        char   *psz = pMap->szLine;
-        if (!mapParseAddress(&psz, &Addr))
-            RTMsgError("%s:%u: Symbol address parser error", pMap->pszMapFile, pMap->iLine);
-        else if (!mapParseWord(&psz, szName, sizeof(szName)))
-            RTMsgError("%s:%u: Symbol name parser error", pMap->pszMapFile, pMap->iLine);
+        {
+            /* Parse the module line. */
+            size_t offObj = sizeof("Module: ") - 1;
+            while (RT_C_IS_SPACE(pMap->szLine[offObj]))
+                offObj++;
+            size_t offSrc = offObj;
+            char ch;
+            while ((ch = pMap->szLine[offSrc]) != '(' && ch != '\0')
+                offSrc++;
+            size_t cchObj = offSrc - offObj;
+
+            offSrc++;
+            size_t cchSrc = offSrc;
+            while ((ch = pMap->szLine[cchSrc]) != ')' && ch != '\0')
+                cchSrc++;
+            cchSrc -= offSrc;
+            if (ch != ')')
+                return mapError(pMap, "Symbol/Module line parse error");
+
+            PBIOSOBJFILE pObjFile = (PBIOSOBJFILE)RTMemAllocZ(sizeof(*pObjFile) + cchSrc + cchObj + 2);
+            if (!pObjFile)
+                return mapError(pMap, "Out of memory");
+            char *psz = (char *)(pObjFile + 1);
+            pObjFile->pszObject = psz;
+            memcpy(psz, &pMap->szLine[offObj], cchObj);
+            psz += cchObj;
+            *psz++ = '\0';
+            pObjFile->pszSource = psz;
+            memcpy(psz, &pMap->szLine[offSrc], cchSrc);
+            psz[cchSrc] = '\0';
+            RTListAppend(&g_ObjList, &pObjFile->Node);
+        }
         else
         {
-            uint32_t uFlatAddr = ((uint32_t)Addr.sel << 4) + Addr.off;
-            if (uFlatAddr == 0)
-                continue;
-
-            int rc = RTDbgModSymbolAdd(g_hMapMod, szName, RTDBGSEGIDX_RVA, uFlatAddr, 0 /*cb*/,  0 /*fFlags*/, NULL);
-            if (RT_SUCCESS(rc) || rc == VERR_DBG_ADDRESS_CONFLICT)
+            /* Parse the segment line. */
+            RTFAR16     Addr;
+            char       *psz = pMap->szLine;
+            if (!mapParseAddress(&psz, &Addr))
+                return mapError(pMap, "Symbol address parser error");
+
+            char        szName[4096];
+            if (!mapParseWord(&psz, szName, sizeof(szName)))
+                return mapError(pMap, "Symbol name parser error");
+
+            uint32_t    uFlatAddr = ((uint32_t)Addr.sel << 4) + Addr.off;
+            if (uFlatAddr != 0)
             {
+                int rc = RTDbgModSymbolAdd(g_hMapMod, szName, RTDBGSEGIDX_RVA, uFlatAddr, 0 /*cb*/,  0 /*fFlags*/, NULL);
+                if (RT_FAILURE(rc) && rc != VERR_DBG_ADDRESS_CONFLICT)
+                    return mapError(pMap, "RTDbgModSymbolAdd failed: %Rrc", rc);
 
                 if (g_cVerbose > 2)
@@ -1606 +1746 @@
                 while (RT_C_IS_SPACE(*psz))
                     psz++;
-                if (!*psz)
-                    continue;
-                RTMsgError("%s:%u: Junk at end of line", pMap->pszMapFile, pMap->iLine);
+                if (*psz)
+                    return mapError(pMap, "Junk at end of line");
             }
-            else
-                RTMsgError("%s:%u: RTDbgModSymbolAdd failed: %Rrc", pMap->pszMapFile, pMap->iLine, rc);
-        }
-        return false;
+
+        }
     }
 }
@@ -1730 +1867 @@
         return RTMsgInitFailure(rc);
 
+    RTListInit(&g_ObjList);
+
     /*
      * Option config.