Changeset 99231 in vbox for trunk/src/VBox

Timestamp:

Mar 30, 2023 1:28:07 PM (22 months ago)

Author:

vboxsync

Message:

Disassember,*: Start separating the disassembler into a architecture specific and common part, bugref:10394 [build fixes]

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllPhys.cpp (modified) (1 diff)
• PGMAllPool.cpp (modified) (10 diffs)

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

@@ -227 +227 @@
             if (     RT_SUCCESS(rc)
                 &&   pDis->uCpuMode == DISCPUMODE_32BIT  /** @todo why does this matter? */
-                &&  !(pDis->fPrefix & (DISPREFIX_REPNE | DISPREFIX_REP | DISPREFIX_SEG)))
+                &&  !(pDis->arch.x86.fPrefix & (DISPREFIX_REPNE | DISPREFIX_REP | DISPREFIX_SEG)))
             {
-                switch (pDis->bOpCode)
+                switch (pDis->arch.x86.bOpCode)
                 {
                     /** @todo Find other instructions we can safely skip, possibly

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

@@ -790 +790 @@
     }
 
-    LogFlow(("Reused instr %RGv %d at %RGv param1.fUse=%llx param1.reg=%d\n", pCtx->rip, pDis->pCurInstr->uOpcode, pvFault, pDis->Param1.fUse,  pDis->Param1.Base.idxGenReg));
+    LogFlow(("Reused instr %RGv %d at %RGv param1.fUse=%llx param1.reg=%d\n", pCtx->rip, pDis->pCurInstr->uOpcode, pvFault, pDis->Param1.fUse,  pDis->Param1.arch.x86.Base.idxGenReg));
 
     /* Non-supervisor mode write means it's used for something else. */
@@ -822 +822 @@
         case OP_MOVSWD:
         case OP_STOSWD:
-            if (    pDis->fPrefix == (DISPREFIX_REP|DISPREFIX_REX)
+            if (    pDis->arch.x86.fPrefix == (DISPREFIX_REP|DISPREFIX_REX)
                 &&  pCtx->rcx >= 0x40
                )
@@ -839 +839 @@
             if (    (    (pDis->Param1.fUse & DISUSE_REG_GEN32)
                      ||  (pDis->Param1.fUse & DISUSE_REG_GEN64))
-                &&  (pDis->Param1.Base.idxGenReg == DISGREG_ESP))
+                &&  (pDis->Param1.arch.x86.Base.idxGenReg == DISGREG_ESP))
             {
                 Log4(("pgmRZPoolMonitorIsReused: ESP\n"));
@@ -939 +939 @@
                                               PCPUMCTX pCtx, RTGCPHYS GCPhysFault, RTGCPTR pvFault)
 {
-    unsigned uIncrement = pDis->Param1.cb;
+    unsigned uIncrement = pDis->Param1.arch.x86.cb;
     NOREF(pVM);
 
@@ -946 +946 @@
 
 # ifdef VBOX_STRICT
-    if (pDis->uOpMode == DISCPUMODE_32BIT)
+    if (pDis->arch.x86.uOpMode == DISCPUMODE_32BIT)
         Assert(uIncrement == 4);
     else
@@ -1184 +1184 @@
     if (    pPage->GCPtrLastAccessHandlerRip >= pCtx->rip - 0x40      /* observed loops in Windows 7 x64 */
         &&  pPage->GCPtrLastAccessHandlerRip <  pCtx->rip + 0x40
-        &&  pvFault == (pPage->GCPtrLastAccessHandlerFault + pDis->Param1.cb)
+        &&  pvFault == (pPage->GCPtrLastAccessHandlerFault + pDis->Param1.arch.x86.cb)
         &&  pVCpu->pgm.s.cPoolAccessHandler == pPage->cLastAccessHandler + 1)
     {
@@ -1216 +1216 @@
          * Simple instructions, no REP prefix.
          */
-        if (!(pDis->fPrefix & (DISPREFIX_REP | DISPREFIX_REPNE)))
+        if (!(pDis->arch.x86.fPrefix & (DISPREFIX_REP | DISPREFIX_REPNE)))
         {
             rc = pgmRZPoolAccessPfHandlerSimple(pVM, pVCpu, pPool, pPage, pDis, pCtx, GCPhysFault, &fReused);
@@ -1259 +1259 @@
         if (    pDis->pCurInstr->uOpcode == OP_STOSWD
             &&  !pCtx->eflags.Bits.u1DF
-            &&  pDis->uOpMode == pDis->uCpuMode
-            &&  pDis->uAddrMode == pDis->uCpuMode)
+            &&  pDis->arch.x86.uOpMode == pDis->uCpuMode
+            &&  pDis->arch.x86.uAddrMode == pDis->uCpuMode)
         {
             bool fValidStosd = false;
 
             if (    pDis->uCpuMode == DISCPUMODE_32BIT
-                &&  pDis->fPrefix == DISPREFIX_REP
+                &&  pDis->arch.x86.fPrefix == DISPREFIX_REP
                 &&  pCtx->ecx <= 0x20
                 &&  pCtx->ecx * 4 <= GUEST_PAGE_SIZE - ((uintptr_t)pvFault & GUEST_PAGE_OFFSET_MASK)
@@ -1277 +1277 @@
             else
             if (    pDis->uCpuMode == DISCPUMODE_64BIT
-                &&  pDis->fPrefix == (DISPREFIX_REP | DISPREFIX_REX)
+                &&  pDis->arch.x86.fPrefix == (DISPREFIX_REP | DISPREFIX_REX)
                 &&  pCtx->rcx <= 0x20
                 &&  pCtx->rcx * 8 <= GUEST_PAGE_SIZE - ((uintptr_t)pvFault & GUEST_PAGE_OFFSET_MASK)
@@ -1299 +1299 @@
         STAM_COUNTER_INC(&pPool->StatMonitorPfRZRepPrefix);
         Log4(("pgmRZPoolAccessPfHandler: eax=%#x ecx=%#x edi=%#x esi=%#x rip=%RGv opcode=%d prefix=%#x\n",
-              pCtx->eax, pCtx->ecx, pCtx->edi, pCtx->esi, (RTGCPTR)pCtx->rip, pDis->pCurInstr->uOpcode, pDis->fPrefix));
+              pCtx->eax, pCtx->ecx, pCtx->edi, pCtx->esi, (RTGCPTR)pCtx->rip, pDis->pCurInstr->uOpcode, pDis->arch.x86.fPrefix));
         fNotReusedNotForking = true;
     }