Changeset 17923 in vbox for trunk/src/VBox

Timestamp:

Mar 16, 2009 12:16:58 PM (16 years ago)

Author:

vboxsync

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

44486

Message:

Fixed pushf/popf emulation (VT-x, real-mode)

File:

• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (4 diffs)

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

@@ -2588 +2588 @@
 
                         cbParm  = (Cpu.prefix & PREFIX_OPSIZE) ? 4 : 2;
-                        uMask   = (Cpu.prefix & PREFIX_ADDRSIZE) ? 0xffffffff : 0xffff;
+                        uMask   = (Cpu.prefix & PREFIX_OPSIZE) ? 0xffffffff : 0xffff;
 
                         rc = SELMToFlatEx(pVM, DIS_SELREG_SS, CPUMCTX2CORE(pCtx), pCtx->esp & uMask, 0, &GCPtrStack);
@@ -2596 +2596 @@
                             break;
                         }
+                        eflags.u = 0;
 #ifdef VBOX_WITH_NEW_PHYS_CODE
-                        eflags.u = 0;
                         rc = PGMPhysRead(pVM, (RTGCPHYS)GCPtrStack, &eflags.u, cbParm);
                         if (RT_FAILURE(rc))
@@ -2607 +2607 @@
                         PGMPhysRead(pVM, (RTGCPHYS)GCPtrStack, &eflags.u, cbParm);
 #endif
-                        LogFlow(("POPF %x -> %RGv\n", eflags.u, pCtx->rsp));
+                        LogFlow(("POPF %x -> %RGv mask=%x\n", eflags.u, pCtx->rsp, uMask));
                         pCtx->eflags.u = (pCtx->eflags.u & ~(X86_EFL_POPF_BITS & uMask)) | (eflags.u & X86_EFL_POPF_BITS & uMask);
                         /* RF cleared when popped in real mode; see pushf description in AMD manual. */
@@ -2626 +2626 @@
 
                         cbParm  = (Cpu.prefix & PREFIX_OPSIZE) ? 4 : 2;
-                        uMask   = (Cpu.prefix & PREFIX_ADDRSIZE) ? 0xffffffff : 0xffff;
+                        uMask   = (Cpu.prefix & PREFIX_OPSIZE) ? 0xffffffff : 0xffff;
 
                         rc = SELMToFlatEx(pVM, DIS_SELREG_SS, CPUMCTX2CORE(pCtx), (pCtx->esp - cbParm) & uMask, 0, &GCPtrStack);