Changeset 41732 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jun 14, 2012 11:57:45 PM (13 years ago)

Author:

vboxsync

Message:

DISCPUSTATE::opsize -> cbInstr.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (1 diff)
• HWVMXR0.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -2987 +2987 @@
             if (RT_SUCCESS(rc) && pDis->pCurInstr->opcode == OP_INVLPG)
             {
-                Assert(cbOp == pDis->opsize);
+                Assert(cbOp == pDis->cbInstr);
                 rc = hmR0svmInterpretInvlPg(pVCpu, pDis, pRegFrame, uASID);
                 if (RT_SUCCESS(rc))

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -3553 +3553 @@
 
                     rc = VINF_SUCCESS;
-                    Assert(cbOp == pDis->opsize);
+                    Assert(cbOp == pDis->cbInstr);
                     switch (pDis->pCurInstr->opcode)
                     {
@@ -3563 +3563 @@
                     case OP_STI:
                         pCtx->eflags.Bits.u1IF = 1;
-                        EMSetInhibitInterruptsPC(pVCpu, pCtx->rip + pDis->opsize);
+                        EMSetInhibitInterruptsPC(pVCpu, pCtx->rip + pDis->cbInstr);
                         Assert(VMCPU_FF_ISSET(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS));
                         rc2 = VMXWriteVMCS(VMX_VMCS32_GUEST_INTERRUPTIBILITY_STATE,
@@ -3574 +3574 @@
                         fUpdateRIP = false;
                         rc = VINF_EM_HALT;
-                        pCtx->rip += pDis->opsize;
+                        pCtx->rip += pDis->cbInstr;
                         STAM_COUNTER_INC(&pVCpu->hwaccm.s.StatExitHlt);
                         break;