From: Richard Henderson Date: Sat, 13 Sep 2014 16:45:34 +0000 (-0700) Subject: cpu-exec: Do CPU_INTERRUPT_HALT unconditionally X-Git-Tag: v2.2.0-rc0~72 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a0fcbdf2de908e6ef910aaee778abe987e49d52;p=thirdparty%2Fqemu.git cpu-exec: Do CPU_INTERRUPT_HALT unconditionally The signal is currently checked by 10 targets, but only actually raised by Sparc and ARM. For the sake of one test-and-branch, we can handle this generic bit generically. Signed-off-by: Richard Henderson Message-id: 1410626734-3804-24-git-send-email-rth@twiddle.net Signed-off-by: Peter Maydell --- diff --git a/cpu-exec.c b/cpu-exec.c index b9774814db9..3913de020b9 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -404,17 +404,12 @@ int cpu_exec(CPUArchState *env) cpu->exception_index = EXCP_DEBUG; cpu_loop_exit(cpu); } -#if defined(TARGET_ARM) || defined(TARGET_SPARC) || defined(TARGET_MIPS) || \ - defined(TARGET_PPC) || defined(TARGET_ALPHA) || defined(TARGET_CRIS) || \ - defined(TARGET_MICROBLAZE) || defined(TARGET_LM32) || \ - defined(TARGET_UNICORE32) || defined(TARGET_TRICORE) if (interrupt_request & CPU_INTERRUPT_HALT) { cpu->interrupt_request &= ~CPU_INTERRUPT_HALT; cpu->halted = 1; cpu->exception_index = EXCP_HLT; cpu_loop_exit(cpu); } -#endif #if defined(TARGET_I386) if (interrupt_request & CPU_INTERRUPT_INIT) { cpu_svm_check_intercept_param(env, SVM_EXIT_INIT, 0);