Changeset 36171 in vbox for trunk/src/recompiler

Timestamp:

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

Author:

vboxsync

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

70362

Message:

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

Location:

trunk/src/recompiler

Files:

• cpu-defs.h (modified) (1 diff)
• cpu-exec.c (modified) (6 diffs)
• exec.c (modified) (3 diffs)
• osdep.h (modified) (1 diff)
• target-i386/helper.c (modified) (1 diff)
• target-i386/op_helper.c (modified) (1 diff)
• target-i386/translate.c (modified) (1 diff)

trunk/src/recompiler/cpu-defs.h

@@ -187 +187 @@
     uint32_t halted; /* Nonzero if the CPU is in suspend state */       \
     uint32_t interrupt_request;                                         \
+    volatile /*sig_atomic_t - vbox*/ int32_t exit_request;                                 \
     /* The meaning of the MMU modes is defined in the target code. */   \
     CPUTLBEntry tlb_table[NB_MMU_MODES][CPU_TLB_SIZE];                  \

trunk/src/recompiler/cpu-exec.c

@@ -404 +404 @@
                     }
                 }
+                if (unlikely(env->exit_request)) {
+                    env->exit_request = 0;
+                    env->exception_index = EXCP_INTERRUPT;
+                    cpu_loop_exit();
+                }
 
                 /*
@@ -451 +456 @@
                    infinite loop and becomes env->current_tb. Avoid
                    starting execution if there is a pending interrupt. */
-                if (unlikely (env->interrupt_request & CPU_INTERRUPT_EXIT))
+                if (unlikely (env->exit_request))
                     env->current_tb = NULL;
 
@@ -639 +644 @@
             }
 #ifdef USE_KQEMU
-            if (kqemu_is_ok(env) && env->interrupt_request == 0) {
+            if (kqemu_is_ok(env) && env->interrupt_request == 0 && env->exit_request == 0) {
                 int ret;
                 env->eflags = env->eflags | helper_cc_compute_all(CC_OP) | (DF & DF_MASK);
@@ -654 +659 @@
                     /* softmmu execution needed */
                 } else {
-                    if (env->interrupt_request != 0) {
+                    if (env->interrupt_request != 0 || env->exit_request != 0) {
                         /* hardware interrupt will be executed just after */
                     } else {
@@ -853 +858 @@
                         next_tb = 0;
                     }
-                    if (interrupt_request & CPU_INTERRUPT_EXIT) {
-                        env->interrupt_request &= ~CPU_INTERRUPT_EXIT;
-                        env->exception_index = EXCP_INTERRUPT;
-                        cpu_loop_exit();
-                    }
+                }
+                if (unlikely(env->exit_request)) {
+                    env->exit_request = 0;
+                    env->exception_index = EXCP_INTERRUPT;
+                    cpu_loop_exit();
                 }
 #ifdef DEBUG_EXEC
@@ -927 +932 @@
                    infinite loop and becomes env->current_tb. Avoid
                    starting execution if there is a pending interrupt. */
-                if (unlikely (env->interrupt_request & CPU_INTERRUPT_EXIT))
+                if (unlikely (env->exit_request))
                     env->current_tb = NULL;
 

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");
         }

trunk/src/recompiler/osdep.h

@@ -71 +71 @@
 #include <sys/types.h>
 #include <sys/signal.h>
+#endif
+
+#ifndef _WIN32
+#include <sys/time.h>
 #endif
 

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

@@ -1455 +1455 @@
     asm volatile("pusha \n\t"
                  "cpuid \n\t"
-                 "mov %%eax, 0(%1) \n\t"
-                 "mov %%ebx, 4(%1) \n\t"
-                 "mov %%ecx, 8(%1) \n\t"
-                 "mov %%edx, 12(%1) \n\t"
+                 "mov %%eax, 0(%2) \n\t"
+                 "mov %%ebx, 4(%2) \n\t"
+                 "mov %%ecx, 8(%2) \n\t"
+                 "mov %%edx, 12(%2) \n\t"
                  "popa"
                  : : "a"(function), "c"(count), "S"(vec)

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

@@ -3835 +3835 @@
     selector = selector1 & 0xffff;
     eflags = helper_cc_compute_all(CC_OP);
+    if ((selector & 0xfffc) == 0)
+        goto fail;
     if (load_segment(&e1, &e2, selector) != 0)
         goto fail;

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

@@ -2825 +2825 @@
         gen_helper_debug();
     } else if (s->tf) {
-        gen_helper_single_step();
+        gen_helper_single_step();
     } else {
         tcg_gen_exit_tb(0);