From a7812ae412311d7d47f8aa85656faadac9d64b56 Mon Sep 17 00:00:00 2001 From: pbrook Date: Mon, 17 Nov 2008 14:43:54 +0000 Subject: TCG variable type checking. Signed-off-by: Paul Brook git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5729 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-sh4/helper.h | 82 ++++---- target-sh4/op_helper.c | 1 + target-sh4/translate.c | 538 +++++++++++++++++++++++++------------------------ 3 files changed, 313 insertions(+), 308 deletions(-) (limited to 'target-sh4') diff --git a/target-sh4/helper.h b/target-sh4/helper.h index cb157cd..e8fd050 100644 --- a/target-sh4/helper.h +++ b/target-sh4/helper.h @@ -1,46 +1,46 @@ -#ifndef DEF_HELPER -#define DEF_HELPER(ret, name, params) ret name params; -#endif +#include "def-helper.h" -DEF_HELPER(void, helper_ldtlb, (void)) -DEF_HELPER(void, helper_raise_illegal_instruction, (void)) -DEF_HELPER(void, helper_raise_slot_illegal_instruction, (void)) -DEF_HELPER(void, helper_debug, (void)) -DEF_HELPER(void, helper_sleep, (uint32_t)) -DEF_HELPER(void, helper_trapa, (uint32_t)) +DEF_HELPER_0(ldtlb, void) +DEF_HELPER_0(raise_illegal_instruction, void) +DEF_HELPER_0(raise_slot_illegal_instruction, void) +DEF_HELPER_0(debug, void) +DEF_HELPER_1(sleep, void, i32) +DEF_HELPER_1(trapa, void, i32) -DEF_HELPER(uint32_t, helper_addv, (uint32_t, uint32_t)) -DEF_HELPER(uint32_t, helper_addc, (uint32_t, uint32_t)) -DEF_HELPER(uint32_t, helper_subv, (uint32_t, uint32_t)) -DEF_HELPER(uint32_t, helper_subc, (uint32_t, uint32_t)) -DEF_HELPER(uint32_t, helper_negc, (uint32_t)) -DEF_HELPER(uint32_t, helper_div1, (uint32_t, uint32_t)) -DEF_HELPER(void, helper_macl, (uint32_t, uint32_t)) -DEF_HELPER(void, helper_macw, (uint32_t, uint32_t)) +DEF_HELPER_2(addv, i32, i32, i32) +DEF_HELPER_2(addc, i32, i32, i32) +DEF_HELPER_2(subv, i32, i32, i32) +DEF_HELPER_2(subc, i32, i32, i32) +DEF_HELPER_1(negc, i32, i32) +DEF_HELPER_2(div1, i32, i32, i32) +DEF_HELPER_2(macl, void, i32, i32) +DEF_HELPER_2(macw, void, i32, i32) -DEF_HELPER(void, helper_ld_fpscr, (uint32_t)) +DEF_HELPER_1(ld_fpscr, void, i32) -DEF_HELPER(uint32_t, helper_fabs_FT, (uint32_t)) -DEF_HELPER(uint64_t, helper_fabs_DT, (uint64_t)) -DEF_HELPER(uint32_t, helper_fadd_FT, (uint32_t, uint32_t)) -DEF_HELPER(uint64_t, helper_fadd_DT, (uint64_t, uint64_t)) -DEF_HELPER(uint64_t, helper_fcnvsd_FT_DT, (uint32_t)) -DEF_HELPER(uint32_t, helper_fcnvds_DT_FT, (uint64_t)) +DEF_HELPER_1(fabs_FT, i32, i32) +DEF_HELPER_1(fabs_DT, i64, i64) +DEF_HELPER_2(fadd_FT, i32, i32, i32) +DEF_HELPER_2(fadd_DT, i64, i64, i64) +DEF_HELPER_1(fcnvsd_FT_DT, i64, i32) +DEF_HELPER_1(fcnvds_DT_FT, i32, i64) -DEF_HELPER(void, helper_fcmp_eq_FT, (uint32_t, uint32_t)) -DEF_HELPER(void, helper_fcmp_eq_DT, (uint64_t, uint64_t)) -DEF_HELPER(void, helper_fcmp_gt_FT, (uint32_t, uint32_t)) -DEF_HELPER(void, helper_fcmp_gt_DT, (uint64_t, uint64_t)) -DEF_HELPER(uint32_t, helper_fdiv_FT, (uint32_t, uint32_t)) -DEF_HELPER(uint64_t, helper_fdiv_DT, (uint64_t, uint64_t)) -DEF_HELPER(uint32_t, helper_float_FT, (uint32_t)) -DEF_HELPER(uint64_t, helper_float_DT, (uint32_t)) -DEF_HELPER(uint32_t, helper_fmul_FT, (uint32_t, uint32_t)) -DEF_HELPER(uint64_t, helper_fmul_DT, (uint64_t, uint64_t)) -DEF_HELPER(uint32_t, helper_fneg_T, (uint32_t)) -DEF_HELPER(uint32_t, helper_fsub_FT, (uint32_t, uint32_t)) -DEF_HELPER(uint64_t, helper_fsub_DT, (uint64_t, uint64_t)) -DEF_HELPER(uint32_t, helper_fsqrt_FT, (uint32_t)) -DEF_HELPER(uint64_t, helper_fsqrt_DT, (uint64_t)) -DEF_HELPER(uint32_t, helper_ftrc_FT, (uint32_t)) -DEF_HELPER(uint32_t, helper_ftrc_DT, (uint64_t)) +DEF_HELPER_2(fcmp_eq_FT, void, i32, i32) +DEF_HELPER_2(fcmp_eq_DT, void, i64, i64) +DEF_HELPER_2(fcmp_gt_FT, void, i32, i32) +DEF_HELPER_2(fcmp_gt_DT, void, i64, i64) +DEF_HELPER_2(fdiv_FT, i32, i32, i32) +DEF_HELPER_2(fdiv_DT, i64, i64, i64) +DEF_HELPER_1(float_FT, i32, i32) +DEF_HELPER_1(float_DT, i64, i32) +DEF_HELPER_2(fmul_FT, i32, i32, i32) +DEF_HELPER_2(fmul_DT, i64, i64, i64) +DEF_HELPER_1(fneg_T, i32, i32) +DEF_HELPER_2(fsub_FT, i32, i32, i32) +DEF_HELPER_2(fsub_DT, i64, i64, i64) +DEF_HELPER_1(fsqrt_FT, i32, i32) +DEF_HELPER_1(fsqrt_DT, i64, i64) +DEF_HELPER_1(ftrc_FT, i32, i32) +DEF_HELPER_1(ftrc_DT, i32, i64) + +#include "def-helper.h" diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c index e5b3c98..e5a4cb7 100644 --- a/target-sh4/op_helper.c +++ b/target-sh4/op_helper.c @@ -19,6 +19,7 @@ */ #include #include "exec.h" +#include "helper.h" #ifndef CONFIG_USER_ONLY diff --git a/target-sh4/translate.c b/target-sh4/translate.c index 0f22f19..b05e8fc 100644 --- a/target-sh4/translate.c +++ b/target-sh4/translate.c @@ -31,10 +31,13 @@ #include "cpu.h" #include "exec-all.h" #include "disas.h" -#include "helper.h" #include "tcg-op.h" #include "qemu-common.h" +#include "helper.h" +#define GEN_HELPER 1 +#include "helper.h" + typedef struct DisasContext { struct TranslationBlock *tb; target_ulong pc; @@ -64,7 +67,7 @@ enum { }; /* global register indexes */ -static TCGv cpu_env; +static TCGv_ptr cpu_env; static TCGv cpu_gregs[24]; static TCGv cpu_pc, cpu_sr, cpu_ssr, cpu_spc, cpu_gbr; static TCGv cpu_vbr, cpu_sgr, cpu_dbr, cpu_mach, cpu_macl; @@ -90,49 +93,48 @@ static void sh4_translate_init(void) if (done_init) return; - cpu_env = tcg_global_reg_new(TCG_TYPE_PTR, TCG_AREG0, "env"); + cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env"); for (i = 0; i < 24; i++) - cpu_gregs[i] = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, + cpu_gregs[i] = tcg_global_mem_new_i32(TCG_AREG0, offsetof(CPUState, gregs[i]), gregnames[i]); - cpu_pc = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, pc), "PC"); - cpu_sr = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, sr), "SR"); - cpu_ssr = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, ssr), "SSR"); - cpu_spc = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, spc), "SPC"); - cpu_gbr = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, gbr), "GBR"); - cpu_vbr = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, vbr), "VBR"); - cpu_sgr = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, sgr), "SGR"); - cpu_dbr = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, dbr), "DBR"); - cpu_mach = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, mach), "MACH"); - cpu_macl = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, macl), "MACL"); - cpu_pr = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, pr), "PR"); - cpu_fpscr = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, fpscr), "FPSCR"); - cpu_fpul = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, fpul), "FPUL"); - - cpu_flags = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, flags), "_flags_"); - cpu_delayed_pc = tcg_global_mem_new(TCG_TYPE_I32, TCG_AREG0, - offsetof(CPUState, delayed_pc), - "_delayed_pc_"); + cpu_pc = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, pc), "PC"); + cpu_sr = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, sr), "SR"); + cpu_ssr = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, ssr), "SSR"); + cpu_spc = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, spc), "SPC"); + cpu_gbr = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, gbr), "GBR"); + cpu_vbr = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, vbr), "VBR"); + cpu_sgr = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, sgr), "SGR"); + cpu_dbr = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, dbr), "DBR"); + cpu_mach = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, mach), "MACH"); + cpu_macl = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, macl), "MACL"); + cpu_pr = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, pr), "PR"); + cpu_fpscr = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, fpscr), "FPSCR"); + cpu_fpul = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, fpul), "FPUL"); + + cpu_flags = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, flags), "_flags_"); + cpu_delayed_pc = tcg_global_mem_new_i32(TCG_AREG0, + offsetof(CPUState, delayed_pc), + "_delayed_pc_"); /* register helpers */ -#undef DEF_HELPER -#define DEF_HELPER(ret, name, params) tcg_register_helper(name, #name); +#define GEN_HELPER 2 #include "helper.h" done_init = 1; @@ -270,7 +272,7 @@ static void gen_goto_tb(DisasContext * ctx, int n, target_ulong dest) } else { tcg_gen_movi_i32(cpu_pc, dest); if (ctx->singlestep_enabled) - tcg_gen_helper_0_0(helper_debug); + gen_helper_debug(); tcg_gen_exit_tb(0); } } @@ -282,7 +284,7 @@ static void gen_jump(DisasContext * ctx) delayed jump as immediate jump are conditinal jumps */ tcg_gen_mov_i32(cpu_pc, cpu_delayed_pc); if (ctx->singlestep_enabled) - tcg_gen_helper_0_0(helper_debug); + gen_helper_debug(); tcg_gen_exit_tb(0); } else { gen_goto_tb(ctx, 0, ctx->delayed_pc); @@ -294,7 +296,7 @@ static inline void gen_branch_slot(uint32_t delayed_pc, int t) TCGv sr; int label = gen_new_label(); tcg_gen_movi_i32(cpu_delayed_pc, delayed_pc); - sr = tcg_temp_new(TCG_TYPE_I32); + sr = tcg_temp_new(); tcg_gen_andi_i32(sr, cpu_sr, SR_T); tcg_gen_brcondi_i32(TCG_COND_NE, sr, t ? SR_T : 0, label); tcg_gen_ori_i32(cpu_flags, cpu_flags, DELAY_SLOT_TRUE); @@ -309,7 +311,7 @@ static void gen_conditional_jump(DisasContext * ctx, TCGv sr; l1 = gen_new_label(); - sr = tcg_temp_new(TCG_TYPE_I32); + sr = tcg_temp_new(); tcg_gen_andi_i32(sr, cpu_sr, SR_T); tcg_gen_brcondi_i32(TCG_COND_EQ, sr, SR_T, l1); gen_goto_tb(ctx, 0, ifnott); @@ -324,7 +326,7 @@ static void gen_delayed_conditional_jump(DisasContext * ctx) TCGv ds; l1 = gen_new_label(); - ds = tcg_temp_new(TCG_TYPE_I32); + ds = tcg_temp_new(); tcg_gen_andi_i32(ds, cpu_flags, DELAY_SLOT_TRUE); tcg_gen_brcondi_i32(TCG_COND_EQ, ds, DELAY_SLOT_TRUE, l1); gen_goto_tb(ctx, 1, ctx->pc + 2); @@ -375,7 +377,7 @@ static inline void gen_store_flags(uint32_t flags) static inline void gen_copy_bit_i32(TCGv t0, int p0, TCGv t1, int p1) { - TCGv tmp = tcg_temp_new(TCG_TYPE_I32); + TCGv tmp = tcg_temp_new(); p0 &= 0x1f; p1 &= 0x1f; @@ -392,38 +394,38 @@ static inline void gen_copy_bit_i32(TCGv t0, int p0, TCGv t1, int p1) } -static inline void gen_load_fpr32(TCGv t, int reg) +static inline void gen_load_fpr32(TCGv_i32 t, int reg) { tcg_gen_ld_i32(t, cpu_env, offsetof(CPUState, fregs[reg])); } -static inline void gen_load_fpr64(TCGv t, int reg) +static inline void gen_load_fpr64(TCGv_i64 t, int reg) { - TCGv tmp1 = tcg_temp_new(TCG_TYPE_I32); - TCGv tmp2 = tcg_temp_new(TCG_TYPE_I32); + TCGv_i32 tmp1 = tcg_temp_new_i32(); + TCGv_i32 tmp2 = tcg_temp_new_i32(); tcg_gen_ld_i32(tmp1, cpu_env, offsetof(CPUState, fregs[reg])); tcg_gen_ld_i32(tmp2, cpu_env, offsetof(CPUState, fregs[reg + 1])); tcg_gen_concat_i32_i64(t, tmp2, tmp1); - tcg_temp_free(tmp1); - tcg_temp_free(tmp2); + tcg_temp_free_i32(tmp1); + tcg_temp_free_i32(tmp2); } -static inline void gen_store_fpr32(TCGv t, int reg) +static inline void gen_store_fpr32(TCGv_i32 t, int reg) { tcg_gen_st_i32(t, cpu_env, offsetof(CPUState, fregs[reg])); } -static inline void gen_store_fpr64 (TCGv t, int reg) +static inline void gen_store_fpr64 (TCGv_i64 t, int reg) { - TCGv tmp = tcg_temp_new(TCG_TYPE_I32); + TCGv_i32 tmp = tcg_temp_new_i32(); tcg_gen_trunc_i64_i32(tmp, t); tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUState, fregs[reg + 1])); tcg_gen_shri_i64(t, t, 32); tcg_gen_trunc_i64_i32(tmp, t); tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUState, fregs[reg])); - tcg_temp_free(tmp); + tcg_temp_free_i32(tmp); } #define B3_0 (ctx->opcode & 0xf) @@ -449,12 +451,12 @@ static inline void gen_store_fpr64 (TCGv t, int reg) #define CHECK_NOT_DELAY_SLOT \ if (ctx->flags & (DELAY_SLOT | DELAY_SLOT_CONDITIONAL)) \ - {tcg_gen_helper_0_0(helper_raise_slot_illegal_instruction); ctx->bstate = BS_EXCP; \ + {gen_helper_raise_slot_illegal_instruction(); ctx->bstate = BS_EXCP; \ return;} #define CHECK_PRIVILEGED \ if (IS_USER(ctx)) { \ - tcg_gen_helper_0_0(helper_raise_illegal_instruction); \ + gen_helper_raise_illegal_instruction(); \ ctx->bstate = BS_EXCP; \ return; \ } @@ -486,7 +488,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x0038: /* ldtlb */ CHECK_PRIVILEGED - tcg_gen_helper_0_0(helper_ldtlb); + gen_helper_ldtlb(); return; case 0x002b: /* rte */ CHECK_PRIVILEGED @@ -514,14 +516,14 @@ static void _decode_opc(DisasContext * ctx) return; case 0x001b: /* sleep */ CHECK_PRIVILEGED - tcg_gen_helper_0_1(helper_sleep, tcg_const_i32(ctx->pc + 2)); + gen_helper_sleep(tcg_const_i32(ctx->pc + 2)); return; } switch (ctx->opcode & 0xf000) { case 0x1000: /* mov.l Rm,@(disp,Rn) */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_addi_i32(addr, REG(B11_8), B3_0 * 4); tcg_gen_qemu_st32(REG(B7_4), addr, ctx->memidx); tcg_temp_free(addr); @@ -529,7 +531,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x5000: /* mov.l @(disp,Rm),Rn */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_addi_i32(addr, REG(B7_4), B3_0 * 4); tcg_gen_qemu_ld32s(REG(B11_8), addr, ctx->memidx); tcg_temp_free(addr); @@ -594,7 +596,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x2004: /* mov.b Rm,@-Rn */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_subi_i32(addr, REG(B11_8), 1); tcg_gen_qemu_st8(REG(B7_4), addr, ctx->memidx); /* might cause re-execution */ tcg_gen_subi_i32(REG(B11_8), REG(B11_8), 1); /* modify register status */ @@ -603,7 +605,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x2005: /* mov.w Rm,@-Rn */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_subi_i32(addr, REG(B11_8), 2); tcg_gen_qemu_st16(REG(B7_4), addr, ctx->memidx); tcg_gen_subi_i32(REG(B11_8), REG(B11_8), 2); @@ -612,7 +614,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x2006: /* mov.l Rm,@-Rn */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_subi_i32(addr, REG(B11_8), 4); tcg_gen_qemu_st32(REG(B7_4), addr, ctx->memidx); tcg_gen_subi_i32(REG(B11_8), REG(B11_8), 4); @@ -635,7 +637,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x0004: /* mov.b Rm,@(R0,Rn) */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_add_i32(addr, REG(B11_8), REG(0)); tcg_gen_qemu_st8(REG(B7_4), addr, ctx->memidx); tcg_temp_free(addr); @@ -643,7 +645,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x0005: /* mov.w Rm,@(R0,Rn) */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_add_i32(addr, REG(B11_8), REG(0)); tcg_gen_qemu_st16(REG(B7_4), addr, ctx->memidx); tcg_temp_free(addr); @@ -651,7 +653,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x0006: /* mov.l Rm,@(R0,Rn) */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_add_i32(addr, REG(B11_8), REG(0)); tcg_gen_qemu_st32(REG(B7_4), addr, ctx->memidx); tcg_temp_free(addr); @@ -659,7 +661,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x000c: /* mov.b @(R0,Rm),Rn */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_add_i32(addr, REG(B7_4), REG(0)); tcg_gen_qemu_ld8s(REG(B11_8), addr, ctx->memidx); tcg_temp_free(addr); @@ -667,7 +669,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x000d: /* mov.w @(R0,Rm),Rn */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_add_i32(addr, REG(B7_4), REG(0)); tcg_gen_qemu_ld16s(REG(B11_8), addr, ctx->memidx); tcg_temp_free(addr); @@ -675,7 +677,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x000e: /* mov.l @(R0,Rm),Rn */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_add_i32(addr, REG(B7_4), REG(0)); tcg_gen_qemu_ld32s(REG(B11_8), addr, ctx->memidx); tcg_temp_free(addr); @@ -684,12 +686,12 @@ static void _decode_opc(DisasContext * ctx) case 0x6008: /* swap.b Rm,Rn */ { TCGv highw, high, low; - highw = tcg_temp_new(TCG_TYPE_I32); + highw = tcg_temp_new(); tcg_gen_andi_i32(highw, REG(B7_4), 0xffff0000); - high = tcg_temp_new(TCG_TYPE_I32); + high = tcg_temp_new(); tcg_gen_ext8u_i32(high, REG(B7_4)); tcg_gen_shli_i32(high, high, 8); - low = tcg_temp_new(TCG_TYPE_I32); + low = tcg_temp_new(); tcg_gen_shri_i32(low, REG(B7_4), 8); tcg_gen_ext8u_i32(low, low); tcg_gen_or_i32(REG(B11_8), high, low); @@ -701,10 +703,10 @@ static void _decode_opc(DisasContext * ctx) case 0x6009: /* swap.w Rm,Rn */ { TCGv high, low; - high = tcg_temp_new(TCG_TYPE_I32); + high = tcg_temp_new(); tcg_gen_ext16u_i32(high, REG(B7_4)); tcg_gen_shli_i32(high, high, 16); - low = tcg_temp_new(TCG_TYPE_I32); + low = tcg_temp_new(); tcg_gen_shri_i32(low, REG(B7_4), 16); tcg_gen_ext16u_i32(low, low); tcg_gen_or_i32(REG(B11_8), high, low); @@ -715,10 +717,10 @@ static void _decode_opc(DisasContext * ctx) case 0x200d: /* xtrct Rm,Rn */ { TCGv high, low; - high = tcg_temp_new(TCG_TYPE_I32); + high = tcg_temp_new(); tcg_gen_ext16u_i32(high, REG(B7_4)); tcg_gen_shli_i32(high, high, 16); - low = tcg_temp_new(TCG_TYPE_I32); + low = tcg_temp_new(); tcg_gen_shri_i32(low, REG(B11_8), 16); tcg_gen_ext16u_i32(low, low); tcg_gen_or_i32(REG(B11_8), high, low); @@ -730,10 +732,10 @@ static void _decode_opc(DisasContext * ctx) tcg_gen_add_i32(REG(B11_8), REG(B11_8), REG(B7_4)); return; case 0x300e: /* addc Rm,Rn */ - tcg_gen_helper_1_2(helper_addc, REG(B11_8), REG(B7_4), REG(B11_8)); + gen_helper_addc(REG(B11_8), REG(B7_4), REG(B11_8)); return; case 0x300f: /* addv Rm,Rn */ - tcg_gen_helper_1_2(helper_addv, REG(B11_8), REG(B7_4), REG(B11_8)); + gen_helper_addv(REG(B11_8), REG(B7_4), REG(B11_8)); return; case 0x2009: /* and Rm,Rn */ tcg_gen_and_i32(REG(B11_8), REG(B11_8), REG(B7_4)); @@ -781,19 +783,19 @@ static void _decode_opc(DisasContext * ctx) { gen_copy_bit_i32(cpu_sr, 8, REG(B11_8), 31); /* SR_Q */ gen_copy_bit_i32(cpu_sr, 9, REG(B7_4), 31); /* SR_M */ - TCGv val = tcg_temp_new(TCG_TYPE_I32); + TCGv val = tcg_temp_new(); tcg_gen_xor_i32(val, REG(B7_4), REG(B11_8)); gen_copy_bit_i32(cpu_sr, 0, val, 31); /* SR_T */ tcg_temp_free(val); } return; case 0x3004: /* div1 Rm,Rn */ - tcg_gen_helper_1_2(helper_div1, REG(B11_8), REG(B7_4), REG(B11_8)); + gen_helper_div1(REG(B11_8), REG(B7_4), REG(B11_8)); return; case 0x300d: /* dmuls.l Rm,Rn */ { - TCGv tmp1 = tcg_temp_new(TCG_TYPE_I64); - TCGv tmp2 = tcg_temp_new(TCG_TYPE_I64); + TCGv_i64 tmp1 = tcg_temp_new_i64(); + TCGv_i64 tmp2 = tcg_temp_new_i64(); tcg_gen_ext_i32_i64(tmp1, REG(B7_4)); tcg_gen_ext_i32_i64(tmp2, REG(B11_8)); @@ -802,14 +804,14 @@ static void _decode_opc(DisasContext * ctx) tcg_gen_shri_i64(tmp1, tmp1, 32); tcg_gen_trunc_i64_i32(cpu_mach, tmp1); - tcg_temp_free(tmp2); - tcg_temp_free(tmp1); + tcg_temp_free_i64(tmp2); + tcg_temp_free_i64(tmp1); } return; case 0x3005: /* dmulu.l Rm,Rn */ { - TCGv tmp1 = tcg_temp_new(TCG_TYPE_I64); - TCGv tmp2 = tcg_temp_new(TCG_TYPE_I64); + TCGv_i64 tmp1 = tcg_temp_new_i64(); + TCGv_i64 tmp2 = tcg_temp_new_i64(); tcg_gen_extu_i32_i64(tmp1, REG(B7_4)); tcg_gen_extu_i32_i64(tmp2, REG(B11_8)); @@ -818,8 +820,8 @@ static void _decode_opc(DisasContext * ctx) tcg_gen_shri_i64(tmp1, tmp1, 32); tcg_gen_trunc_i64_i32(cpu_mach, tmp1); - tcg_temp_free(tmp2); - tcg_temp_free(tmp1); + tcg_temp_free_i64(tmp2); + tcg_temp_free_i64(tmp1); } return; case 0x600e: /* exts.b Rm,Rn */ @@ -837,11 +839,11 @@ static void _decode_opc(DisasContext * ctx) case 0x000f: /* mac.l @Rm+,@Rn+ */ { TCGv arg0, arg1; - arg0 = tcg_temp_new(TCG_TYPE_I32); + arg0 = tcg_temp_new(); tcg_gen_qemu_ld32s(arg0, REG(B7_4), ctx->memidx); - arg1 = tcg_temp_new(TCG_TYPE_I32); + arg1 = tcg_temp_new(); tcg_gen_qemu_ld32s(arg1, REG(B11_8), ctx->memidx); - tcg_gen_helper_0_2(helper_macl, arg0, arg1); + gen_helper_macl(arg0, arg1); tcg_temp_free(arg1); tcg_temp_free(arg0); tcg_gen_addi_i32(REG(B7_4), REG(B7_4), 4); @@ -851,11 +853,11 @@ static void _decode_opc(DisasContext * ctx) case 0x400f: /* mac.w @Rm+,@Rn+ */ { TCGv arg0, arg1; - arg0 = tcg_temp_new(TCG_TYPE_I32); + arg0 = tcg_temp_new(); tcg_gen_qemu_ld32s(arg0, REG(B7_4), ctx->memidx); - arg1 = tcg_temp_new(TCG_TYPE_I32); + arg1 = tcg_temp_new(); tcg_gen_qemu_ld32s(arg1, REG(B11_8), ctx->memidx); - tcg_gen_helper_0_2(helper_macw, arg0, arg1); + gen_helper_macw(arg0, arg1); tcg_temp_free(arg1); tcg_temp_free(arg0); tcg_gen_addi_i32(REG(B11_8), REG(B11_8), 2); @@ -868,9 +870,9 @@ static void _decode_opc(DisasContext * ctx) case 0x200f: /* muls.w Rm,Rn */ { TCGv arg0, arg1; - arg0 = tcg_temp_new(TCG_TYPE_I32); + arg0 = tcg_temp_new(); tcg_gen_ext16s_i32(arg0, REG(B7_4)); - arg1 = tcg_temp_new(TCG_TYPE_I32); + arg1 = tcg_temp_new(); tcg_gen_ext16s_i32(arg1, REG(B11_8)); tcg_gen_mul_i32(cpu_macl, arg0, arg1); tcg_temp_free(arg1); @@ -880,9 +882,9 @@ static void _decode_opc(DisasContext * ctx) case 0x200e: /* mulu.w Rm,Rn */ { TCGv arg0, arg1; - arg0 = tcg_temp_new(TCG_TYPE_I32); + arg0 = tcg_temp_new(); tcg_gen_ext16u_i32(arg0, REG(B7_4)); - arg1 = tcg_temp_new(TCG_TYPE_I32); + arg1 = tcg_temp_new(); tcg_gen_ext16u_i32(arg1, REG(B11_8)); tcg_gen_mul_i32(cpu_macl, arg0, arg1); tcg_temp_free(arg1); @@ -893,7 +895,7 @@ static void _decode_opc(DisasContext * ctx) tcg_gen_neg_i32(REG(B11_8), REG(B7_4)); return; case 0x600a: /* negc Rm,Rn */ - tcg_gen_helper_1_1(helper_negc, REG(B11_8), REG(B7_4)); + gen_helper_negc(REG(B11_8), REG(B7_4)); return; case 0x6007: /* not Rm,Rn */ tcg_gen_not_i32(REG(B11_8), REG(B7_4)); @@ -964,14 +966,14 @@ static void _decode_opc(DisasContext * ctx) tcg_gen_sub_i32(REG(B11_8), REG(B11_8), REG(B7_4)); return; case 0x300a: /* subc Rm,Rn */ - tcg_gen_helper_1_2(helper_subc, REG(B11_8), REG(B7_4), REG(B11_8)); + gen_helper_subc(REG(B11_8), REG(B7_4), REG(B11_8)); return; case 0x300b: /* subv Rm,Rn */ - tcg_gen_helper_1_2(helper_subv, REG(B11_8), REG(B7_4), REG(B11_8)); + gen_helper_subv(REG(B11_8), REG(B7_4), REG(B11_8)); return; case 0x2008: /* tst Rm,Rn */ { - TCGv val = tcg_temp_new(TCG_TYPE_I32); + TCGv val = tcg_temp_new(); tcg_gen_and_i32(val, REG(B7_4), REG(B11_8)); gen_cmp_imm(TCG_COND_EQ, val, 0); tcg_temp_free(val); @@ -982,113 +984,115 @@ static void _decode_opc(DisasContext * ctx) return; case 0xf00c: /* fmov {F,D,X}Rm,{F,D,X}Rn - FPSCR: Nothing */ if (ctx->fpscr & FPSCR_SZ) { - TCGv fp = tcg_temp_new(TCG_TYPE_I64); + TCGv_i64 fp = tcg_temp_new_i64(); gen_load_fpr64(fp, XREG(B7_4)); gen_store_fpr64(fp, XREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i64(fp); } else { - TCGv fp = tcg_temp_new(TCG_TYPE_I32); + TCGv_i32 fp = tcg_temp_new_i32(); gen_load_fpr32(fp, FREG(B7_4)); gen_store_fpr32(fp, FREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i32(fp); } return; case 0xf00a: /* fmov {F,D,X}Rm,@Rn - FPSCR: Nothing */ if (ctx->fpscr & FPSCR_SZ) { - TCGv fp = tcg_temp_new(TCG_TYPE_I64); + TCGv_i64 fp = tcg_temp_new_i64(); gen_load_fpr64(fp, XREG(B7_4)); tcg_gen_qemu_st64(fp, REG(B11_8), ctx->memidx); - tcg_temp_free(fp); + tcg_temp_free_i64(fp); } else { - TCGv fp = tcg_temp_new(TCG_TYPE_I32); + TCGv_i32 fp = tcg_temp_new_i32(); gen_load_fpr32(fp, FREG(B7_4)); tcg_gen_qemu_st32(fp, REG(B11_8), ctx->memidx); - tcg_temp_free(fp); + tcg_temp_free_i32(fp); } return; case 0xf008: /* fmov @Rm,{F,D,X}Rn - FPSCR: Nothing */ if (ctx->fpscr & FPSCR_SZ) { - TCGv fp = tcg_temp_new(TCG_TYPE_I64); + TCGv_i64 fp = tcg_temp_new_i64(); tcg_gen_qemu_ld64(fp, REG(B7_4), ctx->memidx); gen_store_fpr64(fp, XREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i64(fp); } else { - TCGv fp = tcg_temp_new(TCG_TYPE_I32); + TCGv_i32 fp = tcg_temp_new_i32(); tcg_gen_qemu_ld32u(fp, REG(B7_4), ctx->memidx); gen_store_fpr32(fp, FREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i32(fp); } return; case 0xf009: /* fmov @Rm+,{F,D,X}Rn - FPSCR: Nothing */ if (ctx->fpscr & FPSCR_SZ) { - TCGv fp = tcg_temp_new(TCG_TYPE_I64); + TCGv_i64 fp = tcg_temp_new_i64(); tcg_gen_qemu_ld64(fp, REG(B7_4), ctx->memidx); gen_store_fpr64(fp, XREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i64(fp); tcg_gen_addi_i32(REG(B7_4),REG(B7_4), 8); } else { - TCGv fp = tcg_temp_new(TCG_TYPE_I32); + TCGv_i32 fp = tcg_temp_new_i32(); tcg_gen_qemu_ld32u(fp, REG(B7_4), ctx->memidx); gen_store_fpr32(fp, FREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i32(fp); tcg_gen_addi_i32(REG(B7_4), REG(B7_4), 4); } return; case 0xf00b: /* fmov {F,D,X}Rm,@-Rn - FPSCR: Nothing */ if (ctx->fpscr & FPSCR_SZ) { - TCGv addr, fp; - addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr; + TCGv_i64 fp; + addr = tcg_temp_new(); tcg_gen_subi_i32(addr, REG(B11_8), 8); - fp = tcg_temp_new(TCG_TYPE_I64); + fp = tcg_temp_new_i64(); gen_load_fpr64(fp, XREG(B7_4)); tcg_gen_qemu_st64(fp, addr, ctx->memidx); - tcg_temp_free(fp); + tcg_temp_free_i64(fp); tcg_temp_free(addr); tcg_gen_subi_i32(REG(B11_8), REG(B11_8), 8); } else { - TCGv addr, fp; - addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr; + TCGv_i32 fp; + addr = tcg_temp_new_i32(); tcg_gen_subi_i32(addr, REG(B11_8), 4); - fp = tcg_temp_new(TCG_TYPE_I32); + fp = tcg_temp_new_i32(); gen_load_fpr32(fp, FREG(B7_4)); tcg_gen_qemu_st32(fp, addr, ctx->memidx); - tcg_temp_free(fp); + tcg_temp_free_i32(fp); tcg_temp_free(addr); tcg_gen_subi_i32(REG(B11_8), REG(B11_8), 4); } return; case 0xf006: /* fmov @(R0,Rm),{F,D,X}Rm - FPSCR: Nothing */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new_i32(); tcg_gen_add_i32(addr, REG(B7_4), REG(0)); if (ctx->fpscr & FPSCR_SZ) { - TCGv fp = tcg_temp_new(TCG_TYPE_I64); + TCGv_i64 fp = tcg_temp_new_i64(); tcg_gen_qemu_ld64(fp, addr, ctx->memidx); gen_store_fpr64(fp, XREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i64(fp); } else { - TCGv fp = tcg_temp_new(TCG_TYPE_I32); + TCGv_i32 fp = tcg_temp_new_i32(); tcg_gen_qemu_ld32u(fp, addr, ctx->memidx); gen_store_fpr32(fp, FREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i32(fp); } tcg_temp_free(addr); } return; case 0xf007: /* fmov {F,D,X}Rn,@(R0,Rn) - FPSCR: Nothing */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_add_i32(addr, REG(B11_8), REG(0)); if (ctx->fpscr & FPSCR_SZ) { - TCGv fp = tcg_temp_new(TCG_TYPE_I64); + TCGv_i64 fp = tcg_temp_new_i64(); gen_load_fpr64(fp, XREG(B7_4)); tcg_gen_qemu_st64(fp, addr, ctx->memidx); - tcg_temp_free(fp); + tcg_temp_free_i64(fp); } else { - TCGv fp = tcg_temp_new(TCG_TYPE_I32); + TCGv_i32 fp = tcg_temp_new_i32(); gen_load_fpr32(fp, FREG(B7_4)); tcg_gen_qemu_st32(fp, addr, ctx->memidx); - tcg_temp_free(fp); + tcg_temp_free_i32(fp); } tcg_temp_free(addr); } @@ -1100,70 +1104,70 @@ static void _decode_opc(DisasContext * ctx) case 0xf004: /* fcmp/eq Rm,Rn - FPSCR: R[PR,Enable.V]/W[Cause,Flag] */ case 0xf005: /* fcmp/gt Rm,Rn - FPSCR: R[PR,Enable.V]/W[Cause,Flag] */ { - TCGv fp0, fp1; - if (ctx->fpscr & FPSCR_PR) { + TCGv_i64 fp0, fp1; + if (ctx->opcode & 0x0110) break; /* illegal instruction */ - fp0 = tcg_temp_new(TCG_TYPE_I64); - fp1 = tcg_temp_new(TCG_TYPE_I64); + fp0 = tcg_temp_new_i64(); + fp1 = tcg_temp_new_i64(); gen_load_fpr64(fp0, DREG(B11_8)); gen_load_fpr64(fp1, DREG(B7_4)); - } - else { - fp0 = tcg_temp_new(TCG_TYPE_I32); - fp1 = tcg_temp_new(TCG_TYPE_I32); + switch (ctx->opcode & 0xf00f) { + case 0xf000: /* fadd Rm,Rn */ + gen_helper_fadd_DT(fp0, fp0, fp1); + break; + case 0xf001: /* fsub Rm,Rn */ + gen_helper_fsub_DT(fp0, fp0, fp1); + break; + case 0xf002: /* fmul Rm,Rn */ + gen_helper_fmul_DT(fp0, fp0, fp1); + break; + case 0xf003: /* fdiv Rm,Rn */ + gen_helper_fdiv_DT(fp0, fp0, fp1); + break; + case 0xf004: /* fcmp/eq Rm,Rn */ + gen_helper_fcmp_eq_DT(fp0, fp1); + return; + case 0xf005: /* fcmp/gt Rm,Rn */ + gen_helper_fcmp_gt_DT(fp0, fp1); + return; + } + gen_store_fpr64(fp0, DREG(B11_8)); + tcg_temp_free_i64(fp0); + tcg_temp_free_i64(fp1); + } else { + TCGv_i32 fp0, fp1; + + fp0 = tcg_temp_new_i32(); + fp1 = tcg_temp_new_i32(); gen_load_fpr32(fp0, FREG(B11_8)); gen_load_fpr32(fp1, FREG(B7_4)); - } - switch (ctx->opcode & 0xf00f) { - case 0xf000: /* fadd Rm,Rn */ - if (ctx->fpscr & FPSCR_PR) - tcg_gen_helper_1_2(helper_fadd_DT, fp0, fp0, fp1); - else - tcg_gen_helper_1_2(helper_fadd_FT, fp0, fp0, fp1); - break; - case 0xf001: /* fsub Rm,Rn */ - if (ctx->fpscr & FPSCR_PR) - tcg_gen_helper_1_2(helper_fsub_DT, fp0, fp0, fp1); - else - tcg_gen_helper_1_2(helper_fsub_FT, fp0, fp0, fp1); - break; - case 0xf002: /* fmul Rm,Rn */ - if (ctx->fpscr & FPSCR_PR) - tcg_gen_helper_1_2(helper_fmul_DT, fp0, fp0, fp1); - else - tcg_gen_helper_1_2(helper_fmul_FT, fp0, fp0, fp1); - break; - case 0xf003: /* fdiv Rm,Rn */ - if (ctx->fpscr & FPSCR_PR) - tcg_gen_helper_1_2(helper_fdiv_DT, fp0, fp0, fp1); - else - tcg_gen_helper_1_2(helper_fdiv_FT, fp0, fp0, fp1); - break; - case 0xf004: /* fcmp/eq Rm,Rn */ - if (ctx->fpscr & FPSCR_PR) - tcg_gen_helper_0_2(helper_fcmp_eq_DT, fp0, fp1); - else - tcg_gen_helper_0_2(helper_fcmp_eq_FT, fp0, fp1); - return; - case 0xf005: /* fcmp/gt Rm,Rn */ - if (ctx->fpscr & FPSCR_PR) - tcg_gen_helper_0_2(helper_fcmp_gt_DT, fp0, fp1); - else - tcg_gen_helper_0_2(helper_fcmp_gt_FT, fp0, fp1); - return; - } - - if (ctx->fpscr & FPSCR_PR) { - gen_store_fpr64(fp0, DREG(B11_8)); - } - else { + switch (ctx->opcode & 0xf00f) { + case 0xf000: /* fadd Rm,Rn */ + gen_helper_fadd_FT(fp0, fp0, fp1); + break; + case 0xf001: /* fsub Rm,Rn */ + gen_helper_fsub_FT(fp0, fp0, fp1); + break; + case 0xf002: /* fmul Rm,Rn */ + gen_helper_fmul_FT(fp0, fp0, fp1); + break; + case 0xf003: /* fdiv Rm,Rn */ + gen_helper_fdiv_FT(fp0, fp0, fp1); + break; + case 0xf004: /* fcmp/eq Rm,Rn */ + gen_helper_fcmp_eq_FT(fp0, fp1); + return; + case 0xf005: /* fcmp/gt Rm,Rn */ + gen_helper_fcmp_gt_FT(fp0, fp1); + return; + } gen_store_fpr32(fp0, FREG(B11_8)); + tcg_temp_free_i32(fp0); + tcg_temp_free_i32(fp1); } - tcg_temp_free(fp1); - tcg_temp_free(fp0); } return; } @@ -1175,9 +1179,9 @@ static void _decode_opc(DisasContext * ctx) case 0xcd00: /* and.b #imm,@(R0,GBR) */ { TCGv addr, val; - addr = tcg_temp_new(TCG_TYPE_I32); + addr = tcg_temp_new(); tcg_gen_add_i32(addr, REG(0), cpu_gbr); - val = tcg_temp_new(TCG_TYPE_I32); + val = tcg_temp_new(); tcg_gen_qemu_ld8u(val, addr, ctx->memidx); tcg_gen_andi_i32(val, val, B7_0); tcg_gen_qemu_st8(val, addr, ctx->memidx); @@ -1212,7 +1216,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0xc400: /* mov.b @(disp,GBR),R0 */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_addi_i32(addr, cpu_gbr, B7_0); tcg_gen_qemu_ld8s(REG(0), addr, ctx->memidx); tcg_temp_free(addr); @@ -1220,7 +1224,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0xc500: /* mov.w @(disp,GBR),R0 */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_addi_i32(addr, cpu_gbr, B7_0 * 2); tcg_gen_qemu_ld16s(REG(0), addr, ctx->memidx); tcg_temp_free(addr); @@ -1228,7 +1232,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0xc600: /* mov.l @(disp,GBR),R0 */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_addi_i32(addr, cpu_gbr, B7_0 * 4); tcg_gen_qemu_ld32s(REG(0), addr, ctx->memidx); tcg_temp_free(addr); @@ -1236,7 +1240,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0xc000: /* mov.b R0,@(disp,GBR) */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_addi_i32(addr, cpu_gbr, B7_0); tcg_gen_qemu_st8(REG(0), addr, ctx->memidx); tcg_temp_free(addr); @@ -1244,7 +1248,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0xc100: /* mov.w R0,@(disp,GBR) */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_addi_i32(addr, cpu_gbr, B7_0 * 2); tcg_gen_qemu_st16(REG(0), addr, ctx->memidx); tcg_temp_free(addr); @@ -1252,7 +1256,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0xc200: /* mov.l R0,@(disp,GBR) */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_addi_i32(addr, cpu_gbr, B7_0 * 4); tcg_gen_qemu_st32(REG(0), addr, ctx->memidx); tcg_temp_free(addr); @@ -1260,7 +1264,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x8000: /* mov.b R0,@(disp,Rn) */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_addi_i32(addr, REG(B7_4), B3_0); tcg_gen_qemu_st8(REG(0), addr, ctx->memidx); tcg_temp_free(addr); @@ -1268,7 +1272,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x8100: /* mov.w R0,@(disp,Rn) */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_addi_i32(addr, REG(B7_4), B3_0 * 2); tcg_gen_qemu_st16(REG(0), addr, ctx->memidx); tcg_temp_free(addr); @@ -1276,7 +1280,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x8400: /* mov.b @(disp,Rn),R0 */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_addi_i32(addr, REG(B7_4), B3_0); tcg_gen_qemu_ld8s(REG(0), addr, ctx->memidx); tcg_temp_free(addr); @@ -1284,7 +1288,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x8500: /* mov.w @(disp,Rn),R0 */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_addi_i32(addr, REG(B7_4), B3_0 * 2); tcg_gen_qemu_ld16s(REG(0), addr, ctx->memidx); tcg_temp_free(addr); @@ -1299,9 +1303,9 @@ static void _decode_opc(DisasContext * ctx) case 0xcf00: /* or.b #imm,@(R0,GBR) */ { TCGv addr, val; - addr = tcg_temp_new(TCG_TYPE_I32); + addr = tcg_temp_new(); tcg_gen_add_i32(addr, REG(0), cpu_gbr); - val = tcg_temp_new(TCG_TYPE_I32); + val = tcg_temp_new(); tcg_gen_qemu_ld8u(val, addr, ctx->memidx); tcg_gen_ori_i32(val, val, B7_0); tcg_gen_qemu_st8(val, addr, ctx->memidx); @@ -1315,14 +1319,14 @@ static void _decode_opc(DisasContext * ctx) CHECK_NOT_DELAY_SLOT tcg_gen_movi_i32(cpu_pc, ctx->pc); imm = tcg_const_i32(B7_0); - tcg_gen_helper_0_1(helper_trapa, imm); + gen_helper_trapa(imm); tcg_temp_free(imm); ctx->bstate = BS_BRANCH; } return; case 0xc800: /* tst #imm,R0 */ { - TCGv val = tcg_temp_new(TCG_TYPE_I32); + TCGv val = tcg_temp_new(); tcg_gen_andi_i32(val, REG(0), B7_0); gen_cmp_imm(TCG_COND_EQ, val, 0); tcg_temp_free(val); @@ -1330,7 +1334,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0xcc00: /* tst.b #imm,@(R0,GBR) */ { - TCGv val = tcg_temp_new(TCG_TYPE_I32); + TCGv val = tcg_temp_new(); tcg_gen_add_i32(val, REG(0), cpu_gbr); tcg_gen_qemu_ld8u(val, val, ctx->memidx); tcg_gen_andi_i32(val, val, B7_0); @@ -1344,9 +1348,9 @@ static void _decode_opc(DisasContext * ctx) case 0xce00: /* xor.b #imm,@(R0,GBR) */ { TCGv addr, val; - addr = tcg_temp_new(TCG_TYPE_I32); + addr = tcg_temp_new(); tcg_gen_add_i32(addr, REG(0), cpu_gbr); - val = tcg_temp_new(TCG_TYPE_I32); + val = tcg_temp_new(); tcg_gen_qemu_ld8u(val, addr, ctx->memidx); tcg_gen_xori_i32(val, val, B7_0); tcg_gen_qemu_st8(val, addr, ctx->memidx); @@ -1373,7 +1377,7 @@ static void _decode_opc(DisasContext * ctx) case 0x4083: /* stc.l Rm_BANK,@-Rn */ CHECK_PRIVILEGED { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_subi_i32(addr, REG(B11_8), 4); tcg_gen_qemu_st32(ALTREG(B6_4), addr, ctx->memidx); tcg_temp_free(addr); @@ -1427,7 +1431,7 @@ static void _decode_opc(DisasContext * ctx) case 0x4007: /* ldc.l @Rm+,SR */ CHECK_PRIVILEGED { - TCGv val = tcg_temp_new(TCG_TYPE_I32); + TCGv val = tcg_temp_new(); tcg_gen_qemu_ld32s(val, REG(B11_8), ctx->memidx); tcg_gen_andi_i32(cpu_sr, val, 0x700083f3); tcg_temp_free(val); @@ -1442,7 +1446,7 @@ static void _decode_opc(DisasContext * ctx) case 0x4003: /* stc SR,@-Rn */ CHECK_PRIVILEGED { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_subi_i32(addr, REG(B11_8), 4); tcg_gen_qemu_st32(cpu_sr, addr, ctx->memidx); tcg_temp_free(addr); @@ -1466,7 +1470,7 @@ static void _decode_opc(DisasContext * ctx) case stpnum: \ prechk \ { \ - TCGv addr = tcg_temp_new(TCG_TYPE_I32); \ + TCGv addr = tcg_temp_new(); \ tcg_gen_subi_i32(addr, REG(B11_8), 4); \ tcg_gen_qemu_st32 (cpu_##reg, addr, ctx->memidx); \ tcg_temp_free(addr); \ @@ -1483,15 +1487,15 @@ static void _decode_opc(DisasContext * ctx) LDST(pr, 0x402a, 0x4026, 0x002a, 0x4022, {}) LDST(fpul, 0x405a, 0x4056, 0x005a, 0x4052, {}) case 0x406a: /* lds Rm,FPSCR */ - tcg_gen_helper_0_1(helper_ld_fpscr, REG(B11_8)); + gen_helper_ld_fpscr(REG(B11_8)); ctx->bstate = BS_STOP; return; case 0x4066: /* lds.l @Rm+,FPSCR */ { - TCGv addr = tcg_temp_new(TCG_TYPE_I32); + TCGv addr = tcg_temp_new(); tcg_gen_qemu_ld32s(addr, REG(B11_8), ctx->memidx); tcg_gen_addi_i32(REG(B11_8), REG(B11_8), 4); - tcg_gen_helper_0_1(helper_ld_fpscr, addr); + gen_helper_ld_fpscr(addr); tcg_temp_free(addr); ctx->bstate = BS_STOP; } @@ -1502,9 +1506,9 @@ static void _decode_opc(DisasContext * ctx) case 0x4062: /* sts FPSCR,@-Rn */ { TCGv addr, val; - val = tcg_temp_new(TCG_TYPE_I32); + val = tcg_temp_new(); tcg_gen_andi_i32(val, cpu_fpscr, 0x003fffff); - addr = tcg_temp_new(TCG_TYPE_I32); + addr = tcg_temp_new(); tcg_gen_subi_i32(addr, REG(B11_8), 4); tcg_gen_qemu_st32(val, addr, ctx->memidx); tcg_temp_free(addr); @@ -1531,21 +1535,21 @@ static void _decode_opc(DisasContext * ctx) return; case 0x0093: /* ocbi @Rn */ { - TCGv dummy = tcg_temp_new(TCG_TYPE_I32); + TCGv dummy = tcg_temp_new(); tcg_gen_qemu_ld32s(dummy, REG(B11_8), ctx->memidx); tcg_temp_free(dummy); } return; case 0x00a3: /* ocbp @Rn */ { - TCGv dummy = tcg_temp_new(TCG_TYPE_I32); + TCGv dummy = tcg_temp_new(); tcg_gen_qemu_ld32s(dummy, REG(B11_8), ctx->memidx); tcg_temp_free(dummy); } return; case 0x00b3: /* ocbwb @Rn */ { - TCGv dummy = tcg_temp_new(TCG_TYPE_I32); + TCGv dummy = tcg_temp_new(); tcg_gen_qemu_ld32s(dummy, REG(B11_8), ctx->memidx); tcg_temp_free(dummy); } @@ -1554,7 +1558,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x4024: /* rotcl Rn */ { - TCGv tmp = tcg_temp_new(TCG_TYPE_I32); + TCGv tmp = tcg_temp_new(); tcg_gen_mov_i32(tmp, cpu_sr); gen_copy_bit_i32(cpu_sr, 0, REG(B11_8), 31); tcg_gen_shli_i32(REG(B11_8), REG(B11_8), 1); @@ -1564,7 +1568,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0x4025: /* rotcr Rn */ { - TCGv tmp = tcg_temp_new(TCG_TYPE_I32); + TCGv tmp = tcg_temp_new(); tcg_gen_mov_i32(tmp, cpu_sr); gen_copy_bit_i32(cpu_sr, 0, REG(B11_8), 0); tcg_gen_shri_i32(REG(B11_8), REG(B11_8), 1); @@ -1629,7 +1633,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0xf00d: /* fsts FPUL,FRn - FPSCR: Nothing */ { - TCGv fp = tcg_temp_new(TCG_TYPE_I32); + TCGv fp = tcg_temp_new(); tcg_gen_mov_i32(fp, cpu_fpul); gen_store_fpr32(fp, FREG(B11_8)); tcg_temp_free(fp); @@ -1637,7 +1641,7 @@ static void _decode_opc(DisasContext * ctx) return; case 0xf01d: /* flds FRm,FPUL - FPSCR: Nothing */ { - TCGv fp = tcg_temp_new(TCG_TYPE_I32); + TCGv fp = tcg_temp_new(); gen_load_fpr32(fp, FREG(B11_8)); tcg_gen_mov_i32(cpu_fpul, fp); tcg_temp_free(fp); @@ -1645,120 +1649,120 @@ static void _decode_opc(DisasContext * ctx) return; case 0xf02d: /* float FPUL,FRn/DRn - FPSCR: R[PR,Enable.I]/W[Cause,Flag] */ if (ctx->fpscr & FPSCR_PR) { - TCGv fp; + TCGv_i64 fp; if (ctx->opcode & 0x0100) break; /* illegal instruction */ - fp = tcg_temp_new(TCG_TYPE_I64); - tcg_gen_helper_1_1(helper_float_DT, fp, cpu_fpul); + fp = tcg_temp_new_i64(); + gen_helper_float_DT(fp, cpu_fpul); gen_store_fpr64(fp, DREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i64(fp); } else { - TCGv fp = tcg_temp_new(TCG_TYPE_I32); - tcg_gen_helper_1_1(helper_float_FT, fp, cpu_fpul); + TCGv_i32 fp = tcg_temp_new_i32(); + gen_helper_float_FT(fp, cpu_fpul); gen_store_fpr32(fp, FREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i32(fp); } return; case 0xf03d: /* ftrc FRm/DRm,FPUL - FPSCR: R[PR,Enable.V]/W[Cause,Flag] */ if (ctx->fpscr & FPSCR_PR) { - TCGv fp; + TCGv_i64 fp; if (ctx->opcode & 0x0100) break; /* illegal instruction */ - fp = tcg_temp_new(TCG_TYPE_I64); + fp = tcg_temp_new_i64(); gen_load_fpr64(fp, DREG(B11_8)); - tcg_gen_helper_1_1(helper_ftrc_DT, cpu_fpul, fp); - tcg_temp_free(fp); + gen_helper_ftrc_DT(cpu_fpul, fp); + tcg_temp_free_i64(fp); } else { - TCGv fp = tcg_temp_new(TCG_TYPE_I32); + TCGv_i32 fp = tcg_temp_new_i32(); gen_load_fpr32(fp, FREG(B11_8)); - tcg_gen_helper_1_1(helper_ftrc_FT, cpu_fpul, fp); - tcg_temp_free(fp); + gen_helper_ftrc_FT(cpu_fpul, fp); + tcg_temp_free_i32(fp); } return; case 0xf04d: /* fneg FRn/DRn - FPSCR: Nothing */ { - TCGv fp = tcg_temp_new(TCG_TYPE_I32); + TCGv_i32 fp = tcg_temp_new_i32(); gen_load_fpr32(fp, FREG(B11_8)); - tcg_gen_helper_1_1(helper_fneg_T, fp, fp); + gen_helper_fneg_T(fp, fp); gen_store_fpr32(fp, FREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i32(fp); } return; case 0xf05d: /* fabs FRn/DRn */ if (ctx->fpscr & FPSCR_PR) { if (ctx->opcode & 0x0100) break; /* illegal instruction */ - TCGv fp = tcg_temp_new(TCG_TYPE_I64); + TCGv_i64 fp = tcg_temp_new_i64(); gen_load_fpr64(fp, DREG(B11_8)); - tcg_gen_helper_1_1(helper_fabs_DT, fp, fp); + gen_helper_fabs_DT(fp, fp); gen_store_fpr64(fp, DREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i64(fp); } else { - TCGv fp = tcg_temp_new(TCG_TYPE_I32); + TCGv_i32 fp = tcg_temp_new_i32(); gen_load_fpr32(fp, FREG(B11_8)); - tcg_gen_helper_1_1(helper_fabs_FT, fp, fp); + gen_helper_fabs_FT(fp, fp); gen_store_fpr32(fp, FREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i32(fp); } return; case 0xf06d: /* fsqrt FRn */ if (ctx->fpscr & FPSCR_PR) { if (ctx->opcode & 0x0100) break; /* illegal instruction */ - TCGv fp = tcg_temp_new(TCG_TYPE_I64); + TCGv_i64 fp = tcg_temp_new_i64(); gen_load_fpr64(fp, DREG(B11_8)); - tcg_gen_helper_1_1(helper_fsqrt_DT, fp, fp); + gen_helper_fsqrt_DT(fp, fp); gen_store_fpr64(fp, DREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i64(fp); } else { - TCGv fp = tcg_temp_new(TCG_TYPE_I32); + TCGv_i32 fp = tcg_temp_new_i32(); gen_load_fpr32(fp, FREG(B11_8)); - tcg_gen_helper_1_1(helper_fsqrt_FT, fp, fp); + gen_helper_fsqrt_FT(fp, fp); gen_store_fpr32(fp, FREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i32(fp); } return; case 0xf07d: /* fsrra FRn */ break; case 0xf08d: /* fldi0 FRn - FPSCR: R[PR] */ if (!(ctx->fpscr & FPSCR_PR)) { - TCGv val = tcg_const_i32(0); + TCGv_i32 val = tcg_const_i32(0); gen_load_fpr32(val, FREG(B11_8)); - tcg_temp_free(val); + tcg_temp_free_i32(val); return; } break; case 0xf09d: /* fldi1 FRn - FPSCR: R[PR] */ if (!(ctx->fpscr & FPSCR_PR)) { - TCGv val = tcg_const_i32(0x3f800000); + TCGv_i32 val = tcg_const_i32(0x3f800000); gen_load_fpr32(val, FREG(B11_8)); - tcg_temp_free(val); + tcg_temp_free_i32(val); return; } break; case 0xf0ad: /* fcnvsd FPUL,DRn */ { - TCGv fp = tcg_temp_new(TCG_TYPE_I64); - tcg_gen_helper_1_1(helper_fcnvsd_FT_DT, fp, cpu_fpul); + TCGv_i64 fp = tcg_temp_new_i64(); + gen_helper_fcnvsd_FT_DT(fp, cpu_fpul); gen_store_fpr64(fp, DREG(B11_8)); - tcg_temp_free(fp); + tcg_temp_free_i64(fp); } return; case 0xf0bd: /* fcnvds DRn,FPUL */ { - TCGv fp = tcg_temp_new(TCG_TYPE_I64); + TCGv_i64 fp = tcg_temp_new_i64(); gen_load_fpr64(fp, DREG(B11_8)); - tcg_gen_helper_1_1(helper_fcnvds_DT_FT, cpu_fpul, fp); - tcg_temp_free(fp); + gen_helper_fcnvds_DT_FT(cpu_fpul, fp); + tcg_temp_free_i64(fp); } return; } fprintf(stderr, "unknown instruction 0x%04x at pc 0x%08x\n", ctx->opcode, ctx->pc); - tcg_gen_helper_0_0(helper_raise_illegal_instruction); + gen_helper_raise_illegal_instruction(); ctx->bstate = BS_EXCP; } @@ -1837,7 +1841,7 @@ gen_intermediate_code_internal(CPUState * env, TranslationBlock * tb, if (ctx.pc == env->breakpoints[i]) { /* We have hit a breakpoint - make sure PC is up-to-date */ tcg_gen_movi_i32(cpu_pc, ctx.pc); - tcg_gen_helper_0_0(helper_debug); + gen_helper_debug(); ctx.bstate = BS_EXCP; break; } @@ -1879,7 +1883,7 @@ gen_intermediate_code_internal(CPUState * env, TranslationBlock * tb, gen_io_end(); if (env->singlestep_enabled) { tcg_gen_movi_i32(cpu_pc, ctx.pc); - tcg_gen_helper_0_0(helper_debug); + gen_helper_debug(); } else { switch (ctx.bstate) { case BS_STOP: -- cgit v1.1