aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-06-03 17:44:37 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2007-06-03 17:44:37 +0000
commitbfed01fc79cb2da1c6ca700bb0ce9238ce2974c7 (patch)
tree4260b2f4481ff9250eaacf143273a8c21796c5bf /target-mips/exec.h
parentAvoid compiler warning. (diff)
downloadqemu-kvm-bfed01fc79cb2da1c6ca700bb0ce9238ce2974c7.tar.gz
qemu-kvm-bfed01fc79cb2da1c6ca700bb0ce9238ce2974c7.tar.bz2
qemu-kvm-bfed01fc79cb2da1c6ca700bb0ce9238ce2974c7.zip
Clean up of some target specifics in exec.c/cpu-exec.c.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2936 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-mips/exec.h')
-rw-r--r--target-mips/exec.h27
1 files changed, 19 insertions, 8 deletions
diff --git a/target-mips/exec.h b/target-mips/exec.h
index 6d004102b..5b0c83384 100644
--- a/target-mips/exec.h
+++ b/target-mips/exec.h
@@ -56,14 +56,6 @@ register target_ulong T2 asm(AREG3);
#include "softmmu_exec.h"
#endif /* !defined(CONFIG_USER_ONLY) */
-static inline void env_to_regs(void)
-{
-}
-
-static inline void regs_to_env(void)
-{
-}
-
#ifdef TARGET_MIPS64
#if TARGET_LONG_BITS > HOST_LONG_BITS
void do_dsll (void);
@@ -240,4 +232,23 @@ FOP_PROTO(le)
FOP_PROTO(ngt)
#undef FOP_PROTO
+static inline void env_to_regs(void)
+{
+}
+
+static inline void regs_to_env(void)
+{
+}
+
+static inline int cpu_halted(CPUState *env) {
+ if (!env->halted)
+ return 0;
+ if (env->interrupt_request &
+ (CPU_INTERRUPT_HARD | CPU_INTERRUPT_TIMER)) {
+ env->halted = 0;
+ return 0;
+ }
+ return EXCP_HALTED;
+}
+
#endif /* !defined(__QEMU_MIPS_EXEC_H__) */