diff options
Diffstat (limited to 'target-mips')
| -rw-r--r-- | target-mips/exec.h | 27 | ||||
| -rw-r--r-- | target-mips/op_helper.c | 4 |
2 files changed, 19 insertions, 12 deletions
diff --git a/target-mips/exec.h b/target-mips/exec.h index 6d004102bb..5b0c833848 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__) */ diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c index da28645973..c169beb55a 100644 --- a/target-mips/op_helper.c +++ b/target-mips/op_helper.c @@ -24,10 +24,6 @@ /*****************************************************************************/ /* Exceptions processing helpers */ -void cpu_loop_exit(void) -{ - longjmp(env->jmp_env, 1); -} void do_raise_exception_err (uint32_t exception, int error_code) { |