Changeset 880 in vbox

Timestamp:

Feb 13, 2007 4:57:25 PM (18 years ago)

Author:

vboxsync

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

18592

Message:

Added some missing SELMToFlat calls.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (1 diff)
• VMMAll/EMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -1515 +1515 @@
         &&  pCtx->eflags.Bits.u1VM == 0)
     {
+        RTGCPTR pInstrGC;
         Assert(!PATMIsPatchGCAddr(pVM, pCtx->eip));
-        CSAMR3CheckEIP(pVM, pCtx->eip, SELMIsSelector32Bit(pVM, pCtx->cs, &pCtx->csHid));
+
+        pInstrGC = SELMToFlat(pVM, pCtx->cs, &pCtx->csHid, (RTGCPTR)pCtx->eip);
+
+        CSAMR3CheckEIP(pVM, pInstrGC, SELMIsSelector32Bit(pVM, pCtx->cs, &pCtx->csHid));
     }
 

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

@@ -1689 +1689 @@
 
     Assert(pRegFrame->eflags.u32 & X86_EFL_IF);
-    Assert(pvFault == (RTGCPTR)pRegFrame->eip);
+    Assert(pvFault == SELMToFlat(pVM, pRegFrame->cs, &pRegFrame->csHid, (RTGCPTR)pRegFrame->eip));
 
     pVM->em.s.GCPtrInhibitInterrupts = pRegFrame->eip + pCpu->opsize;