Changeset 46177 in vbox

Timestamp:

May 20, 2013 9:12:43 PM (12 years ago)

Author:

vboxsync

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

85887

Message:

More symbols in disassembly, for PATM esp.

Location:

trunk/src/VBox

Files:

• Disassembler/DisasmFormatYasm.cpp (modified) (8 diffs)
• Runtime/common/ldr/ldrPE.cpp (modified) (1 diff)
• VMM/VMMR3/DBGFDisas.cpp (modified) (1 diff)
• VMM/VMMR3/PATMR3Dbg.cpp (modified) (3 diffs)

trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp

@@ -341 +341 @@
 #define PUT_NUM_S64(num) PUT_NUM_SIGN(18, "0%016RX64h", num, int64_t, uint64_t)
 
+#define PUT_SYMBOL_TWO(a_rcSym, a_szStart, a_chEnd) \
+        do { \
+            if (RT_SUCCESS(a_rcSym)) \
+            { \
+                PUT_SZ(a_szStart); \
+                PUT_PSZ(szSymbol); \
+                if (off != 0) \
+                { \
+                    if ((int8_t)off == off) \
+                        PUT_NUM_S8(off); \
+                    else if ((int16_t)off == off) \
+                        PUT_NUM_S16(off); \
+                    else if ((int32_t)off == off) \
+                        PUT_NUM_S32(off); \
+                    else \
+                        PUT_NUM_S64(off); \
+                } \
+                PUT_C(a_chEnd); \
+            } \
+        } while (0)
+
+#define PUT_SYMBOL(a_uSeg, a_uAddr, a_szStart, a_chEnd) \
+        do { \
+            if (pfnGetSymbol) \
+            { \
+                int rcSym = pfnGetSymbol(pDis, a_uSeg, a_uAddr, szSymbol, sizeof(szSymbol), &off, pvUser); \
+                PUT_SYMBOL_TWO(rcSym, a_szStart, a_chEnd); \
+            } \
+        } while (0)
+
 
     /*
@@ -736 +766 @@
                             Assert(!(fUse & DISUSE_SCALE));
 
+                        int64_t off2 = 0;
                         if (fUse & (DISUSE_DISPLACEMENT8 | DISUSE_DISPLACEMENT16 | DISUSE_DISPLACEMENT32 | DISUSE_DISPLACEMENT64 | DISUSE_RIPDISPLACEMENT32))
                         {
-                            int64_t off2;
                             if (fUse & DISUSE_DISPLACEMENT8)
                                 off2 = pParam->uDisp.i8;
@@ -775 +805 @@
 
                         if (DISUSE_IS_EFFECTIVE_ADDR(fUse))
+                        {
+                            if (pfnGetSymbol && !fBase && !(fUse & DISUSE_INDEX) && off2 != 0)
+                                PUT_SYMBOL((pDis->fPrefix & DISPREFIX_SEG)
+                                           ? DIS_FMT_SEL_FROM_REG(pDis->idxSegPrefix)
+                                           : DIS_FMT_SEL_FROM_REG(DISSELREG_DS),
+                                           pDis->uAddrMode == DISCPUMODE_64BIT
+                                           ? (uint64_t)off2
+                                           : pDis->uAddrMode == DISCPUMODE_32BIT
+                                           ? (uint32_t)off2
+                                           : (uint16_t)off2,
+                                           " (=", ')');
                             PUT_C(']');
+                        }
                         break;
                     }
@@ -840 +882 @@
                                 }
                                 PUT_NUM_32(pParam->uValue);
+                                if (pDis->uCpuMode == DISCPUMODE_32BIT)
+                                    PUT_SYMBOL(DIS_FMT_SEL_FROM_REG(DISSELREG_CS), pParam->uValue, " (=", ')');
                                 break;
 
@@ -908 +952 @@
                                 PUT_SZ("near ");
                             offDisplacement = (int32_t)pParam->uValue;
-                            Assert(pParam->fUse & (DISUSE_IMMEDIATE32_REL|DISUSE_IMMEDIATE64_REL));
+                            Assert(pParam->fUse & (DISUSE_IMMEDIATE32_REL | DISUSE_IMMEDIATE64_REL));
                             Assert(*pszFmt == 'v'); pszFmt++;
 
@@ -925 +969 @@
                             PUT_NUM_64(uTrgAddr);
 
-                        if (pfnGetSymbol)
+                        if (fFlags & DIS_FMT_FLAGS_RELATIVE_BRANCH)
                         {
-                            int rc = pfnGetSymbol(pDis, DIS_FMT_SEL_FROM_REG(DISSELREG_CS), uTrgAddr, szSymbol, sizeof(szSymbol), &off, pvUser);
-                            if (RT_SUCCESS(rc))
-                            {
-                                PUT_SZ(" [");
-                                PUT_PSZ(szSymbol);
-                                if (off != 0)
-                                {
-                                    if ((int8_t)off == off)
-                                        PUT_NUM_S8(off);
-                                    else if ((int16_t)off == off)
-                                        PUT_NUM_S16(off);
-                                    else if ((int32_t)off == off)
-                                        PUT_NUM_S32(off);
-                                    else
-                                        PUT_NUM_S64(off);
-                                }
-                                PUT_C(']');
-                            }
+                            PUT_SYMBOL(DIS_FMT_SEL_FROM_REG(DISSELREG_CS), uTrgAddr, " = ", ' ');
+                            PUT_C(')');
                         }
-
-                        if (fFlags & DIS_FMT_FLAGS_RELATIVE_BRANCH)
-                            PUT_C(')');
+                        else
+                            PUT_SYMBOL(DIS_FMT_SEL_FROM_REG(DISSELREG_CS), uTrgAddr, " (", ')');
                         break;
                     }
@@ -995 +1022 @@
                         }
 
-                        if (RT_SUCCESS(rc))
-                        {
-                            PUT_SZ(" [");
-                            PUT_PSZ(szSymbol);
-                            if (off != 0)
-                            {
-                                if ((int8_t)off == off)
-                                    PUT_NUM_S8(off);
-                                else if ((int16_t)off == off)
-                                    PUT_NUM_S16(off);
-                                else if ((int32_t)off == off)
-                                    PUT_NUM_S32(off);
-                                else
-                                    PUT_NUM_S64(off);
-                            }
-                            PUT_C(']');
-                        }
+                        PUT_SYMBOL_TWO(rc, " [", ']');
                         break;
                     }
@@ -1060 +1071 @@
                         PUT_C(']');
 
-                        if (RT_SUCCESS(rc))
-                        {
-                            PUT_SZ(" (");
-                            PUT_PSZ(szSymbol);
-                            if (off != 0)
-                            {
-                                if ((int8_t)off == off)
-                                    PUT_NUM_S8(off);
-                                else if ((int16_t)off == off)
-                                    PUT_NUM_S16(off);
-                                else if ((int32_t)off == off)
-                                    PUT_NUM_S32(off);
-                                else
-                                    PUT_NUM_S64(off);
-                            }
-                            PUT_C(')');
-                        }
+                        PUT_SYMBOL_TWO(rc, " (", ')');
                         break;
                     }

trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

@@ -240 +240 @@
             else
             {
-                offFile  = -1;
+                offFile  = UINT32_MAX;
                 cbToRead = 0;
             }

trunk/src/VBox/VMM/VMMR3/DBGFDisas.cpp

@@ -325 +325 @@
  * @copydoc FNDISGETSYMBOL
  */
-static DECLCALLBACK(int) dbgfR3DisasGetSymbol(PCDISCPUSTATE pCpu, uint32_t u32Sel, RTUINTPTR uAddress, char *pszBuf, size_t cchBuf, RTINTPTR *poff, void *pvUser)
+static DECLCALLBACK(int) dbgfR3DisasGetSymbol(PCDISCPUSTATE pCpu, uint32_t u32Sel, RTUINTPTR uAddress,
+                                              char *pszBuf, size_t cchBuf, RTINTPTR *poff, void *pvUser)
 {
     PDBGFDISASSTATE pState   = (PDBGFDISASSTATE)pCpu;
     PCDBGFSELINFO   pSelInfo = (PCDBGFSELINFO)pvUser;
+
+    /*
+     * Address conversion
+     */
     DBGFADDRESS     Addr;
-    RTDBGSYMBOL     Sym;
-    RTGCINTPTR      off;
     int             rc;
-
+    /* Start with CS. */
     if (   DIS_FMT_SEL_IS_REG(u32Sel)
         ?  DIS_FMT_SEL_GET_REG(u32Sel) == DISSELREG_CS
         :  pSelInfo->Sel == DIS_FMT_SEL_GET_VALUE(u32Sel))
-    {
         rc = DBGFR3AddrFromSelInfoOff(pState->pVM->pUVM, &Addr, pSelInfo, uAddress);
+    /* In long mode everything but FS and GS is easy. */
+    else if (   pState->Cpu.uCpuMode == DISCPUMODE_64BIT
+             && DIS_FMT_SEL_IS_REG(u32Sel)
+             && DIS_FMT_SEL_GET_REG(u32Sel) != DISSELREG_GS
+             && DIS_FMT_SEL_GET_REG(u32Sel) != DISSELREG_FS)
+    {
+        DBGFR3AddrFromFlat(pState->pVM->pUVM, &Addr, uAddress);
+        rc = VINF_SUCCESS;
+    }
+    /* Here's a quick hack to catch patch manager SS relative access. */
+    else if (   DIS_FMT_SEL_IS_REG(u32Sel)
+             && DIS_FMT_SEL_GET_REG(u32Sel) == DISSELREG_SS
+             && pSelInfo->GCPtrBase == 0
+             && pSelInfo->cbLimit   >= UINT32_MAX
+             && PATMIsPatchGCAddr(pState->pVM, pState->Cpu.uInstrAddr))
+    {
+        DBGFR3AddrFromFlat(pState->pVM->pUVM, &Addr, uAddress);
+        rc = VINF_SUCCESS;
+    }
+    else
+    {
+        /** @todo implement a generic solution here. */
+        rc = VERR_SYMBOL_NOT_FOUND;
+    }
+
+    /*
+     * If we got an address, try resolve it into a symbol.
+     */
+    if (RT_SUCCESS(rc))
+    {
+        RTDBGSYMBOL     Sym;
+        RTGCINTPTR      off;
+        rc = DBGFR3AsSymbolByAddr(pState->pVM->pUVM, pState->hDbgAs, &Addr, RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL,
+                                  &off, &Sym, NULL /*phMod*/);
         if (RT_SUCCESS(rc))
-            rc = DBGFR3AsSymbolByAddr(pState->pVM->pUVM, pState->hDbgAs, &Addr, RTDBGSYMADDR_FLAGS_LESS_OR_EQUAL,
-                                      &off, &Sym, NULL /*phMod*/);
-    }
-    else
-        rc = VERR_SYMBOL_NOT_FOUND; /** @todo implement this */
-    if (RT_SUCCESS(rc))
-    {
-        size_t cchName = strlen(Sym.szName);
-        if (cchName >= cchBuf)
-            cchName = cchBuf - 1;
-        memcpy(pszBuf, Sym.szName, cchName);
-        pszBuf[cchName] = '\0';
-
-        *poff = off;
-    }
-
+        {
+            /*
+             * Return the symbol and offset.
+             */
+            size_t cchName = strlen(Sym.szName);
+            if (cchName >= cchBuf)
+                cchName = cchBuf - 1;
+            memcpy(pszBuf, Sym.szName, cchName);
+            pszBuf[cchName] = '\0';
+
+            *poff = off;
+        }
+    }
     return rc;
 }

trunk/src/VBox/VMM/VMMR3/PATMR3Dbg.cpp

@@ -239 +239 @@
 {
     /*
-     * Global functions.
+     * Global functions and a start marker.
      */
     ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperCallGC, PATMLookupAndCallRecord.size, "PATMLookupAndCall");
@@ -245 +245 @@
     ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperJumpGC, PATMLookupAndJumpRecord.size, "PATMLookupAndJump");
     ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pfnHelperIretGC, PATMIretFunctionRecord.size,  "PATMIretFunction");
+
+    ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pPatchMemGC, 0,  "PatchMemStart");
+    ADD_FUNC(hDbgMod, pVM->patm.s.pPatchMemGC, pVM->patm.s.pGCStackGC, PATM_STACK_TOTAL_SIZE, "PATMStack");
 
     /*
@@ -297 +300 @@
 
     /*
-     * Add a fake debug module for the patches.
-     */
-    rc = RTDbgModCreate(&hDbgMod, "patches", pVM->patm.s.cbPatchMem, 0 /*fFlags*/);
+     * Add something for the stats so we get some kind of symbols for
+     * references to them while disassembling patches.
+     */
+    rc = RTDbgModCreate(&hDbgMod, "patmstats", PATM_STAT_MEMSIZE, 0 /*fFlags*/);
+    if (RT_SUCCESS(rc))
+    {
+        ADD_FUNC(hDbgMod, pVM->patm.s.pStatsGC, pVM->patm.s.pStatsGC, PATM_STAT_MEMSIZE, "PATMMemStatsStart");
+
+        rc = RTDbgAsModuleLink(hDbgAs, hDbgMod, pVM->patm.s.pStatsGC, 0 /*fFlags/*/);
+        AssertLogRelRC(rc);
+        RTDbgModRelease(hDbgMod);
+    }
+
+    /*
+     * Add a fake debug module for the patches and stack.
+     */
+    rc = RTDbgModCreate(&hDbgMod, "patches", pVM->patm.s.cbPatchMem + PATM_STACK_TOTAL_SIZE + PAGE_SIZE, 0 /*fFlags*/);
     if (RT_SUCCESS(rc))
     {