Changeset 109189 in vbox

Timestamp:

May 7, 2025 11:24:03 AM (21 hours ago)

Author:

vboxsync

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

168758

Message:

VMM: Removed CPUMR3DisasmInstrCPU as nobody uses it (replaced by DBGFR3DisasInstrCurrent and friends by now).

Location:

trunk

Files:

• include/VBox/vmm/cpumdis.h (deleted)
• src/VBox/VMM/VMMR3/CPUM-armv8.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/CPUM.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/EM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/EMHM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/EMR3Nem.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/CPUM-armv8.cpp

@@ -48 +48 @@
 #define CPUM_WITH_NONCONST_HOST_FEATURES
 #include <VBox/vmm/cpum.h>
-#include <VBox/vmm/cpumdis.h>
 #include <VBox/vmm/pgm.h>
 #include <VBox/vmm/mm.h>

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

@@ -119 +119 @@
 #define CPUM_WITH_NONCONST_HOST_FEATURES
 #include <VBox/vmm/cpum.h>
-#include <VBox/vmm/cpumdis.h>
 #include <VBox/vmm/cpumctx-v1_6.h>
 #include <VBox/vmm/pgm.h>
@@ -5163 +5162 @@
 
 /**
- * Structure used when disassembling and instructions in DBGF.
- * This is used so the reader function can get the stuff it needs.
- */
-typedef struct CPUMDISASSTATE
-{
-    /** Pointer to the CPU structure. */
-    PDISSTATE       pDis;
-    /** Pointer to the VM. */
-    PVM             pVM;
-    /** Pointer to the VMCPU. */
-    PVMCPU          pVCpu;
-    /** Pointer to the first byte in the segment. */
-    RTGCUINTPTR     GCPtrSegBase;
-    /** Pointer to the byte after the end of the segment. (might have wrapped!) */
-    RTGCUINTPTR     GCPtrSegEnd;
-    /** The size of the segment minus 1. */
-    RTGCUINTPTR     cbSegLimit;
-    /** Pointer to the current page - R3 Ptr. */
-    void const     *pvPageR3;
-    /** Pointer to the current page - GC Ptr. */
-    RTGCPTR         pvPageGC;
-    /** The lock information that PGMPhysReleasePageMappingLock needs. */
-    PGMPAGEMAPLOCK  PageMapLock;
-    /** Whether the PageMapLock is valid or not. */
-    bool            fLocked;
-    /** 64 bits mode or not. */
-    bool            f64Bits;
-} CPUMDISASSTATE, *PCPUMDISASSTATE;
-
-
-/**
- * @callback_method_impl{FNDISREADBYTES}
- */
-static DECLCALLBACK(int) cpumR3DisasInstrRead(PDISSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead)
-{
-    PCPUMDISASSTATE pState = (PCPUMDISASSTATE)pDis->pvUser;
-    for (;;)
-    {
-        RTGCUINTPTR GCPtr = pDis->uInstrAddr + offInstr + pState->GCPtrSegBase;
-
-        /*
-         * Need to update the page translation?
-         */
-        if (   !pState->pvPageR3
-            || (GCPtr >> GUEST_PAGE_SHIFT) != (pState->pvPageGC >> GUEST_PAGE_SHIFT))
-        {
-            /* translate the address */
-            pState->pvPageGC = GCPtr & ~(RTGCPTR)GUEST_PAGE_OFFSET_MASK;
-
-            /* Release mapping lock previously acquired. */
-            if (pState->fLocked)
-                PGMPhysReleasePageMappingLock(pState->pVM, &pState->PageMapLock);
-            int rc = PGMPhysGCPtr2CCPtrReadOnly(pState->pVCpu, pState->pvPageGC, &pState->pvPageR3, &pState->PageMapLock);
-            if (RT_SUCCESS(rc))
-                pState->fLocked  = true;
-            else
-            {
-                pState->fLocked  = false;
-                pState->pvPageR3 = NULL;
-                return rc;
-            }
-        }
-
-        /*
-         * Check the segment limit.
-         */
-        if (!pState->f64Bits && pDis->uInstrAddr + offInstr > pState->cbSegLimit)
-            return VERR_OUT_OF_SELECTOR_BOUNDS;
-
-        /*
-         * Calc how much we can read.
-         */
-        uint32_t cb = GUEST_PAGE_SIZE - (GCPtr & GUEST_PAGE_OFFSET_MASK);
-        if (!pState->f64Bits)
-        {
-            RTGCUINTPTR cbSeg = pState->GCPtrSegEnd - GCPtr;
-            if (cb > cbSeg && cbSeg)
-                cb = cbSeg;
-        }
-        if (cb > cbMaxRead)
-            cb = cbMaxRead;
-
-        /*
-         * Read and advance or exit.
-         */
-        memcpy(&pDis->Instr.ab[offInstr], (uint8_t *)pState->pvPageR3 + (GCPtr & GUEST_PAGE_OFFSET_MASK), cb);
-        offInstr  += (uint8_t)cb;
-        if (cb >= cbMinRead)
-        {
-            pDis->cbCachedInstr = offInstr;
-            return VINF_SUCCESS;
-        }
-        cbMinRead -= (uint8_t)cb;
-        cbMaxRead -= (uint8_t)cb;
-    }
-}
-
-
-/**
- * Disassemble an instruction and return the information in the provided structure.
- *
- * @returns VBox status code.
- * @param   pVM         The cross context VM structure.
- * @param   pVCpu       The cross context virtual CPU structure.
- * @param   pCtx        Pointer to the guest CPU context.
- * @param   GCPtrPC     Program counter (relative to CS) to disassemble from.
- * @param   pDis        Disassembly state.
- * @param   pszPrefix   String prefix for logging (debug only).
- *
- */
-VMMR3DECL(int) CPUMR3DisasmInstrCPU(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, RTGCPTR GCPtrPC, PDISSTATE pDis,
-                                    const char *pszPrefix)
-{
-    CPUMDISASSTATE  State;
-    int             rc;
-
-    const PGMMODE enmMode = PGMGetGuestMode(pVCpu);
-    State.pDis            = pDis;
-    State.pvPageGC        = 0;
-    State.pvPageR3        = NULL;
-    State.pVM             = pVM;
-    State.pVCpu           = pVCpu;
-    State.fLocked         = false;
-    State.f64Bits         = false;
-
-    /*
-     * Get selector information.
-     */
-    DISCPUMODE enmDisCpuMode;
-    if (    (pCtx->cr0 & X86_CR0_PE)
-        &&   pCtx->eflags.Bits.u1VM == 0)
-    {
-        if (!CPUMSELREG_ARE_HIDDEN_PARTS_VALID(pVCpu, &pCtx->cs))
-            return VERR_CPUM_HIDDEN_CS_LOAD_ERROR;
-        State.f64Bits         = enmMode >= PGMMODE_AMD64 && pCtx->cs.Attr.n.u1Long;
-        State.GCPtrSegBase    = pCtx->cs.u64Base;
-        State.GCPtrSegEnd     = pCtx->cs.u32Limit + 1 + (RTGCUINTPTR)pCtx->cs.u64Base;
-        State.cbSegLimit      = pCtx->cs.u32Limit;
-        enmDisCpuMode         = (State.f64Bits)
-                              ? DISCPUMODE_64BIT
-                              : pCtx->cs.Attr.n.u1DefBig
-                              ? DISCPUMODE_32BIT
-                              : DISCPUMODE_16BIT;
-    }
-    else
-    {
-        /* real or V86 mode */
-        enmDisCpuMode         = DISCPUMODE_16BIT;
-        State.GCPtrSegBase    = pCtx->cs.Sel * 16;
-        State.GCPtrSegEnd     = 0xFFFFFFFF;
-        State.cbSegLimit      = 0xFFFFFFFF;
-    }
-
-    /*
-     * Disassemble the instruction.
-     */
-    uint32_t cbInstr;
-#ifndef LOG_ENABLED
-    RT_NOREF_PV(pszPrefix);
-    rc = DISInstrWithReader(GCPtrPC, enmDisCpuMode, cpumR3DisasInstrRead, &State, pDis, &cbInstr);
-    if (RT_SUCCESS(rc))
-    {
-#else
-    char szOutput[160];
-    rc = DISInstrToStrWithReader(GCPtrPC, enmDisCpuMode, cpumR3DisasInstrRead, &State,
-                                 pDis, &cbInstr, szOutput, sizeof(szOutput));
-    if (RT_SUCCESS(rc))
-    {
-        /* log it */
-        if (pszPrefix)
-            Log(("%s-CPU%d: %s", pszPrefix, pVCpu->idCpu, szOutput));
-        else
-            Log(("%s", szOutput));
-#endif
-        rc = VINF_SUCCESS;
-    }
-    else
-        Log(("CPUMR3DisasmInstrCPU: DISInstr failed for %04X:%RGv rc=%Rrc\n", pCtx->cs.Sel, GCPtrPC, rc));
-
-    /* Release mapping lock acquired in cpumR3DisasInstrRead. */
-    if (State.fLocked)
-        PGMPhysReleasePageMappingLock(pVM, &State.PageMapLock);
-
-    return rc;
-}
-
-
-/**
  * Called when the ring-3 init phase completes.
  *

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

@@ -68 +68 @@
 #include <VBox/vmm/vm.h>
 #include <VBox/vmm/uvm.h>
-#include <VBox/vmm/cpumdis.h>
 #include <VBox/dis.h>
 #include <VBox/err.h>

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

@@ -50 +50 @@
 #include <VBox/vmm/vm.h>
 #include <VBox/vmm/gim.h>
-#include <VBox/vmm/cpumdis.h>
 #include <VBox/dis.h>
 #include <VBox/err.h>

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

@@ -50 +50 @@
 #include <VBox/vmm/vm.h>
 #include <VBox/vmm/gim.h>
-#include <VBox/vmm/cpumdis.h>
 #include <VBox/dis.h>
 #include <VBox/err.h>