Changeset 73708 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

Aug 16, 2018 10:22:12 AM (6 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Add missing VM-exit instruction info variants. Adjusted hmR0VmxDecodeMemOperand to use
the generic/'All' version of the instruction info.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

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

@@ -5874 +5874 @@
     AssertCompile(RT_ELEMENTS(s_auAccessSizeMasks) == RT_ELEMENTS(s_auAddrSizeMasks));
 
-    uint8_t const   uAddrSize     =  pExitInstrInfo->InvVmxXsaves.u3AddrSize;
-    uint8_t const   iSegReg       =  pExitInstrInfo->InvVmxXsaves.iSegReg;
-    bool const      fIdxRegValid  = !pExitInstrInfo->InvVmxXsaves.fIdxRegInvalid;
-    uint8_t const   iIdxReg       =  pExitInstrInfo->InvVmxXsaves.iIdxReg;
-    uint8_t const   uScale        =  pExitInstrInfo->InvVmxXsaves.u2Scaling;
-    bool const      fBaseRegValid = !pExitInstrInfo->InvVmxXsaves.fBaseRegInvalid;
-    uint8_t const   iBaseReg      =  pExitInstrInfo->InvVmxXsaves.iBaseReg;
-    bool const      fIsMemOperand = !pExitInstrInfo->InvVmxXsaves.fIsRegOperand;
+    uint8_t const   uAddrSize     =  pExitInstrInfo->All.u3AddrSize;
+    uint8_t const   iSegReg       =  pExitInstrInfo->All.iSegReg;
+    bool const      fIdxRegValid  = !pExitInstrInfo->All.fIdxRegInvalid;
+    uint8_t const   iIdxReg       =  pExitInstrInfo->All.iIdxReg;
+    uint8_t const   uScale        =  pExitInstrInfo->All.u2Scaling;
+    bool const      fBaseRegValid = !pExitInstrInfo->All.fBaseRegInvalid;
+    uint8_t const   iBaseReg      =  pExitInstrInfo->All.iBaseReg;
+    bool const      fIsMemOperand = !pExitInstrInfo->All.fIsRegOperand;
     bool const      fIsLongMode   =  CPUMIsGuestInLongModeEx(&pVCpu->cpum.GstCtx);
 
@@ -5901 +5901 @@
      * See AMD spec. 4.5.2 "Segment Registers".
      */
-    RTGCPTR GCPtrMem  = GCPtrDisp;
+    RTGCPTR GCPtrMem = GCPtrDisp;
     if (fBaseRegValid)
         GCPtrMem += pVCpu->cpum.GstCtx.aGRegs[iBaseReg].u64;