From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lmc0x-000216-Jc for qemu-devel@nongnu.org; Wed, 25 Mar 2009 18:56:03 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lmc0r-0001s3-Nh for qemu-devel@nongnu.org; Wed, 25 Mar 2009 18:56:01 -0400 Received: from [199.232.76.173] (port=49784 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lmc0r-0001rm-2p for qemu-devel@nongnu.org; Wed, 25 Mar 2009 18:55:57 -0400 Received: from mx2.redhat.com ([66.187.237.31]:51069) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Lmc0q-0006HM-C5 for qemu-devel@nongnu.org; Wed, 25 Mar 2009 18:55:56 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n2PMttV1032358 for ; Wed, 25 Mar 2009 18:55:55 -0400 Message-Id: <20090325225438.910911510@amt.cnet> Date: Wed, 25 Mar 2009 19:47:17 -0300 From: Marcelo Tosatti References: <20090325224714.853788328@amt.cnet> Content-Disposition: inline; filename=qemu-arch-has-work Subject: [Qemu-devel] [patch 03/10] qemu: per-arch cpu_has_work Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti Signed-off-by: Marcelo Tosatti Index: trunk/target-alpha/exec.h =================================================================== --- trunk.orig/target-alpha/exec.h +++ trunk/target-alpha/exec.h @@ -48,10 +48,15 @@ static always_inline void regs_to_env(vo { } +static always_inline int cpu_has_work(CPUState *env) +{ + return (env->interrupt_request & CPU_INTERRUPT_HARD); +} + static always_inline int cpu_halted(CPUState *env) { if (!env->halted) return 0; - if (env->interrupt_request & CPU_INTERRUPT_HARD) { + if (cpu_has_work(env)) { env->halted = 0; return 0; } Index: trunk/target-i386/exec.h =================================================================== --- trunk.orig/target-i386/exec.h +++ trunk/target-i386/exec.h @@ -338,14 +338,23 @@ static inline void regs_to_env(void) #endif } +static inline int cpu_has_work(CPUState *env) +{ + int work; + + work = (env->interrupt_request & CPU_INTERRUPT_HARD) && + (env->eflags & IF_MASK); + work |= env->interrupt_request & CPU_INTERRUPT_NMI; + + return work; +} + static inline int cpu_halted(CPUState *env) { /* handle exit of HALTED state */ if (!env->halted) return 0; /* disable halt condition */ - if (((env->interrupt_request & CPU_INTERRUPT_HARD) && - (env->eflags & IF_MASK)) || - (env->interrupt_request & CPU_INTERRUPT_NMI)) { + if (cpu_has_work(env)) { env->halted = 0; return 0; } Index: trunk/cpu-all.h =================================================================== --- trunk.orig/cpu-all.h +++ trunk/cpu-all.h @@ -775,6 +775,8 @@ void cpu_reset_interrupt(CPUState *env, void cpu_exit(CPUState *s); +int qemu_cpu_has_work(CPUState *env); + /* Breakpoint/watchpoint flags */ #define BP_MEM_READ 0x01 #define BP_MEM_WRITE 0x02 Index: trunk/cpu-exec.c =================================================================== --- trunk.orig/cpu-exec.c +++ trunk/cpu-exec.c @@ -50,6 +50,11 @@ int tb_invalidated_flag; //#define DEBUG_EXEC //#define DEBUG_SIGNAL +int qemu_cpu_has_work(CPUState *env) +{ + return cpu_has_work(env); +} + void cpu_loop_exit(void) { /* NOTE: the register at this point must be saved by hand because Index: trunk/target-arm/exec.h =================================================================== --- trunk.orig/target-arm/exec.h +++ trunk/target-arm/exec.h @@ -37,14 +37,19 @@ static inline void regs_to_env(void) { } +static inline int cpu_has_work(CPUState *env) +{ + return (env->interrupt_request & + (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB)); +} + static inline int cpu_halted(CPUState *env) { if (!env->halted) return 0; /* An interrupt wakes the CPU even if the I and F CPSR bits are set. We use EXITTB to silently wake CPU without causing an actual interrupt. */ - if (env->interrupt_request & - (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB)) { + if (cpu_has_work(env)) { env->halted = 0; return 0; } Index: trunk/target-cris/exec.h =================================================================== --- trunk.orig/target-cris/exec.h +++ trunk/target-cris/exec.h @@ -40,6 +40,11 @@ static inline void regs_to_env(void) void cpu_cris_flush_flags(CPUCRISState *env, int cc_op); void helper_movec(CPUCRISState *env, int reg, uint32_t val); +static inline int cpu_has_work(CPUState *env) +{ + return (env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)); +} + static inline int cpu_halted(CPUState *env) { if (!env->halted) return 0; Index: trunk/target-m68k/exec.h =================================================================== --- trunk.orig/target-m68k/exec.h +++ trunk/target-m68k/exec.h @@ -41,10 +41,15 @@ static inline void regs_to_env(void) #include "softmmu_exec.h" #endif +static inline int cpu_has_work(CPUState *env) +{ + return (env->interrupt_request & (CPU_INTERRUPT_HARD)); +} + static inline int cpu_halted(CPUState *env) { if (!env->halted) return 0; - if (env->interrupt_request & CPU_INTERRUPT_HARD) { + if (cpu_has_work(env)) { env->halted = 0; return 0; } Index: trunk/target-mips/exec.h =================================================================== --- trunk.orig/target-mips/exec.h +++ trunk/target-mips/exec.h @@ -33,12 +33,18 @@ static inline void regs_to_env(void) { } +static inline int cpu_has_work(CPUState *env) +{ + return (env->interrupt_request & + (CPU_INTERRUPT_HARD | CPU_INTERRUPT_TIMER)); +} + + static inline int cpu_halted(CPUState *env) { if (!env->halted) return 0; - if (env->interrupt_request & - (CPU_INTERRUPT_HARD | CPU_INTERRUPT_TIMER)) { + if (cpu_has_work(env)) { env->halted = 0; return 0; } Index: trunk/target-ppc/exec.h =================================================================== --- trunk.orig/target-ppc/exec.h +++ trunk/target-ppc/exec.h @@ -44,11 +44,17 @@ static always_inline void regs_to_env (v { } +static always_inline int cpu_has_work(CPUState *env) +{ + return (msr_ee && (env->interrupt_request & CPU_INTERRUPT_HARD)); +} + + static always_inline int cpu_halted (CPUState *env) { if (!env->halted) return 0; - if (msr_ee && (env->interrupt_request & CPU_INTERRUPT_HARD)) { + if (cpu_has_work(env)) { env->halted = 0; return 0; } Index: trunk/target-sh4/exec.h =================================================================== --- trunk.orig/target-sh4/exec.h +++ trunk/target-sh4/exec.h @@ -28,10 +28,15 @@ register struct CPUSH4State *env asm(ARE #include "cpu.h" #include "exec-all.h" +static inline int cpu_has_work(CPUState *env) +{ + return (env->interrupt_request & CPU_INTERRUPT_HARD); +} + static inline int cpu_halted(CPUState *env) { if (!env->halted) return 0; - if (env->interrupt_request & CPU_INTERRUPT_HARD) { + if (cpu_has_work(env)) { env->halted = 0; env->intr_at_halt = 1; return 0; Index: trunk/target-sparc/exec.h =================================================================== --- trunk.orig/target-sparc/exec.h +++ trunk/target-sparc/exec.h @@ -24,10 +24,17 @@ static inline void regs_to_env(void) /* op_helper.c */ void do_interrupt(CPUState *env); +static inline int cpu_has_work(CPUState *env) +{ + return (env->interrupt_request & CPU_INTERRUPT_HARD) && + (env->psret != 0); +} + + static inline int cpu_halted(CPUState *env1) { if (!env1->halted) return 0; - if ((env1->interrupt_request & CPU_INTERRUPT_HARD) && (env1->psret != 0)) { + if (cpu_has_work(env)) { env1->halted = 0; return 0; }