Changeset 74982 in vbox for trunk

Timestamp:

Oct 22, 2018 7:53:20 PM (6 years ago)

Author:

vboxsync

Message:

MakeAlternativeSource: Use codeview debug info to avoid jump tables generated by the compiler. Increased verbosity to include address, source file and line numbers in the output. Don't allow address override prefix when no operands accessing memory.

File:

• trunk/src/VBox/Devices/BiosCommonCode/MakeAlternativeSource.cpp (modified) (12 diffs)

trunk/src/VBox/Devices/BiosCommonCode/MakeAlternativeSource.cpp

@@ -51 +51 @@
     uint32_t    uFlatAddr;
     uint32_t    cb;
+    /** RVA into g_hSymMod. */
+    uint32_t    uRva;
 } BIOSSEG;
 /** Pointer to a BIOS segment. */
@@ -97 +99 @@
 *********************************************************************************************************************************/
 /** The verbosity level.*/
-static unsigned         g_cVerbose = 1 /*0*/;
+static unsigned         g_cVerbose = 2 /*0*/;
 /** Pointer to the BIOS image. */
 static uint8_t const   *g_pbImg;
@@ -111 +113 @@
 /** List of BIOSOBJFILE. */
 static RTLISTANCHOR     g_ObjList;
+
+/** Debug module with symbols. */
+static RTDBGMOD         g_hSymMod = NIL_RTDBGMOD;
 
 /** The output stream. */
@@ -633 +638 @@
 static void disGetNextSymbolWorker(uint32_t uFlatAddr, uint32_t cbMax, uint32_t *poff, PRTDBGSYMBOL pSym)
 {
-    RTINTPTR off = 0;
-    int rc = RTDbgModSymbolByAddr(g_hMapMod, RTDBGSEGIDX_RVA, uFlatAddr, RTDBGSYMADDR_FLAGS_GREATER_OR_EQUAL, &off, pSym);
+    RTINTPTR offMap = RTINTPTR_MAX;
+    RTDBGSYMBOL MapSym;
+    int rcMap = RTDbgModSymbolByAddr(g_hMapMod, RTDBGSEGIDX_RVA, uFlatAddr, RTDBGSYMADDR_FLAGS_GREATER_OR_EQUAL, &offMap, &MapSym);
+
+    RTINTPTR off = RTINTPTR_MAX;
+    int rc = RTDbgModSymbolByAddr(g_hSymMod, RTDBGSEGIDX_RVA, uFlatAddr - g_uBiosFlatBase,
+                                  RTDBGSYMADDR_FLAGS_GREATER_OR_EQUAL, &off, pSym);
+    if (   RT_SUCCESS(rc)
+        && RT_ABS(off) <= RT_ABS(offMap))
+        pSym->Value += g_uBiosFlatBase;
+    else
+    {
+        *pSym = MapSym;
+        off   = offMap;
+        rc    = rcMap;
+    }
     if (RT_SUCCESS(rc))
     {
@@ -641 +660 @@
         {
             *poff = (uint32_t)-off;
+
+            /* Mangle symbols the assembler might confuse with instructions. */
+            size_t cchName = strlen(pSym->szName);
+            if (   cchName <= 4
+                && (   strcmp("wait", pSym->szName) == 0
+                    || strcmp("hlt", pSym->szName) == 0))
+            {
+                memmove(&pSym->szName[1], &pSym->szName[0], cchName);
+                pSym->szName[0] = '_';
+                pSym->szName[cchName + 1] = '_';
+                pSym->szName[cchName + 2] = '\0';
+            }
             return;
         }
@@ -858 +889 @@
     RT_NOREF_PV(pszSymbol);
     return true;
+}
+
+
+static bool disIsMemoryParameter(PCDISOPPARAM pParam, uint16_t fParam)
+{
+    return fParam != OP_PARM_NONE
+        && DISUSE_IS_EFFECTIVE_ADDR(pParam->fUse);
+}
+
+
+static bool disAccessesMemory(PCDISCPUSTATE pCpuState)
+{
+    PCDISOPCODE pCurInstr = pCpuState->pCurInstr;
+    return disIsMemoryParameter(&pCpuState->Param1, pCurInstr->fParam1)
+        || disIsMemoryParameter(&pCpuState->Param2, pCurInstr->fParam2)
+        || disIsMemoryParameter(&pCpuState->Param3, pCurInstr->fParam3)
+        || disIsMemoryParameter(&pCpuState->Param4, pCurInstr->fParam4);
 }
 
@@ -1079 +1127 @@
             unsigned    cbInstr;
             DISCPUSTATE CpuState;
+            CpuState.ModRM.Bits.Mod = 3;
             int rc = DISInstrWithReader(uFlatAddr, fIs16Bit ? DISCPUMODE_16BIT : DISCPUMODE_32BIT,
                                         disReadOpcodeBytes, NULL, &CpuState, &cbInstr);
@@ -1084 +1133 @@
                 && cbInstr <= cb
                 && CpuState.pCurInstr
-                && CpuState.pCurInstr->uOpcode != OP_INVALID)
+                && CpuState.pCurInstr->uOpcode != OP_INVALID
+                && CpuState.pCurInstr->uOpcode != OP_ILLUD2
+                && (   !(CpuState.fPrefix & DISPREFIX_ADDRSIZE)
+                    || disAccessesMemory(&CpuState)))
             {
                 char szTmp[4096];
@@ -1098 +1150 @@
                     while (cch < 72)
                         szTmp[cch++] = ' ';
-                    RTStrPrintf(&szTmp[cch], sizeof(szTmp) - cch, "; %#x", uFlatAddr);
+
+                    RTDBGLINE LineInfo = {0};
+                    RTINTPTR  offLine = -1;
+                    int rcLine = RTDbgModLineByAddr(g_hSymMod, RTDBGSEGIDX_RVA, uFlatAddr - g_uBiosFlatBase,  &offLine, &LineInfo);
+                    if (RT_SUCCESS(rcLine) && offLine == 0 && cch < sizeof(szTmp) - 16)
+                        RTStrPrintf(&szTmp[cch], sizeof(szTmp) - cch, "; %#x %Rbn:%u",
+                                    uFlatAddr, LineInfo.szFilename, LineInfo.uLineNo);
+                    else
+                        RTStrPrintf(&szTmp[cch], sizeof(szTmp) - cch, "; %#x", uFlatAddr);
                 }
 
@@ -1237 +1297 @@
 static RTEXITCODE ParseSymFile(const char *pszBiosSym)
 {
-#if 1
-    /** @todo use RTDbg* later. (Just checking for existance currently.) */
-    PRTSTREAM hStrm;
-    int rc = RTStrmOpen(pszBiosSym, "rb", &hStrm);
+    int rc = RTDbgModCreateFromImage(&g_hSymMod, pszBiosSym, "VBoxBios",  RTLDRARCH_WHATEVER, NIL_RTDBGCFG);
     if (RT_FAILURE(rc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "Error opening '%s': %Rrc", pszBiosSym, rc);
-    RTStrmClose(hStrm);
-#else
-    RTDBGMOD hDbgMod;
-    int rc = RTDbgModCreateFromImage(&hDbgMod, pszBiosSym, "VBoxBios", 0 /*fFlags*/);
-    RTMsgInfo("RTDbgModCreateFromImage -> %Rrc\n", rc);
-#endif
+
+    if (g_cVerbose > 0)
+    {
+        /* Show segments */
+        RTDBGSEGIDX cSegs = RTDbgModSegmentCount(g_hSymMod);
+        for (RTDBGSEGIDX iSeg = 0; iSeg < cSegs; iSeg++)
+        {
+            RTDBGSEGMENT SegInfo;
+            rc = RTDbgModSegmentByIndex(g_hSymMod, iSeg, &SegInfo);
+            if (RT_SUCCESS(rc))
+                RTMsgInfo("Seg#%u: %05RX64 LB %04RX64 rva %04RX64 %s\n", iSeg, SegInfo.Address, SegInfo.cb, SegInfo.uRva, SegInfo.szName);
+            else
+                RTMsgInfo("Seg#%u: RTDbgModSegmentByIndex -> %Rrc\n", iSeg, rc);
+
+        }
+    }
     return RTEXITCODE_SUCCESS;
 }
@@ -1265 +1332 @@
     va_list va;
     va_start(va, pszFormat);
-    RTMsgError("%s:%d: %N", pMap->pszMapFile, pMap->iLine, pszFormat, va);
+    RTMsgError("%s:%d: %N", pMap->pszMapFile, pMap->iLine, pszFormat, &va);
     va_end(va);
     return false;
@@ -1755 +1822 @@
                 g_aSegs[j] = Tmp;
             }
+        g_aSegs[i].uRva = g_aSegs[i].uFlatAddr - g_aSegs[0].uFlatAddr;
+
         if (g_cVerbose > 0)
-            RTStrmPrintf(g_pStdErr, "segment at %08x / %04x:%04x LB %04x %s / %s / %s\n",
+            RTStrmPrintf(g_pStdErr, "segment at %08x / %04x / %04x:%04x LB %04x %s / %s / %s\n",
                          g_aSegs[i].uFlatAddr,
+                         g_aSegs[i].uRva,
                          g_aSegs[i].Address.sel,
                          g_aSegs[i].Address.off,