Changeset 68906 in vbox

Timestamp:

Sep 28, 2017 12:24:51 PM (7 years ago)

Author:

vboxsync

Message:

VMM/IEM/IEMAllCImplSvmInstr.cpp.h: Fix swapped DR6, DR7 on SVM #VMEXIT handler.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h (modified) (4 diffs)

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

@@ -60 +60 @@
 DECLINLINE(VBOXSTRICTRC) iemSvmWorldSwitch(PVMCPU pVCpu, PCPUMCTX pCtx)
 {
-    /* Flush the TLB with new CR3. */
+    /*
+     * Flush the TLB with new CR3. This is required in case the PGM mode change
+     * below doesn't actually change anything.
+     */
     PGMFlushTLB(pVCpu, pCtx->cr3, true);
 
@@ -137 +140 @@
         pVmcbNstGstState->u64RSP        = pCtx->rsp;
         pVmcbNstGstState->u64RAX        = pCtx->rax;
-        pVmcbNstGstState->u64DR7        = pCtx->dr[6];
-        pVmcbNstGstState->u64DR6        = pCtx->dr[7];
+        pVmcbNstGstState->u64DR7        = pCtx->dr[7];
+        pVmcbNstGstState->u64DR6        = pCtx->dr[6];
         pVmcbNstGstState->u8CPL         = pCtx->ss.Attr.n.u2Dpl;   /* See comment in CPUMGetGuestCPL(). */
         Assert(CPUMGetGuestCPL(pVCpu) == pCtx->ss.Attr.n.u2Dpl);
@@ -533 +536 @@
         pCtx->idtr.cbIdt = pVmcbNstGst->IDTR.u32Limit;
         pCtx->idtr.pIdt  = pVmcbNstGst->IDTR.u64Base;
-        pCtx->cr0        = pVmcbNstGst->u64CR0;   /** @todo What about informing PGM about CR0.WP? */
-        pCtx->cr4        = pVmcbNstGst->u64CR4;
+        CPUMSetGuestCR0(pVCpu, pVmcbNstGst->u64CR0);
+        CPUMSetGuestCR4(pVCpu, pVmcbNstGst->u64CR4);
         pCtx->cr3        = pVmcbNstGst->u64CR3;
         pCtx->cr2        = pVmcbNstGst->u64CR2;
@@ -624 +627 @@
              *        below. */
             LogFlow(("iemSvmVmrun: Injecting event: %04x:%08RX64 uVector=%#x enmType=%d uErrorCode=%u cr2=%#RX64\n",
-                     pCtx->cs.Sel, pCtx->rip, uVector, enmType,uErrorCode, pCtx->cr2));
+                     pCtx->cs.Sel, pCtx->rip, uVector, enmType, uErrorCode, pCtx->cr2));
             rcStrict = IEMInjectTrap(pVCpu, uVector, enmType, uErrorCode, pCtx->cr2, 0 /* cbInstr */);
         }