From f3e270377acd074f62e08960ef9444adf67d3590 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sat, 21 May 2011 12:16:05 +0000 Subject: [PATCH] exec.h: fix coding style and change cpu_has_work to return bool Before the next patch, fix coding style of the areas affected. Change the type of the return value from cpu_has_work() and qemu_cpu_has_work() to bool. Signed-off-by: Blue Swirl --- cpu-all.h | 2 +- cpu-exec.c | 2 +- target-alpha/exec.h | 2 +- target-arm/exec.h | 6 +++--- target-cris/exec.h | 4 ++-- target-i386/exec.h | 2 +- target-lm32/exec.h | 2 +- target-m68k/exec.h | 4 ++-- target-microblaze/exec.h | 4 ++-- target-mips/exec.h | 2 +- target-ppc/exec.h | 4 ++-- target-s390x/exec.h | 6 +++--- target-sh4/exec.h | 4 ++-- target-sparc/exec.h | 2 +- target-unicore32/exec.h | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index 880f570d56..e8391009a3 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -847,7 +847,7 @@ void cpu_reset_interrupt(CPUState *env, int mask); void cpu_exit(CPUState *s); -int qemu_cpu_has_work(CPUState *env); +bool qemu_cpu_has_work(CPUState *env); /* Breakpoint/watchpoint flags */ #define BP_MEM_READ 0x01 diff --git a/cpu-exec.c b/cpu-exec.c index ecd201ee73..49de9e0ad9 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -32,7 +32,7 @@ int tb_invalidated_flag; //#define CONFIG_DEBUG_EXEC -int qemu_cpu_has_work(CPUState *env) +bool qemu_cpu_has_work(CPUState *env) { return cpu_has_work(env); } diff --git a/target-alpha/exec.h b/target-alpha/exec.h index 7a325e7a75..0f9b827015 100644 --- a/target-alpha/exec.h +++ b/target-alpha/exec.h @@ -37,7 +37,7 @@ register struct CPUAlphaState *env asm(AREG0); #include "softmmu_exec.h" #endif /* !defined(CONFIG_USER_ONLY) */ -static inline int cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUState *env) { /* Here we are checking to see if the CPU should wake up from HALT. We will have gotten into this state only for WTINT from PALmode. */ diff --git a/target-arm/exec.h b/target-arm/exec.h index db6608ec8b..9c31418a14 100644 --- a/target-arm/exec.h +++ b/target-arm/exec.h @@ -24,10 +24,10 @@ register struct CPUARMState *env asm(AREG0); #include "cpu.h" #include "exec-all.h" -static inline int cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUState *env) { - return (env->interrupt_request & - (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB)); + return env->interrupt_request & + (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB); } #if !defined(CONFIG_USER_ONLY) diff --git a/target-cris/exec.h b/target-cris/exec.h index 2d5d297e1b..70d99d184f 100644 --- a/target-cris/exec.h +++ b/target-cris/exec.h @@ -28,9 +28,9 @@ register struct CPUCRISState *env asm(AREG0); #include "softmmu_exec.h" #endif -static inline int cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUState *env) { - return (env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)); + return env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI); } static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) diff --git a/target-i386/exec.h b/target-i386/exec.h index 5dbee96496..77bb356d7d 100644 --- a/target-i386/exec.h +++ b/target-i386/exec.h @@ -160,7 +160,7 @@ static inline void load_eflags(int eflags, int update_mask) (eflags & update_mask) | 0x2; } -static inline int cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUState *env) { return ((env->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) || diff --git a/target-lm32/exec.h b/target-lm32/exec.h index 348b723f29..83ddb6587f 100644 --- a/target-lm32/exec.h +++ b/target-lm32/exec.h @@ -24,7 +24,7 @@ register struct CPULM32State *env asm(AREG0); #include "cpu.h" #include "exec-all.h" -static inline int cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUState *env) { return env->interrupt_request & CPU_INTERRUPT_HARD; } diff --git a/target-m68k/exec.h b/target-m68k/exec.h index 91daa6bac4..f7abbf4d26 100644 --- a/target-m68k/exec.h +++ b/target-m68k/exec.h @@ -28,9 +28,9 @@ register struct CPUM68KState *env asm(AREG0); #include "softmmu_exec.h" #endif -static inline int cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUState *env) { - return (env->interrupt_request & (CPU_INTERRUPT_HARD)); + return env->interrupt_request & (CPU_INTERRUPT_HARD); } static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) diff --git a/target-microblaze/exec.h b/target-microblaze/exec.h index 1efff30620..bb2b7db0b0 100644 --- a/target-microblaze/exec.h +++ b/target-microblaze/exec.h @@ -27,9 +27,9 @@ register struct CPUMBState *env asm(AREG0); #include "softmmu_exec.h" #endif -static inline int cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUState *env) { - return (env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)); + return env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI); } static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) diff --git a/target-mips/exec.h b/target-mips/exec.h index 607edf12ca..e908c3f04b 100644 --- a/target-mips/exec.h +++ b/target-mips/exec.h @@ -17,7 +17,7 @@ register struct CPUMIPSState *env asm(AREG0); #include "softmmu_exec.h" #endif /* !defined(CONFIG_USER_ONLY) */ -static inline int cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUState *env) { int has_work = 0; diff --git a/target-ppc/exec.h b/target-ppc/exec.h index f87847acb1..81c3c547f8 100644 --- a/target-ppc/exec.h +++ b/target-ppc/exec.h @@ -32,9 +32,9 @@ register struct CPUPPCState *env asm(AREG0); #include "softmmu_exec.h" #endif /* !defined(CONFIG_USER_ONLY) */ -static inline int cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUState *env) { - return (msr_ee && (env->interrupt_request & CPU_INTERRUPT_HARD)); + return msr_ee && (env->interrupt_request & CPU_INTERRUPT_HARD); } diff --git a/target-s390x/exec.h b/target-s390x/exec.h index 7a87fffca6..9ababe174f 100644 --- a/target-s390x/exec.h +++ b/target-s390x/exec.h @@ -29,10 +29,10 @@ register struct CPUS390XState *env asm(AREG0); #include "softmmu_exec.h" #endif /* !defined(CONFIG_USER_ONLY) */ -static inline int cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUState *env) { - return ((env->interrupt_request & CPU_INTERRUPT_HARD) && - (env->psw.mask & PSW_MASK_EXT)); + return (env->interrupt_request & CPU_INTERRUPT_HARD) && + (env->psw.mask & PSW_MASK_EXT); } static inline void regs_to_env(void) diff --git a/target-sh4/exec.h b/target-sh4/exec.h index 9f1c1f6a00..ff068c550e 100644 --- a/target-sh4/exec.h +++ b/target-sh4/exec.h @@ -27,9 +27,9 @@ register struct CPUSH4State *env asm(AREG0); #include "cpu.h" #include "exec-all.h" -static inline int cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUState *env) { - return (env->interrupt_request & CPU_INTERRUPT_HARD); + return env->interrupt_request & CPU_INTERRUPT_HARD; } #ifndef CONFIG_USER_ONLY diff --git a/target-sparc/exec.h b/target-sparc/exec.h index becdaf5bf3..c1ac2fd8b3 100644 --- a/target-sparc/exec.h +++ b/target-sparc/exec.h @@ -13,7 +13,7 @@ register struct CPUSPARCState *env asm(AREG0); #endif /* !defined(CONFIG_USER_ONLY) */ /* op_helper.c */ -static inline int cpu_has_work(CPUState *env1) +static inline bool cpu_has_work(CPUState *env1) { return (env1->interrupt_request & CPU_INTERRUPT_HARD) && cpu_interrupts_enabled(env1); diff --git a/target-unicore32/exec.h b/target-unicore32/exec.h index 4ab55f42cf..ce4132fc89 100644 --- a/target-unicore32/exec.h +++ b/target-unicore32/exec.h @@ -26,7 +26,7 @@ static inline void regs_to_env(void) { } -static inline int cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUState *env) { return env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB);