vbox的更動 58535 路徑 trunk/src/recompiler

時間撮記:

2015-10-30 下午01:51:27 (9 年 以前)

作者:

vboxsync

訊息:

REMR3EmulateInstruction: Corrected assertion.

檔案:

• trunk/src/recompiler/VBoxRecompiler.c (修改) (2 筆差異)

trunk/src/recompiler/VBoxRecompiler.c

@@ -796 +796 @@
      */
     interrupt_request = pVM->rem.s.Env.interrupt_request;
-    Assert(!(interrupt_request & ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB | CPU_INTERRUPT_TIMER  | CPU_INTERRUPT_EXTERNAL_HARD | CPU_INTERRUPT_EXTERNAL_EXIT | CPU_INTERRUPT_EXTERNAL_FLUSH_TLB | CPU_INTERRUPT_EXTERNAL_TIMER)));
+    Assert(!(interrupt_request & ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB | CPU_INTERRUPT_TIMER | CPU_INTERRUPT_EXTERNAL_HARD | CPU_INTERRUPT_EXTERNAL_EXIT | CPU_INTERRUPT_EXTERNAL_FLUSH_TLB | CPU_INTERRUPT_EXTERNAL_TIMER)));
     pVM->rem.s.Env.interrupt_request = 0;
     cpu_single_step(&pVM->rem.s.Env, 1);
@@ -936 +936 @@
     {
         int interrupt_request = pVM->rem.s.Env.interrupt_request;
-        Assert(!(interrupt_request & ~(CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB | CPU_INTERRUPT_TIMER | CPU_INTERRUPT_EXTERNAL_HARD | CPU_INTERRUPT_EXTERNAL_EXIT | CPU_INTERRUPT_EXTERNAL_FLUSH_TLB | CPU_INTERRUPT_EXTERNAL_TIMER)));
+        /* Ignore CPU_INTERRUPT_HARD as it only reflects FF. */
+        /* Ignore CPU_INTERRUPT_TIMER as it doesn't seem to be set anywhere anymore and would reflect a FF. */
+        /* Ignore CPU_INTERRUPT_EXTERNAL_HARD as it is subject to races and reflects a FF. */
+        /* Ignore CPU_INTERRUPT_EXTERNAL_TIMER as it is subject to races and reflects a FF. */
+        /* Ignore CPU_INTERRUPT_EXTERNAL_EXIT as it is subject to races and reflects one or more FFs. */
+        Assert(!(interrupt_request & ~(/*CPU_INTERRUPT_HARD |*/ CPU_INTERRUPT_EXITTB /*| CPU_INTERRUPT_TIMER | CPU_INTERRUPT_EXTERNAL_HARD | CPU_INTERRUPT_EXTERNAL_EXIT*/ | CPU_INTERRUPT_EXTERNAL_FLUSH_TLB /*| CPU_INTERRUPT_EXTERNAL_TIMER*/)));
 #ifdef REM_USE_QEMU_SINGLE_STEP_FOR_LOGGING
         cpu_single_step(&pVM->rem.s.Env, 0);