Changeset 1929 in vbox for trunk/src/VBox

Timestamp:

Apr 4, 2007 1:17:07 PM (18 years ago)

Author:

vboxsync

Message:

We can encounter 16 bits code in raw mode too now; always refuse to emulate such instructions

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (1 diff)
• PGMAll.cpp (modified) (2 diffs)
• PGMAllShw.h (modified) (1 diff)
• TRPMAll.cpp (modified) (1 diff)

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

@@ -1853 +1853 @@
     }
 
-    /* In HWACCM mode we can execute 16 bits code. Our emulation above can't cope with that yet. */
-    /** @note if not in HWACCM mode, then we will never execute 16 bits code, so don't bother checking. */
-    if (HWACCMIsEnabled(pVM) && !SELMIsSelector32Bit(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid))
+    /* Out emulation above can't cope with 16 bits code yet. */
+    if (!SELMIsSelector32Bit(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid))
         return VERR_EM_INTERPRETER;
 

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

@@ -32 +32 @@
 #include <VBox/stam.h>
 #include <VBox/csam.h>
+#include <VBox/patm.h>
 #include <VBox/trpm.h>
 #include <VBox/rem.h>
@@ -255 +256 @@
 PGMDECL(int)     PGMTrap0eHandler(PVM pVM, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault)
 {
-    LogFlow(("PGMTrap0eHandler: uErr=%#x pvFault=%VGv eip=%VGv\n", uErr, pvFault, pRegFrame->eip));
+    Log(("PGMTrap0eHandler: uErr=%#x pvFault=%VGv eip=%VGv\n", uErr, pvFault, pRegFrame->eip));
     STAM_PROFILE_START(&pVM->pgm.s.StatGCTrap0e, a);
     STAM_STATS({ pVM->pgm.s.CTXSUFF(pStatTrap0eAttribution) = NULL; } );

trunk/src/VBox/VMM/VMMAll/PGMAllShw.h

@@ -308 +308 @@
             {
                 pPT->a[iPTE].u = (pPT->a[iPTE].u & (fMask | SHW_PTE_PG_MASK)) | (fFlags & ~SHW_PTE_PG_MASK);
-                Assert(pPT->a[iPTE].n.u1Present);
+////                Assert(pPT->a[iPTE].n.u1Present);
                 PGM_INVL_PG(GCPtr);
             }

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

@@ -423 +423 @@
 #endif
         && !PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip)
+//testestset
+//        && iGate != 0xef
        )
     {