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

Timestamp:

Dec 4, 2024 3:20:14 PM (6 weeks ago)

Author:

vboxsync

Message:

VMM: Cleaning up ARMv8 / x86 split. jiraref:VBP-1470

File:

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

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

@@ -68 +68 @@
     /** The address space for resolving symbol. */
     RTDBGAS         hDbgAs;
-#if !defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_X86
     /** Pointer to the first byte in the segment. */
     RTGCUINTPTR     GCPtrSegBase;
@@ -115 +115 @@
                                  RTGCPTR GCPtr, uint32_t fFlags, PDBGFDISASSTATE pState)
 {
-#if !defined(VBOX_VMM_TARGET_ARMV8)
+#ifndef VBOX_VMM_TARGET_X86
+    RT_NOREF_PV(pSelInfo);
+    pState->f64Bits         = CPUMIsGuestIn64BitCode(pVCpu);
+#else
     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;
@@ -142 +141 @@
             enmCpuMode = CPUMGetGuestDisMode(pVCpu);
             break;
-#if !defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_X86
         case DBGF_DISAS_FLAGS_16BIT_MODE:
         case DBGF_DISAS_FLAGS_16BIT_REAL_MODE:
@@ -153 +152 @@
             enmCpuMode = DISCPUMODE_64BIT;
             break;
-#else
+#elif defined(VBOX_VMM_TARGET_ARMV8)
         case DBGF_DISAS_FLAGS_16BIT_MODE: /** @todo r=aeichner This is a bit abusive... */
         case DBGF_DISAS_FLAGS_16BIT_REAL_MODE:
@@ -164 +163 @@
             enmCpuMode = DISCPUMODE_ARMV8_A64;
             break;
+#else
+# error "port me"
 #endif
     }
@@ -237 +238 @@
     for (;;)
     {
-#if !defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_X86
         RTGCUINTPTR GCPtr = pDis->uInstrAddr + offInstr + pState->GCPtrSegBase;
 #else
@@ -269 +270 @@
         }
 
-        uint32_t cb = GUEST_PAGE_SIZE - (GCPtr & GUEST_PAGE_OFFSET_MASK);
-#if !defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_X86
         /*
          * Check the segment limit.
@@ -276 +276 @@
         if (!pState->f64Bits && pDis->uInstrAddr + offInstr > pState->cbSegLimit)
             return VERR_OUT_OF_SELECTOR_BOUNDS;
+#endif
 
         /*
          * Calc how much we can read, maxing out the read.
          */
+        uint32_t cb = GUEST_PAGE_SIZE - (GCPtr & GUEST_PAGE_OFFSET_MASK);
+#ifdef VBOX_VMM_TARGET_X86
         if (!pState->f64Bits)
         {
@@ -313 +316 @@
 {
     PDBGFDISASSTATE pState   = (PDBGFDISASSTATE)pDis;
-    PCDBGFSELINFO   pSelInfo = (PCDBGFSELINFO)pvUser;
 
     /*
@@ -320 +322 @@
     DBGFADDRESS     Addr;
     int             rc;
-#if !defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_X86
+    PCDBGFSELINFO   pSelInfo = (PCDBGFSELINFO)pvUser;
+
     /* Start with CS. */
     if (   DIS_FMT_SEL_IS_REG(u32Sel)
@@ -349 +353 @@
         rc = VERR_SYMBOL_NOT_FOUND;
     }
+
 #else
-    RT_NOREF(pSelInfo, u32Sel);
-
+    RT_NOREF(pvUser, u32Sel);
     DBGFR3AddrFromFlat(pState->pVM->pUVM, &Addr, uAddress);
     rc = VINF_SUCCESS;
@@ -410 +414 @@
     int     rc;
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
-    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
+#ifdef VBOX_VMM_TARGET_X86
     /*
      * Get the Sel and GCPtr if fFlags requests that.
@@ -542 +540 @@
         }
     }
-#endif
+
+#else  /* !VBOX_VMM_TARGET_X86 */
+    const PGMMODE   enmMode = PGMGetGuestMode(pVCpu);
+    const bool      fRealModeAddress = false;
+    if (fFlags & DBGF_DISAS_FLAGS_CURRENT_GUEST)
+        GCPtr = CPUMGetGuestFlatPC(pVCpu);
+#endif /* !VBOX_VMM_TARGET_X86 */
 
     /*
@@ -548 +552 @@
      */
     DBGFDISASSTATE State;
+#ifdef VBOX_VMM_TARGET_X86
     rc = dbgfR3DisasInstrFirst(pVM, pVCpu, &SelInfo, enmMode, GCPtr, fFlags, &State);
+#else
+    rc = dbgfR3DisasInstrFirst(pVM, pVCpu, NULL, enmMode, GCPtr, fFlags, &State);
+#endif
     if (RT_FAILURE(rc))
     {
@@ -562 +570 @@
      */
     char szBuf[512];
-#if defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef 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
+#elif defined(VBOX_VMM_TARGET_X86)
     DISFormatYasmEx(&State.Dis, szBuf, sizeof(szBuf),
                     DIS_FMT_FLAGS_RELATIVE_BRANCH,
                     fFlags & DBGF_DISAS_FLAGS_NO_SYMBOLS ? NULL : dbgfR3DisasGetSymbol,
                     &SelInfo);
+#else
+# error "port me"
 #endif
 
@@ -651 +661 @@
         pDisState->Param3    = State.Dis.aParams[2];
         pDisState->Param4    = State.Dis.aParams[3];
-#if defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_ARMV8
         memcpy(&pDisState->armv8, &State.Dis.armv8, sizeof(State.Dis.armv8));
+#elif defined(VBOX_VMM_TARGET_X86)
+        memcpy(&pDisState->x86, &State.Dis.x86, sizeof(State.Dis.x86));
 #else
-        memcpy(&pDisState->x86, &State.Dis.x86, sizeof(State.Dis.x86));
+# error "port me"
 #endif
     }