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-microblaze | |
| 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-microblaze')
| -rw-r--r-- | target-microblaze/cpu.h | 13 | ||||
| -rw-r--r-- | target-microblaze/exec.h | 11 |
2 files changed, 13 insertions, 11 deletions
diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index 78fe14ff35..51a13e38d1 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -350,4 +350,17 @@ static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc, void do_unassigned_access(target_phys_addr_t addr, int is_write, int is_exec, int is_asi, int size); #endif + +static inline bool cpu_has_work(CPUState *env) +{ + return env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI); +} + +#include "exec-all.h" + +static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +{ + env->sregs[SR_PC] = tb->pc; +} + #endif diff --git a/target-microblaze/exec.h b/target-microblaze/exec.h index bb2b7db0b0..b7f85cf3af 100644 --- a/target-microblaze/exec.h +++ b/target-microblaze/exec.h @@ -26,14 +26,3 @@ register struct CPUMBState *env asm(AREG0); #if !defined(CONFIG_USER_ONLY) #include "softmmu_exec.h" #endif - -static inline bool cpu_has_work(CPUState *env) -{ - return env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI); -} - -static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) -{ - env->sregs[SR_PC] = tb->pc; -} - |