target-sh4: correct use of ! and &

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

diff --git a/target-sh4/exec.h b/target-sh4/exec.h
index 608179918bac7d70921d7685df4944bab1afc8cf..2999c023c0130ea4ca1be18a05eb78d37cc8d38c 100644 (file)
--- a/target-sh4/exec.h
+++ b/target-sh4/exec.h
@@ -14,8 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef _EXEC_SH4_H
 #define _EXEC_SH4_H
@@ -24,23 +23,21 @@
 #include "dyngen-exec.h"
 
 register struct CPUSH4State *env asm(AREG0);
-register uint32_t T0 asm(AREG1);
-register uint32_t T1 asm(AREG2);
-//register uint32_t T2 asm(AREG3);
-
-#define FT0 (env->ft0)
-#define FT1 (env->ft1)
-#define DT0 (env->dt0)
-#define DT1 (env->dt1)
 
 #include "cpu.h"
 #include "exec-all.h"
 
+static inline int cpu_has_work(CPUState *env)
+{
+    return (env->interrupt_request & CPU_INTERRUPT_HARD);
+}
+
 static inline int cpu_halted(CPUState *env) {
     if (!env->halted)
         return 0;
-    if (env->interrupt_request & CPU_INTERRUPT_HARD) {
+    if (cpu_has_work(env)) {
         env->halted = 0;
+        env->intr_at_halt = 1;
         return 0;
     }
     return EXCP_HALTED;
@@ -50,41 +47,10 @@ static inline int cpu_halted(CPUState *env) {
 #include "softmmu_exec.h"
 #endif
 
-#define RETURN() __asm__ __volatile__("")
-
-static inline void regs_to_env(void)
+static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
 {
-    /* XXXXX */
+    env->pc = tb->pc;
+    env->flags = tb->flags;
 }
 
-static inline void env_to_regs(void)
-{
-    /* XXXXX */
-}
-
-int cpu_sh4_handle_mmu_fault(CPUState * env, target_ulong address, int rw,
-                            int mmu_idx, int is_softmmu);
-
-int find_itlb_entry(CPUState * env, target_ulong address,
-                   int use_asid, int update);
-int find_utlb_entry(CPUState * env, target_ulong address, int use_asid);
-
-void helper_addc_T0_T1(void);
-void helper_addv_T0_T1(void);
-void helper_div1_T0_T1(void);
-void helper_dmulsl_T0_T1(void);
-void helper_dmulul_T0_T1(void);
-void helper_macl_T0_T1(void);
-void helper_macw_T0_T1(void);
-void helper_negc_T0(void);
-void helper_subc_T0_T1(void);
-void helper_subv_T0_T1(void);
-void helper_rotcl(uint32_t * addr);
-void helper_rotcr(uint32_t * addr);
-
-void do_interrupt(CPUState * env);
-
-void cpu_loop_exit(void);
-void do_raise_exception(void);
-
 #endif                         /* _EXEC_SH4_H */