summary refs log tree commit diff stats
path: root/cpu-exec.c
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2011-05-04 13:34:25 -0700
committerBlue Swirl <blauwirbel@gmail.com>2011-05-08 16:55:23 +0000
commit3125f76335f54e17e2b41621184c9cda1c2b238e (patch)
tree93d5337b418df707c859de4b1ef5f4df7ed047bc /cpu-exec.c
parent9c76219eaa68e9138521a8e28ee3fff056c83fb1 (diff)
downloadfocaccia-qemu-3125f76335f54e17e2b41621184c9cda1c2b238e.tar.gz
focaccia-qemu-3125f76335f54e17e2b41621184c9cda1c2b238e.zip
irq: Introduce and use CPU_INTERRUPT_SSTEP_MASK.
This mask contains all of the bits that should be ignored while single
stepping in the debugger.  The mask contains 2 bits that are not currently
cleared, but are also never set.  The bits are included in the mask for
consistency in handling of the CPU_INTERRUPT_TGT_EXT_N bits.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'cpu-exec.c')
-rw-r--r--cpu-exec.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/cpu-exec.c b/cpu-exec.c
index 395cd8cf90..5b42b2581a 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -360,10 +360,7 @@ int cpu_exec(CPUState *env1)
                 if (unlikely(interrupt_request)) {
                     if (unlikely(env->singlestep_enabled & SSTEP_NOIRQ)) {
                         /* Mask out external interrupts for this step. */
-                        interrupt_request &= ~(CPU_INTERRUPT_HARD |
-                                               CPU_INTERRUPT_FIQ |
-                                               CPU_INTERRUPT_SMI |
-                                               CPU_INTERRUPT_NMI);
+                        interrupt_request &= ~CPU_INTERRUPT_SSTEP_MASK;
                     }
                     if (interrupt_request & CPU_INTERRUPT_DEBUG) {
                         env->interrupt_request &= ~CPU_INTERRUPT_DEBUG;