Changeset 105745 in vbox for trunk/src/VBox/VMM/VMMR3/DBGFDisas.cpp

Timestamp:

Aug 21, 2024 7:16:50 AM (5 months ago)

Author:

vboxsync

Message:

VMM/PGM: Some preparations for ARMv8 page table walking, introduce dedicated PGMMODE enumerations for ARMv8 and hide all accesses behind PGMMODE_XXX macros, bugref:10388

File:

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

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

@@ -68 +68 @@
     /** The address space for resolving symbol. */
     RTDBGAS         hDbgAs;
+#if !defined(VBOX_VMM_TARGET_ARMV8)
     /** Pointer to the first byte in the segment. */
     RTGCUINTPTR     GCPtrSegBase;
@@ -74 +75 @@
     /** The size of the segment minus 1. */
     RTGCUINTPTR     cbSegLimit;
+#endif
     /** The guest paging mode. */
     PGMMODE         enmMode;
@@ -94 +96 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-#if !defined(VBOX_VMM_TARGET_ARMV8)
 static FNDISREADBYTES dbgfR3DisasInstrRead;
 
@@ -114 +115 @@
                                  RTGCPTR GCPtr, uint32_t fFlags, PDBGFDISASSTATE pState)
 {
+#if !defined(VBOX_VMM_TARGET_ARMV8)
     pState->GCPtrSegBase    = pSelInfo->GCPtrBase;
     pState->GCPtrSegEnd     = pSelInfo->cbLimit + 1 + (RTGCUINTPTR)pSelInfo->GCPtrBase;
     pState->cbSegLimit      = pSelInfo->cbLimit;
+    pState->f64Bits         = enmMode >= PGMMODE_AMD64 && pSelInfo->u.Raw.Gen.u1Long;
+#else
+    RT_NOREF(pSelInfo);
+
+    pState->f64Bits         = CPUMGetGuestCodeBits(pVCpu) == 64;
+#endif
     pState->enmMode         = enmMode;
     pState->GCPtrPage       = 0;
@@ -124 +132 @@
     pState->pVCpu           = pVCpu;
     pState->fLocked         = false;
-    pState->f64Bits         = enmMode >= PGMMODE_AMD64 && pSelInfo->u.Raw.Gen.u1Long;
 
     DISCPUMODE enmCpuMode;
@@ -133 +140 @@
             RT_FALL_THRU();
         case DBGF_DISAS_FLAGS_DEFAULT_MODE:
-            enmCpuMode   = pState->f64Bits
-                         ? DISCPUMODE_64BIT
-                         : pSelInfo->u.Raw.Gen.u1DefBig
-                         ? DISCPUMODE_32BIT
-                         : DISCPUMODE_16BIT;
+            enmCpuMode = CPUMGetGuestDisMode(pVCpu);
             break;
+#if !defined(VBOX_VMM_TARGET_ARMV8)
         case DBGF_DISAS_FLAGS_16BIT_MODE:
         case DBGF_DISAS_FLAGS_16BIT_REAL_MODE:
@@ -149 +153 @@
             enmCpuMode = DISCPUMODE_64BIT;
             break;
+#else
+        case DBGF_DISAS_FLAGS_16BIT_MODE: /** @todo r=aeichner This is a bit abusive... */
+        case DBGF_DISAS_FLAGS_16BIT_REAL_MODE:
+            enmCpuMode = DISCPUMODE_ARMV8_T32;
+            break;
+        case DBGF_DISAS_FLAGS_32BIT_MODE:
+            enmCpuMode = DISCPUMODE_ARMV8_A32;
+            break;
+        case DBGF_DISAS_FLAGS_64BIT_MODE:
+            enmCpuMode = DISCPUMODE_ARMV8_A64;
+            break;
+#endif
     }
 
@@ -221 +237 @@
     for (;;)
     {
+#if !defined(VBOX_VMM_TARGET_ARMV8)
         RTGCUINTPTR GCPtr = pDis->uInstrAddr + offInstr + pState->GCPtrSegBase;
+#else
+        RTGCUINTPTR GCPtr = pDis->uInstrAddr + offInstr;
+#endif
 
         /*
@@ -235 +255 @@
             if (pState->fLocked)
                 PGMPhysReleasePageMappingLock(pState->pVM, &pState->PageMapLock);
-            if (pState->enmMode <= PGMMODE_PROTECTED)
+            if (PGMMODE_WITH_PAGING(pState->enmMode))
+                rc = PGMPhysGCPtr2CCPtrReadOnly(pState->pVCpu, pState->GCPtrPage, &pState->pvPageR3, &pState->PageMapLock);
+            else
                 rc = PGMPhysGCPhys2CCPtrReadOnly(pState->pVM, pState->GCPtrPage, &pState->pvPageR3, &pState->PageMapLock);
-            else
-                rc = PGMPhysGCPtr2CCPtrReadOnly(pState->pVCpu, pState->GCPtrPage, &pState->pvPageR3, &pState->PageMapLock);
             if (RT_SUCCESS(rc))
                 pState->fLocked = true;
@@ -249 +269 @@
         }
 
+        uint32_t cb = GUEST_PAGE_SIZE - (GCPtr & GUEST_PAGE_OFFSET_MASK);
+#if !defined(VBOX_VMM_TARGET_ARMV8)
         /*
          * Check the segment limit.
@@ -258 +280 @@
          * Calc how much we can read, maxing out the read.
          */
-        uint32_t cb = GUEST_PAGE_SIZE - (GCPtr & GUEST_PAGE_OFFSET_MASK);
         if (!pState->f64Bits)
         {
@@ -265 +286 @@
                 cb = cbSeg;
         }
+#endif
         if (cb > cbMaxRead)
             cb = cbMaxRead;
@@ -298 +320 @@
     DBGFADDRESS     Addr;
     int             rc;
+#if !defined(VBOX_VMM_TARGET_ARMV8)
     /* Start with CS. */
     if (   DIS_FMT_SEL_IS_REG(u32Sel)
@@ -326 +349 @@
         rc = VERR_SYMBOL_NOT_FOUND;
     }
+#else
+    RT_NOREF(pSelInfo, u32Sel);
+
+    DBGFR3AddrFromFlat(pState->pVM->pUVM, &Addr, uAddress);
+    rc = VINF_SUCCESS;
+#endif
 
     /*
@@ -353 +382 @@
     return rc;
 }
-#endif /* VBOX_VMM_TARGET_ARMV8 */
 
 
@@ -383 +411 @@
 
 #if defined(VBOX_VMM_TARGET_ARMV8)
-    RT_NOREF(pVM, pVCpu, Sel, GCPtr, rc, fFlags, pszOutput, cbOutput, pcbInstr, pDisState);
-    //AssertFailed(); /** @todo */
-    return VERR_NOT_IMPLEMENTED;
+    DBGFSELINFO     SelInfo; RT_ZERO(SelInfo);
+    const PGMMODE   enmMode = PGMGetGuestMode(pVCpu);
+    const bool      fRealModeAddress = false;
+    if (fFlags & DBGF_DISAS_FLAGS_CURRENT_GUEST)
+        GCPtr = CPUMGetGuestFlatPC(pVCpu);
 #else
     /*
@@ -428 +458 @@
         SelInfo.GCPtrBase               = pSRegCS->u64Base;
         SelInfo.cbLimit                 = pSRegCS->u32Limit;
-        SelInfo.fFlags                  = PGMMODE_IS_LONG_MODE(enmMode)
+        SelInfo.fFlags                  = PGMMODE_IS_64BIT_MODE(enmMode)
                                         ? DBGFSELINFO_FLAGS_LONG_MODE
                                         : enmMode != PGMMODE_REAL && !pCtx->eflags.Bits.u1VM
@@ -452 +482 @@
         SelInfo.GCPtrBase               = 0;
         SelInfo.cbLimit                 = ~(RTGCUINTPTR)0;
-        SelInfo.fFlags                  = PGMMODE_IS_LONG_MODE(enmMode)
+        SelInfo.fFlags                  = PGMMODE_IS_64BIT_MODE(enmMode)
                                         ? DBGFSELINFO_FLAGS_LONG_MODE
                                         : enmMode != PGMMODE_REAL
@@ -512 +542 @@
         }
     }
+#endif
 
     /*
@@ -531 +562 @@
      */
     char szBuf[512];
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    DISFormatArmV8Ex(&State.Dis, szBuf, sizeof(szBuf),
+                     DIS_FMT_FLAGS_RELATIVE_BRANCH,
+                     fFlags & DBGF_DISAS_FLAGS_NO_SYMBOLS ? NULL : dbgfR3DisasGetSymbol,
+                     NULL);
+#else
     DISFormatYasmEx(&State.Dis, szBuf, sizeof(szBuf),
                     DIS_FMT_FLAGS_RELATIVE_BRANCH,
                     fFlags & DBGF_DISAS_FLAGS_NO_SYMBOLS ? NULL : dbgfR3DisasGetSymbol,
                     &SelInfo);
+#endif
 
     /*
@@ -548 +586 @@
         else if (Sel == DBGF_SEL_FLAT)
         {
-            if (enmMode >= PGMMODE_AMD64)
+            if (PGMMODE_IS_64BIT_MODE(enmMode))
                 cch = RTStrPrintf(pszOutput, cbOutput, "%RGv  %s", GCPtr, szBuf);
             else
@@ -555 +593 @@
         else
         {
-            if (enmMode >= PGMMODE_AMD64)
+            if (PGMMODE_IS_64BIT_MODE(enmMode))
                 cch = RTStrPrintf(pszOutput, cbOutput, "%04x:%RGv  %s", Sel, GCPtr, szBuf);
             else
@@ -576 +614 @@
         else if (Sel == DBGF_SEL_FLAT)
         {
-            if (enmMode >= PGMMODE_AMD64)
+            if (PGMMODE_IS_64BIT_MODE(enmMode))
                 cch = RTStrPrintf(pszOutput, cbOutput, "%RGv %.*Rhxs%*s %s",
                                   GCPtr,
@@ -589 +627 @@
         else
         {
-            if (enmMode >= PGMMODE_AMD64)
+            if (PGMMODE_IS_64BIT_MODE(enmMode))
                 cch = RTStrPrintf(pszOutput, cbOutput, "%04x:%RGv %.*Rhxs%*s %s",
                                   Sel, GCPtr,
@@ -617 +655 @@
     dbgfR3DisasInstrDone(&State);
     return VINF_SUCCESS;
-#endif /* !VBOX_VMM_TARGET_ARMV8*/
 }