diff options
| author | Igor V. Kovalenko <igor.v.kovalenko@gmail.com> | 2010-01-07 23:28:26 +0300 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-01-08 17:16:45 +0000 |
| commit | 2df6c2d0de31461f18d97f8a4d122bdb003297db (patch) | |
| tree | 3f7fb084757c0288da9b33644245be2322fbcf65 | |
| parent | 709f2c1b23ceb88c78a116e9a9c22e2a4837f62a (diff) | |
sparc64: move cpu_interrupts_enabled to cpu.h
- to be used by cpu_check_irqs
Signed-off-by: Igor V. Kovalenko <igor.v.kovalenko@gmail.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | target-sparc/cpu.h | 13 | ||||
| -rw-r--r-- | target-sparc/exec.h | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 0f0e38cf2c..e5b282d391 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -564,6 +564,19 @@ static inline int cpu_mmu_index(CPUState *env1) #endif } +static inline int cpu_interrupts_enabled(CPUState *env1) +{ +#if !defined (TARGET_SPARC64) + if (env1->psret != 0) + return 1; +#else + if (env1->pstate & PS_IE) + return 1; +#endif + + return 0; +} + static inline int cpu_fpu_enabled(CPUState *env1) { #if defined(CONFIG_USER_ONLY) diff --git a/target-sparc/exec.h b/target-sparc/exec.h index e120d6fed4..3e021e93cf 100644 --- a/target-sparc/exec.h +++ b/target-sparc/exec.h @@ -24,19 +24,6 @@ static inline void regs_to_env(void) /* op_helper.c */ void do_interrupt(CPUState *env); -static inline int cpu_interrupts_enabled(CPUState *env1) -{ -#if !defined (TARGET_SPARC64) - if (env1->psret != 0) - return 1; -#else - if (env1->pstate & PS_IE) - return 1; -#endif - - return 0; -} - static inline int cpu_has_work(CPUState *env1) { return (env1->interrupt_request & CPU_INTERRUPT_HARD) && |