Changeset 97193 in vbox for trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

Timestamp:

Oct 18, 2022 10:18:45 AM (2 years ago)

Author:

vboxsync

Message:

VMM/EM: Drop the PVM and PCCPUMCTXCORE arguments from EMInterpretDisasCurrent and EMInterpretDisasOneEx.

File:

• trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp (modified) (4 diffs)

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

@@ -7414 +7414 @@
         {
             PDISCPUSTATE pDis = &pVCpu->hmr0.s.svm.DisState;
-            int rc = EMInterpretDisasCurrent(pVCpu->CTX_SUFF(pVM), pVCpu, pDis, &cbInstr);
+            int rc = EMInterpretDisasCurrent(pVCpu, pDis, &cbInstr);
             if (   rc == VINF_SUCCESS
                 && pDis->pCurInstr->uOpcode == OP_WRMSR)
@@ -8115 +8115 @@
         {
             PDISCPUSTATE pDis = &pVCpu->hmr0.s.svm.DisState;
-            int rc = EMInterpretDisasCurrent(pVCpu->CTX_SUFF(pVM), pVCpu, pDis, &cbInstr);
+            int rc = EMInterpretDisasCurrent(pVCpu, pDis, &cbInstr);
             if (   rc == VINF_SUCCESS
                 && pDis->pCurInstr->uOpcode == OP_VMMCALL)
@@ -8159 +8159 @@
     {
         PDISCPUSTATE pDis = &pVCpu->hmr0.s.svm.DisState;
-        int rc = EMInterpretDisasCurrent(pVCpu->CTX_SUFF(pVM), pVCpu, pDis, &cbInstr);
+        int rc = EMInterpretDisasCurrent(pVCpu, pDis, &cbInstr);
         if (   rc == VINF_SUCCESS
             && pDis->pCurInstr->uOpcode == OP_PAUSE)
@@ -8512 +8512 @@
     if (!(pCtx->cr0 & X86_CR0_NE))
     {
-        PVMCC     pVM  = pVCpu->CTX_SUFF(pVM);
         PDISSTATE pDis = &pVCpu->hmr0.s.svm.DisState;
         unsigned  cbInstr;
-        int rc = EMInterpretDisasCurrent(pVM, pVCpu, pDis, &cbInstr);
+        int rc = EMInterpretDisasCurrent(pVCpu, pDis, &cbInstr);
         if (RT_SUCCESS(rc))
         {