Changeset 36171 in vbox for trunk/src/recompiler/exec.c

Timestamp:

Mar 4, 2011 1:25:06 PM (14 years ago)

Author:

vboxsync

Message:

rem: Merged in changes from the branches/stable_0_10 (r7249).

File:

• trunk/src/recompiler/exec.c (modified) (3 diffs)

trunk/src/recompiler/exec.c

@@ -669 +669 @@
     qemu_get_be32s(f, &env->halted);
     qemu_get_be32s(f, &env->interrupt_request);
+    env->interrupt_request &= ~CPU_INTERRUPT_EXIT;
     tlb_flush(env, 1);
 
@@ -1735 +1736 @@
     int old_mask;
 
+    if (mask & CPU_INTERRUPT_EXIT) {
+        env->exit_request = 1;
+        mask &= ~CPU_INTERRUPT_EXIT;
+    }
+
     old_mask = env->interrupt_request;
 #ifdef VBOX
@@ -1753 +1759 @@
         env->icount_decr.u16.high = 0xffff;
 #ifndef CONFIG_USER_ONLY
-        /* CPU_INTERRUPT_EXIT isn't a real interrupt.  It just means
-           an async event happened and we need to process it.  */
         if (!can_do_io(env)
-            && (mask & ~(old_mask | CPU_INTERRUPT_EXIT)) != 0) {
+            && (mask & ~old_mask) != 0) {
             cpu_abort(env, "Raised interrupt while not in I/O function");
         }