Changeset 1136 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 1, 2007 5:17:09 PM (18 years ago)

Author:

vboxsync

Message:

EMInterpretIret changes & fixes

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -1286 +1286 @@
 {
     RTGCUINTPTR pIretStack = (RTGCUINTPTR)pRegFrame->esp;
-    RTGCUINTPTR eip, cs, esp, ss, eflags, ds, es, fs, gs;
+    RTGCUINTPTR eip, cs, esp, ss, eflags, ds, es, fs, gs, uMask;
     int         rc;
 
@@ -1303 +1303 @@
     AssertRCReturn(rc, VERR_EM_INTERPRETER);
 
-    pRegFrame->eip = eip;
+    pRegFrame->eip = eip & 0xffff;
     pRegFrame->cs  = cs;
     
+    uMask = X86_EFL_TF|X86_EFL_AC|X86_EFL_ID|X86_EFL_VM|X86_EFL_IF|X86_EFL_IOPL|X86_EFL_NT|X86_EFL_VIF|X86_EFL_VIP;
+
+    eflags =    (pRegFrame->eflags.u32 & ~uMask)
+            |   (eflags & uMask);
+
 #ifndef IN_RING0
     CPUMRawSetEFlags(pVM, pRegFrame, eflags);