Changeset 9273 in vbox for trunk/src/VBox

Timestamp:

May 31, 2008 6:46:03 PM (17 years ago)

Author:

vboxsync

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

31474

Message:

Use the new DISFormat* stuff so we can get useful disassembly in non-logging builds too.

File:

• trunk/src/VBox/VMM/DBGFDisas.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/DBGFDisas.cpp

@@ -20 +20 @@
  */
 
+#define USE_DIS_FORMAT
 
 /*******************************************************************************
@@ -92 +93 @@
 static int dbgfR3DisasInstrFirst(PVM pVM, PSELMSELINFO pSelInfo, PGMMODE enmMode, RTGCPTR GCPtr, PDBGFDISASSTATE pState)
 {
-    pState->Cpu.mode        = pSelInfo->Raw.Gen.u1DefBig ? CPUMODE_32BIT : CPUMODE_16BIT;
-    pState->Cpu.pfnReadBytes = dbgfR3DisasInstrRead;
     pState->GCPtrSegBase    = pSelInfo->GCPtrBase;
     pState->GCPtrSegEnd     = pSelInfo->cbLimit + 1 + (RTGCUINTPTR)pSelInfo->GCPtrBase;
@@ -104 +103 @@
     Assert((uintptr_t)GCPtr == GCPtr);
     uint32_t cbInstr;
+#ifdef USE_DIS_FORMAT
+    int rc = DISCoreOneEx(GCPtr,
+                          pSelInfo->Raw.Gen.u1DefBig
+                          ? enmMode >= PGMMODE_AMD64 && pSelInfo->Raw.Gen.u1Reserved
+                          ? CPUMODE_64BIT
+                          : CPUMODE_32BIT
+                          : CPUMODE_16BIT,
+                          dbgfR3DisasInstrRead,
+                          &pState->Cpu,
+                          &pState->Cpu,
+                          &cbInstr);
+#else
+    pState->Cpu.mode        = pSelInfo->Raw.Gen.u1DefBig ? CPUMODE_32BIT : CPUMODE_16BIT;
+    pState->Cpu.pfnReadBytes = dbgfR3DisasInstrRead;
     int rc = DISInstr(&pState->Cpu, GCPtr, 0, &cbInstr, NULL);
+#endif
     if (VBOX_SUCCESS(rc))
     {
@@ -231 +245 @@
 
 
+#ifdef USE_DIS_FORMAT
+/**
+ * @copydoc FNDISGETSYMBOL
+ */
+static DECLCALLBACK(int) dbgfR3DisasGetSymbol(PCDISCPUSTATE pCpu, uint32_t u32Sel, RTUINTPTR uAddress, char *pszBuf, size_t cchBuf, RTINTPTR *poff, void *pvUser)
+{
+    PDBGFDISASSTATE pState = (PDBGFDISASSTATE)pCpu;
+    PCSELMSELINFO   pSelInfo = (PCSELMSELINFO)pvUser;
+    DBGFSYMBOL      Sym;
+    RTGCINTPTR      off;
+    int             rc;
+
+    if (DIS_FMT_SEL_IS_REG(u32Sel))
+    {
+        if (DIS_FMT_SEL_GET_REG(u32Sel) == USE_REG_CS)
+            rc = DBGFR3SymbolByAddr(pState->pVM, uAddress + pSelInfo->GCPtrBase, &off, &Sym);
+        else
+            rc = VERR_SYMBOL_NOT_FOUND; /** @todo implement this */
+    }
+    else
+    {
+        if (pSelInfo->Sel == DIS_FMT_SEL_GET_VALUE(u32Sel))
+            rc = DBGFR3SymbolByAddr(pState->pVM, uAddress + pSelInfo->GCPtrBase, &off, &Sym);
+        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 rc;
+}
+#else
 /**
  * Copy a string and return pointer to the terminator char in the copy.
@@ -240 +295 @@
     return pszDst + cch;
 }
+#endif
 
 
@@ -361 +417 @@
      * Format it.
      */
+#ifdef USE_DIS_FORMAT
+    char szBuf[512];
+    DISFormatYasmEx(&State.Cpu, szBuf, sizeof(szBuf),
+                    DIS_FMT_FLAGS_RELATIVE_BRANCH,
+                    fFlags & DBGF_DISAS_FLAGS_NO_SYMBOLS ? NULL : dbgfR3DisasGetSymbol,
+                    &SelInfo);
+#else
     char szBuf[512];
     char *psz = &szBuf[0];
@@ -429 +492 @@
                         case CPUMODE_16BIT: GCPtrTarget &= UINT16_MAX; break;
                         case CPUMODE_32BIT: GCPtrTarget &= UINT32_MAX; break;
+                        case CPUMODE_64BIT: GCPtrTarget &= UINT64_MAX; break;
                         default: break;
                     }
@@ -558 +622 @@
     } /* foreach char in pszFormat */
     *psz = '\0';
+#endif /* !USE_DIS_FORMAT */
 
     /*