Changeset 3023 in vbox for trunk

Timestamp:

Jun 4, 2007 12:42:50 PM (18 years ago)

Author:

vboxsync

Message:

only check for excessive faults when in protected mode

Location:

trunk/src/recompiler

Files:

• VBoxRecompiler.c (modified) (1 diff)
• cpu-exec.c (modified) (1 diff)
• target-i386/helper.c (modified) (1 diff)

trunk/src/recompiler/VBoxRecompiler.c

@@ -1595 +1595 @@
 #endif
     Log(("remR3NotifyTrap: uTrap=%x error=%x next_eip=%VGv eip=%VGv cr2=%08x\n", uTrap, uErrorCode, pvNextEIP, env->eip, env->cr[2]));
-    if(uTrap < 0x20)
+    if(   uTrap < 0x20
+       && (env->cr[0] & X86_CR0_PE))
     {
 #ifdef DEBUG
         remR3DisasInstr(env, 1, "remR3NotifyTrap: ");
 #endif
-        if(pVM->rem.s.uPendingException == uTrap && ++pVM->rem.s.cPendingExceptions > 128)
+        if(pVM->rem.s.uPendingException == uTrap && ++pVM->rem.s.cPendingExceptions > 512)
         {
             LogRel(("VERR_REM_TOO_MANY_TRAPS -> uTrap=%x error=%x next_eip=%VGv eip=%VGv cr2=%08x\n", uTrap, uErrorCode, pvNextEIP, env->eip, env->cr[2]));

trunk/src/recompiler/cpu-exec.c

@@ -511 +511 @@
                 }
 #endif /* !DEBUG_bird */
+//{
+//static int blaat = 0;
+
+//if (env->eip == 0xc03f3c27 && ++blaat == 2)
+//    env->state |= CPU_EMULATE_SINGLE_STEP;
+//}
                 if(env->state & CPU_EMULATE_SINGLE_STEP)
                 {
 #ifdef DEBUG_bird
                     static int s_cTimes = 0;
-                    if (s_cTimes++ > 1000000)
+                    if (s_cTimes++ > 10000)
                     {
                         RTLogPrintf("Enough stepping!\n");

trunk/src/recompiler/target-i386/helper.c

@@ -4270 +4270 @@
     env = env1;
 
-    if (env->eflags & X86_EFL_VM)
+    if (    env->eflags & X86_EFL_VM
+        ||  !(env->cr[0] & X86_CR0_PE))
     {
         load_seg_vm(seg_reg, selector);