Changeset 71069 in vbox for trunk/src/VBox

Timestamp:

Feb 20, 2018 10:53:58 AM (7 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested Hw.virt: Update number of bytes fetched for SVM decode assist on intercepted #PFs. Still todo/WIP when fewer
than 15 bytes are present in the opcode cache.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h

@@ -957 +957 @@
         {
             /** @todo Nested-guest SVM - figure out fetching op-code bytes from IEM. */
+            PSVMVMCBCTRL  pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
 #ifdef IEM_WITH_CODE_TLB
-            AssertReleaseFailedReturn(VERR_IEM_IPE_5);
+            uint8_t const cbCurrent   = pVCpu->iem.s.cbInstrBuf;
+            uint8_t const *pbInstrBuf = pVCpu->iem.s.pbInstrBuf;
+            if (   pbInstrBuf
+                && cbCurrent >= SVM_CTRL_GUEST_INSTR_BYTES_MAX)
+            {
+                pVmcbCtrl->cbInstrFetched = SVM_CTRL_GUEST_INSTR_BYTES_MAX;
+                memcpy(&pVmcbCtrl->abInstr[0], pbInstrBuf, SVM_CTRL_GUEST_INSTR_BYTES_MAX);
+            }
+            else
+            { AssertReleaseFailedReturn(VERR_IEM_IPE_5); /** @todo */ }
 #else
-            PSVMVMCBCTRL  pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
             uint8_t const offOpCode = pVCpu->iem.s.offOpcode;
-            uint8_t const cbCurrent = pVCpu->iem.s.cbOpcode - pVCpu->iem.s.offOpcode;
+            uint8_t const cbCurrent = pVCpu->iem.s.cbOpcode - offOpCode;
             if (cbCurrent >= SVM_CTRL_GUEST_INSTR_BYTES_MAX)
             {
-                Assert(cbCurrent <= RT_ELEMENTS(pVCpu->iem.s.abOpcode));
+                pVmcbCtrl->cbInstrFetched = SVM_CTRL_GUEST_INSTR_BYTES_MAX;
                 memcpy(&pVmcbCtrl->abInstr[0], &pVCpu->iem.s.abOpcode[offOpCode], SVM_CTRL_GUEST_INSTR_BYTES_MAX);
             }
             else
-            {
-                /** @todo fetch 15 bytes from CS:RIP and stop fetching on exceptions or CS
-                 *        limit is exceeded. */
-            }
+            { AssertReleaseFailedReturn(VERR_IEM_IPE_5); /** @todo */ }
 #endif
         }