Changeset 1505 in vbox for trunk/src/recompiler

Timestamp:

Mar 15, 2007 11:08:22 AM (18 years ago)

Author:

vboxsync

Message:

changed condition order

Location:

trunk/src/recompiler/target-i386

Files:

• helper.c (modified) (1 diff)
• op.c (modified) (1 diff)

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

@@ -1320 +1320 @@
 #ifdef VBOX
             /* int xx *, v86 code and VME enabled? */
-            if (    !is_hw
+            if (    (env->eflags & VM_MASK) 
+                &&  (env->cr[4] & CR4_VME_MASK)
                 &&  is_int
+                &&  !is_hw
                 &&  env->eip + 1 != next_eip /* single byte int 3 goes straight to the protected mode handler */
-                &&  (env->eflags & VM_MASK) 
-                &&  (env->cr[4] & CR4_VME_MASK)
                )
                 do_soft_interrupt_vme(intno, error_code, next_eip);

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

@@ -786 +786 @@
                                        | CPU_INTERRUPT_EXTERNAL_TIMER
                                        | CPU_INTERRUPT_EXTERNAL_DMA))
-        ||  (   (env->interrupt_request & CPU_INTERRUPT_EXTERNAL_HARD)
+        ||  (   (env->interrupt_request & (CPU_INTERRUPT_EXTERNAL_HARD|CPU_INTERRUPT_EXTERNAL_TIMER))
              && (env->eflags & IF_MASK)
              && !(env->hflags & HF_INHIBIT_IRQ_MASK) ) )