Use correct type for SPARC cpu_cc_op

[qemu] / target-sparc / exec.h

diff --git a/target-sparc/exec.h b/target-sparc/exec.h
index 2b478cb..f37c8ad 100644 (file)
--- a/target-sparc/exec.h
+++ b/target-sparc/exec.h
@@ -21,27 +21,20 @@ static inline void regs_to_env(void)
 {
 }
 
-/* helper.c */
-void cpu_lock(void);
-void cpu_unlock(void);
-int cpu_sparc_handle_mmu_fault(CPUState *env1, target_ulong address, int rw,
-                               int mmu_idx, int is_softmmu);
-target_ulong mmu_probe(CPUState *env, target_ulong address, int mmulev);
-void dump_mmu(CPUState *env);
-
 /* op_helper.c */
 void do_interrupt(CPUState *env);
 
-/* cpu-exec.c */
-void cpu_loop_exit(void);
+static inline int cpu_has_work(CPUState *env1)
+{
+    return (env1->interrupt_request & CPU_INTERRUPT_HARD) &&
+           (env1->psret != 0);
+}
 
-/* sun4m.c */
-void cpu_check_irqs(CPUSPARCState *env);
 
 static inline int cpu_halted(CPUState *env1) {
     if (!env1->halted)
         return 0;
-    if ((env1->interrupt_request & CPU_INTERRUPT_HARD) && (env1->psret != 0)) {
+    if (cpu_has_work(env1)) {
         env1->halted = 0;
         return 0;
     }