diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-05-21 07:10:23 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-06-26 18:25:31 +0000 |
| commit | f081c76ccfdbc1fdaa90fa5eb6abad46c1b5bfa8 (patch) | |
| tree | 189b8a7a36be8eb52b8704c940b6ef328c18005b /target-s390x | |
| parent | f3e270377acd074f62e08960ef9444adf67d3590 (diff) | |
Move cpu_has_work and cpu_pc_from_tb to cpu.h
Move functions cpu_has_work() and cpu_pc_from_tb() from exec.h to cpu.h. This is
needed by later patches.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/cpu.h | 11 | ||||
| -rw-r--r-- | target-s390x/exec.h | 12 |
2 files changed, 11 insertions, 12 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index b5e587fbe6..d48a9b7a0c 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -962,4 +962,15 @@ static inline void cpu_inject_ext(CPUState *env, uint32_t code, uint32_t param, cpu_interrupt(env, CPU_INTERRUPT_HARD); } +static inline bool cpu_has_work(CPUState *env) +{ + return (env->interrupt_request & CPU_INTERRUPT_HARD) && + (env->psw.mask & PSW_MASK_EXT); +} + +static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock* tb) +{ + env->psw.addr = tb->pc; +} + #endif diff --git a/target-s390x/exec.h b/target-s390x/exec.h index 9ababe174f..d40640b675 100644 --- a/target-s390x/exec.h +++ b/target-s390x/exec.h @@ -29,12 +29,6 @@ register struct CPUS390XState *env asm(AREG0); #include "softmmu_exec.h" #endif /* !defined(CONFIG_USER_ONLY) */ -static inline bool cpu_has_work(CPUState *env) -{ - return (env->interrupt_request & CPU_INTERRUPT_HARD) && - (env->psw.mask & PSW_MASK_EXT); -} - static inline void regs_to_env(void) { } @@ -42,9 +36,3 @@ static inline void regs_to_env(void) static inline void env_to_regs(void) { } - -static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock* tb) -{ - env->psw.addr = tb->pc; -} - |