[Qemu-devel] [4462] Always process real timers regardless of singlestep mode ( Jason Wessel).

[Edgar E. Iglesias]

Revision: 4462
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4462
Author:   edgar_igl
Date:     2008-05-15 19:54:00 +0000 (Thu, 15 May 2008)

Log Message:
-----------
Always process real timers regardless of singlestep mode (Jason Wessel).

Modified Paths:
--------------
    trunk/cpu-exec.c
    trunk/vl.c

Modified: trunk/cpu-exec.c
===================================================================
--- trunk/cpu-exec.c    2008-05-15 19:44:09 UTC (rev 4461)
+++ trunk/cpu-exec.c    2008-05-15 19:54:00 UTC (rev 4462)
@@ -420,7 +420,7 @@
 #if defined(TARGET_I386)
                        && env->hflags & HF_GIF_MASK
 #endif
-            && !(env->singlestep_enabled & SSTEP_NOIRQ)) {
+            && likely(!(env->singlestep_enabled & SSTEP_NOIRQ))) {
                     if (interrupt_request & CPU_INTERRUPT_DEBUG) {
                         env->interrupt_request &= ~CPU_INTERRUPT_DEBUG;
                         env->exception_index = EXCP_DEBUG;

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2008-05-15 19:44:09 UTC (rev 4461)
+++ trunk/vl.c  2008-05-15 19:54:00 UTC (rev 4462)
@@ -7032,7 +7032,7 @@
     qemu_aio_poll();
 
     if (vm_running) {
-        if (!(cur_cpu->singlestep_enabled & SSTEP_NOTIMER))
+        if (likely(!(cur_cpu->singlestep_enabled & SSTEP_NOTIMER)))
         qemu_run_timers(&active_timers[QEMU_TIMER_VIRTUAL],
                         qemu_get_clock(vm_clock));
         /* run dma transfers, if any */
@@ -7040,7 +7040,6 @@
     }
 
     /* real time timers */
-    if (!(cur_cpu->singlestep_enabled & SSTEP_NOTIMER))
     qemu_run_timers(&active_timers[QEMU_TIMER_REALTIME],
                     qemu_get_clock(rt_clock));