Refactor and enhance break/watchpoint API (Jan Kiszka)

[qemu] / target-sparc / exec.h

diff --git a/target-sparc/exec.h b/target-sparc/exec.h
index 7d67b2d..75410aa 100644 (file)
--- a/target-sparc/exec.h
+++ b/target-sparc/exec.h
@@ -5,38 +5,6 @@
 
 register struct CPUSPARCState *env asm(AREG0);
 
-#ifdef TARGET_SPARC64
-#define T0 (env->t0)
-#define T2 (env->t2)
-#define REGWPTR env->regwptr
-#else
-register uint32_t T0 asm(AREG1);
-
-#undef REG_REGWPTR // Broken
-#ifdef REG_REGWPTR
-#if defined(__sparc__)
-register uint32_t *REGWPTR asm(AREG4);
-#else
-register uint32_t *REGWPTR asm(AREG3);
-#endif
-#define reg_REGWPTR
-
-#ifdef AREG4
-register uint32_t T2 asm(AREG4);
-#define reg_T2
-#else
-#define T2 (env->t2)
-#endif
-
-#else
-#define REGWPTR env->regwptr
-register uint32_t T2 asm(AREG3);
-#endif
-#define reg_T2
-#endif
-
-#define FT0 (env->ft0)
-#define FT1 (env->ft1)
 #define DT0 (env->dt0)
 #define DT1 (env->dt1)
 #define QT0 (env->qt0)
@@ -47,18 +15,17 @@ register uint32_t T2 asm(AREG3);
 
 static inline void env_to_regs(void)
 {
-#if defined(reg_REGWPTR)
-    REGWPTR = env->regbase + (env->cwp * 16);
-    env->regwptr = REGWPTR;
-#endif
 }
 
 static inline void regs_to_env(void)
 {
 }
 
-int cpu_sparc_handle_mmu_fault(CPUState *env1, target_ulong address, int rw,
-                               int mmu_idx, int is_softmmu);
+/* op_helper.c */
+void do_interrupt(CPUState *env);
+
+/* cpu-exec.c */
+void cpu_loop_exit(void);
 
 static inline int cpu_halted(CPUState *env1) {
     if (!env1->halted)