Changeset 71048 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Feb 19, 2018 9:21:43 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120911

Message:

VMM/IEM: Nested Hw.virt: Fix decode-assist fetching 15 bytes for SVM intercepted page-faults. Still a couple of todos left.

File:

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

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

@@ -963 +963 @@
             uint8_t const offOpCode = pVCpu->iem.s.offOpcode;
             uint8_t const cbCurrent = pVCpu->iem.s.cbOpcode - pVCpu->iem.s.offOpcode;
-            if (   cbCurrent > 0
-                && cbCurrent < sizeof(pVmcbCtrl->abInstr))
+            if (cbCurrent >= SVM_CTRL_GUEST_INSTR_BYTES_MAX)
             {
-                Assert(cbCurrent <= sizeof(pVCpu->iem.s.abOpcode));
-                memcpy(&pVmcbCtrl->abInstr[0], &pVCpu->iem.s.abOpcode[offOpCode], cbCurrent);
+                Assert(cbCurrent <= RT_ELEMENTS(pVCpu->iem.s.abOpcode));
+                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. */
             }
 #endif