Changeset 99208 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Mar 29, 2023 2:13:56 PM (21 months ago)

Author:

vboxsync

Message:

Disassembler,VMM,Runtime: Get rid of deprecated DISCPUSTATE types (preparation for architecture specific separation in order to support ARMv8), bugref:10394

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (5 diffs)
• GCMAll.cpp (modified) (2 diffs)
• GIMAll.cpp (modified) (3 diffs)
• GIMAllHv.cpp (modified) (2 diffs)
• GIMAllKvm.cpp (modified) (2 diffs)
• PGMAllPhys.cpp (modified) (1 diff)
• PGMAllPool.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -854 +854 @@
  * @callback_method_impl{FNDISREADBYTES}
  */
-static DECLCALLBACK(int) emReadBytes(PDISCPUSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead)
+static DECLCALLBACK(int) emReadBytes(PDISSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead)
 {
     PVMCPUCC    pVCpu    = (PVMCPUCC)pDis->pvUser;
@@ -911 +911 @@
  * @param   pcbInstr        Where to return the instruction size. (optional)
  */
-VMM_INT_DECL(int) EMInterpretDisasCurrent(PVMCPUCC pVCpu, PDISCPUSTATE pDis, unsigned *pcbInstr)
+VMM_INT_DECL(int) EMInterpretDisasCurrent(PVMCPUCC pVCpu, PDISSTATE pDis, unsigned *pcbInstr)
 {
 #if defined(VBOX_VMM_TARGET_ARMV8)
@@ -947 +947 @@
  * @param   pcbInstr        Where to return the instruction size. (optional)
  */
-VMM_INT_DECL(int) EMInterpretDisasOneEx(PVMCPUCC pVCpu, RTGCUINTPTR GCPtrInstr, PDISCPUSTATE pDis, unsigned *pcbInstr)
+VMM_INT_DECL(int) EMInterpretDisasOneEx(PVMCPUCC pVCpu, RTGCUINTPTR GCPtrInstr, PDISSTATE pDis, unsigned *pcbInstr)
 {
     DISCPUMODE enmCpuMode = CPUMGetGuestDisMode(pVCpu);
@@ -994 +994 @@
 
 /**
- * Interprets the current instruction using the supplied DISCPUSTATE structure.
+ * Interprets the current instruction using the supplied DISSTATE structure.
  *
  * IP/EIP/RIP *IS* updated!
@@ -1017 +1017 @@
  *          Make sure this can't happen!! (will add some assertions/checks later)
  */
-VMM_INT_DECL(VBOXSTRICTRC) EMInterpretInstructionDisasState(PVMCPUCC pVCpu, PDISCPUSTATE pDis, uint64_t rip)
+VMM_INT_DECL(VBOXSTRICTRC) EMInterpretInstructionDisasState(PVMCPUCC pVCpu, PDISSTATE pDis, uint64_t rip)
 {
     LogFlow(("EMInterpretInstructionDisasState %RGv\n", (RTGCPTR)rip));

trunk/src/VBox/VMM/VMMAll/GCMAll.cpp

@@ -35 +35 @@
 #include <VBox/vmm/vmcc.h>
 
-#include <VBox/dis.h>       /* For DISCPUSTATE */
+#include <VBox/dis.h>       /* For DISSTATE */
 #include <iprt/errcore.h>
 #include <iprt/string.h>
@@ -113 +113 @@
  * @thread  EMT(pVCpu).
  */
-VMM_INT_DECL(VBOXSTRICTRC) GCMXcptDE(PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISCPUSTATE pDis, uint8_t *pcbInstr)
+VMM_INT_DECL(VBOXSTRICTRC) GCMXcptDE(PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISSTATE pDis, uint8_t *pcbInstr)
 {
     PVMCC pVM = pVCpu->CTX_SUFF(pVM);

trunk/src/VBox/VMM/VMMAll/GIMAll.cpp

@@ -36 +36 @@
 #include <VBox/vmm/vmcc.h>
 
-#include <VBox/dis.h>       /* For DISCPUSTATE */
+#include <VBox/dis.h>       /* For DISSTATE */
 #include <VBox/err.h>
 #include <iprt/string.h>
@@ -249 +249 @@
         return VERR_GIM_NOT_ENABLED;
 
-    unsigned    cbInstr;
-    DISCPUSTATE Dis;
+    unsigned cbInstr;
+    DISSTATE Dis;
     int rc = EMInterpretDisasCurrent(pVCpu, &Dis, &cbInstr);
     if (RT_SUCCESS(rc))
@@ -363 +363 @@
  * @thread  EMT(pVCpu).
  */
-VMM_INT_DECL(VBOXSTRICTRC) GIMXcptUD(PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISCPUSTATE pDis, uint8_t *pcbInstr)
+VMM_INT_DECL(VBOXSTRICTRC) GIMXcptUD(PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISSTATE pDis, uint8_t *pcbInstr)
 {
     PVMCC pVM = pVCpu->CTX_SUFF(pVM);

trunk/src/VBox/VMM/VMMAll/GIMAllHv.cpp

@@ -1461 +1461 @@
  * @thread  EMT(pVCpu).
  */
-VMM_INT_DECL(VBOXSTRICTRC) gimHvXcptUD(PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISCPUSTATE pDis, uint8_t *pcbInstr)
+VMM_INT_DECL(VBOXSTRICTRC) gimHvXcptUD(PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISSTATE pDis, uint8_t *pcbInstr)
 {
     VMCPU_ASSERT_EMT(pVCpu);
@@ -1477 +1477 @@
          * or the AMD VMMCALL instruction and if so, handle it as a hypercall.
          */
-        unsigned    cbInstr;
-        DISCPUSTATE Dis;
+        unsigned cbInstr;
+        DISSTATE Dis;
         int rc = EMInterpretDisasCurrent(pVCpu, &Dis, &cbInstr);
         if (RT_SUCCESS(rc))

trunk/src/VBox/VMM/VMMAll/GIMAllKvm.cpp

@@ -420 +420 @@
  * @thread  EMT(pVCpu).
  */
-VMM_INT_DECL(VBOXSTRICTRC) gimKvmXcptUD(PVMCC pVM, PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISCPUSTATE pDis, uint8_t *pcbInstr)
+VMM_INT_DECL(VBOXSTRICTRC) gimKvmXcptUD(PVMCC pVM, PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISSTATE pDis, uint8_t *pcbInstr)
 {
     VMCPU_ASSERT_EMT(pVCpu);
@@ -432 +432 @@
     if (!pDis)
     {
-        unsigned    cbInstr;
-        DISCPUSTATE Dis;
+        unsigned cbInstr;
+        DISSTATE Dis;
         int rc = EMInterpretDisasCurrent(pVCpu, &Dis, &cbInstr);
         if (RT_SUCCESS(rc))

trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp

@@ -222 +222 @@
              * we will simply skip it. Otherwise we'll have to defer it to REM.
              */
-            uint32_t     cbOp;
-            PDISCPUSTATE pDis = &pVCpu->pgm.s.DisState;
+            uint32_t  cbOp;
+            PDISSTATE pDis = &pVCpu->pgm.s.Dis;
             rc = EMInterpretDisasCurrent(pVCpu, pDis, &cbOp);
             if (     RT_SUCCESS(rc)

trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp

@@ -727 +727 @@
  * @param   offFault    The access offset.
  */
-DECLINLINE(bool) pgmRZPoolMonitorIsForking(PPGMPOOL pPool, PDISCPUSTATE pDis, unsigned offFault)
+DECLINLINE(bool) pgmRZPoolMonitorIsForking(PPGMPOOL pPool, PDISSTATE pDis, unsigned offFault)
 {
     /*
@@ -771 +771 @@
  * @remark  The REP prefix check is left to the caller because of STOSD/W.
  */
-DECLINLINE(bool) pgmRZPoolMonitorIsReused(PVMCC pVM, PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISCPUSTATE pDis, RTGCPTR pvFault,
+DECLINLINE(bool) pgmRZPoolMonitorIsReused(PVMCC pVM, PVMCPUCC pVCpu, PCPUMCTX pCtx, PDISSTATE pDis, RTGCPTR pvFault,
                                           PPGMPOOLPAGE pPage)
 {
@@ -885 +885 @@
  * @todo VBOXSTRICTRC
  */
-static int pgmRZPoolAccessPfHandlerFlush(PVMCC pVM, PVMCPUCC pVCpu, PPGMPOOL pPool, PPGMPOOLPAGE pPage, PDISCPUSTATE pDis,
+static int pgmRZPoolAccessPfHandlerFlush(PVMCC pVM, PVMCPUCC pVCpu, PPGMPOOL pPool, PPGMPOOLPAGE pPage, PDISSTATE pDis,
                                          PCPUMCTX pCtx, RTGCPHYS GCPhysFault)
 {
@@ -937 +937 @@
  * @param   pvFault     The fault address.
  */
-DECLINLINE(int) pgmRZPoolAccessPfHandlerSTOSD(PVMCC pVM, PPGMPOOL pPool, PPGMPOOLPAGE pPage, PDISCPUSTATE pDis,
+DECLINLINE(int) pgmRZPoolAccessPfHandlerSTOSD(PVMCC pVM, PPGMPOOL pPool, PPGMPOOLPAGE pPage, PDISSTATE pDis,
                                               PCPUMCTX pCtx, RTGCPHYS GCPhysFault, RTGCPTR pvFault)
 {
@@ -999 +999 @@
  * @param   pfReused    Reused state (in/out)
  */
-DECLINLINE(int) pgmRZPoolAccessPfHandlerSimple(PVMCC pVM, PVMCPUCC pVCpu, PPGMPOOL pPool, PPGMPOOLPAGE pPage, PDISCPUSTATE pDis,
+DECLINLINE(int) pgmRZPoolAccessPfHandlerSimple(PVMCC pVM, PVMCPUCC pVCpu, PPGMPOOL pPool, PPGMPOOLPAGE pPage, PDISSTATE pDis,
                                                PCPUMCTX pCtx, RTGCPHYS GCPhysFault, bool *pfReused)
 {
@@ -1150 +1150 @@
      * Disassemble the faulting instruction.
      */
-    PDISCPUSTATE pDis = &pVCpu->pgm.s.DisState;
+    PDISSTATE pDis = &pVCpu->pgm.s.Dis;
     int rc = EMInterpretDisasCurrent(pVCpu, pDis, NULL);
     if (RT_UNLIKELY(rc != VINF_SUCCESS))