net: clean up includes in net.c

[qemu.git] / target-sparc / exec.h

diff --git a/target-sparc/exec.h b/target-sparc/exec.h
index dbfcc35147a6375d941cb5a473d2a12577c83531..e120d6fed4c867f60f8d09a3ece8831e25235fe5 100644 (file)
--- a/target-sparc/exec.h
+++ b/target-sparc/exec.h
@@ -5,8 +5,6 @@
 
 register struct CPUSPARCState *env asm(AREG0);
 
-#define FT0 (env->ft0)
-#define FT1 (env->ft1)
 #define DT0 (env->dt0)
 #define DT1 (env->dt1)
 #define QT0 (env->qt0)
@@ -23,28 +21,33 @@ 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);
-int cpu_sparc_signal_handler(int host_signum, void *pinfo, void *puc);
+static inline int cpu_interrupts_enabled(CPUState *env1)
+{
+#if !defined (TARGET_SPARC64)
+    if (env1->psret != 0)
+        return 1;
+#else
+    if (env1->pstate & PS_IE)
+        return 1;
+#endif
+
+    return 0;
+}
+
+static inline int cpu_has_work(CPUState *env1)
+{
+    return (env1->interrupt_request & CPU_INTERRUPT_HARD) &&
+           cpu_interrupts_enabled(env1);
+}
 
-/* 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;
     }