summaryrefslogtreecommitdiffstats
path: root/target-cris
authorBlue Swirl <[email protected]>2011-05-21 07:10:23 (GMT)
committer Blue Swirl <[email protected]>2011-06-26 18:25:31 (GMT)
commitf081c76ccfdbc1fdaa90fa5eb6abad46c1b5bfa8 (patch) (side-by-side diff)
tree189b8a7a36be8eb52b8704c940b6ef328c18005b /target-cris
parentf3e270377acd074f62e08960ef9444adf67d3590 (diff)
downloadqemu-kvm-f081c76ccfdbc1fdaa90fa5eb6abad46c1b5bfa8.zip
qemu-kvm-f081c76ccfdbc1fdaa90fa5eb6abad46c1b5bfa8.tar.gz
qemu-kvm-f081c76ccfdbc1fdaa90fa5eb6abad46c1b5bfa8.tar.bz2
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 <[email protected]>
Diffstat (limited to 'target-cris') (more/less context) (ignore whitespace changes)
-rw-r--r--target-cris/cpu.h11
-rw-r--r--target-cris/exec.h11
2 files changed, 11 insertions, 11 deletions
diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index 2bc35e4..ecb0df1 100644
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -268,4 +268,15 @@ static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc,
#define cpu_list cris_cpu_list
void cris_cpu_list(FILE *f, fprintf_function cpu_fprintf);
+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->pc = tb->pc;
+}
#endif
diff --git a/target-cris/exec.h b/target-cris/exec.h
index 70d99d1..9838159 100644
--- a/target-cris/exec.h
+++ b/target-cris/exec.h
@@ -27,14 +27,3 @@ register struct CPUCRISState *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->pc = tb->pc;
-}
-