Changeset 9385 in vbox for trunk/src

Timestamp:

Jun 4, 2008 12:37:23 PM (17 years ago)

Author:

vboxsync

Message:

Backed out some of the changes. Broke VT-x

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (3 diffs)
• HWVMXR0.cpp (modified) (2 diffs)

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

@@ -675 +675 @@
 
     /* EIP, ESP and EFLAGS */
-    pVMCB->guest.u64RIP    = pCtx->rip;
-    pVMCB->guest.u64RSP    = pCtx->rsp;
-    pVMCB->guest.u64RFlags = pCtx->rflags.u64;
+    pVMCB->guest.u64RIP    = pCtx->eip;
+    pVMCB->guest.u64RSP    = pCtx->esp;
+    pVMCB->guest.u64RFlags = pCtx->eflags.u32;
 
     /* Set CPL */
@@ -683 +683 @@
 
     /* RAX/EAX too, as VMRUN uses RAX as an implicit parameter. */
-    pVMCB->guest.u64RAX    = pCtx->rax;
+    pVMCB->guest.u64RAX    = pCtx->eax;
 
     /* vmrun will fail without MSR_K6_EFER_SVME. */
@@ -1035 +1035 @@
 
     /* Let's first sync back eip, esp, and eflags. */
-    pCtx->rip        = pVMCB->guest.u64RIP;
-    pCtx->rsp        = pVMCB->guest.u64RSP;
-    pCtx->rflags.u64 = pVMCB->guest.u64RFlags;
+    pCtx->eip        = pVMCB->guest.u64RIP;
+    pCtx->esp        = pVMCB->guest.u64RSP;
+    pCtx->eflags.u32 = pVMCB->guest.u64RFlags;
     /* eax is saved/restore across the vmrun instruction */
-    pCtx->rax        = pVMCB->guest.u64RAX;
+    pCtx->eax        = pVMCB->guest.u64RAX;
 
     /* Guest CPU context: ES, CS, SS, DS, FS, GS. */

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

@@ -899 +899 @@
 
     /* EIP, ESP and EFLAGS */
-    rc  = VMXWriteVMCS(VMX_VMCS_GUEST_RIP,              pCtx->rip);
-    rc |= VMXWriteVMCS(VMX_VMCS_GUEST_RSP,              pCtx->rsp);
+    rc  = VMXWriteVMCS(VMX_VMCS_GUEST_RIP,              pCtx->eip);
+    rc |= VMXWriteVMCS(VMX_VMCS_GUEST_RSP,              pCtx->esp);
     AssertRC(rc);
 
@@ -1353 +1353 @@
     rc = VMXReadVMCS(VMX_VMCS_GUEST_RIP,              &val);
     AssertRC(rc);
-    pCtx->rip               = val;
+    pCtx->eip               = val;
     rc = VMXReadVMCS(VMX_VMCS_GUEST_RSP,              &val);
     AssertRC(rc);
-    pCtx->rsp               = val;
+    pCtx->esp               = val;
     rc = VMXReadVMCS(VMX_VMCS_GUEST_RFLAGS,           &val);
     AssertRC(rc);
-    pCtx->rflags.u64        = val;
+    pCtx->eflags.u32        = val;
 
     /* Real mode emulation using v86 mode with CR4.VME (interrupt redirection using the int bitmap in the TSS) */