target-mips: get rid of old debugging code
cover target-mips: get rid of old debugging code
This patchset get rid of old debugging code in translate.c, that has been superseded by other debugging way (e.g. (-d in_asm,op). It comes from the discussion there:
https://lists.gnu.org/archive/html/qemu-devel/2015-07/msg03162.html
I had it ready for some time, now that 2.4 has been release, it's probably time to apply it.
Aurelien Jarno (2):
target-mips: get rid of MIPS_DEBUG
target-mips: get rid of MIPS_DEBUG_SIGN_EXTENSIONS
target-mips/translate.c | 663 ++---------------------------------------------- 1 file changed, 19 insertions(+), 644 deletions(-)
Signature · 1 line
2.1.4
PATCH 1/2 target-mips: get rid of MIPS_DEBUG
MIPS_DEBUG is a define used to dump the instruction disassembling. It has to be defined at compile time. In practice I believe it's more efficient to just look at the instruction disassembly and op dump using -d in_asm,op. This patch therefore removes the corresponding code, which clutters translate.c.
--- target-mips/translate.c | 624 ++---------------------------------------------- 1 file changed, 19 insertions(+), 605 deletions(-)
target-mips/translate.c +19 -605
@@ -1482,26 +1482,23 @@ static const char * const msaregnames[] = { "w30.d0", "w30.d1", "w31.d0", "w31.d1", }; -#define MIPS_DEBUG (fmt, ...) \ +#define LOG_DISAS (...) \ do { \ if (MIPS_DEBUG_DISAS) { \ - qemu_log_mask(CPU_LOG_TB_IN_ASM, \ - TARGET_FMT_lx ": %08x " fmt "\n", \ - ctx->pc, ctx->opcode , ## __VA_ARGS__); \ + qemu_log_mask(CPU_LOG_TB_IN_ASM, ## __VA_ARGS__); \ } \ } while (0) -#define LOG_DISAS (...) \ +#define MIPS_INVAL (op) \ do { \ if (MIPS_DEBUG_DISAS) { \ - qemu_log_mask(CPU_LOG_TB_IN_ASM, ## __VA_ARGS__); \ + qemu_log_mask(CPU_LOG_TB_IN_ASM, \ + TARGET_FMT_lx ": %08x Invalid %s %03x %03x %03x\n", \ + ctx->pc, ctx->opcode, op, ctx->opcode >> 26, \ + ctx->opcode & 0x3F, ((ctx->opcode >> 16) & 0x1F)); \ } \ } while (0) -#define MIPS_INVAL (op) \ - MIPS_DEBUG("Invalid %s %03x %03x %03x", op, ctx->opcode >> 26, \ - ctx->opcode & 0x3F, ((ctx->opcode >> 16) & 0x1F)) -/* General purpose registers moves. */ static inline void gen_load_gpr (TCGv t,int reg) {
@@ -2105,14 +2102,12 @@ static target_ulong pc_relative_pc (DisasContext *ctx)static void gen_ld (DisasContext *ctx,uint32_t opc,int rt,int base,int16_t offset) { -const char *opn ="ld" ;TCGv t0, t1, t2;if (rt ==0 && ctx->insn_flags & (INSN_LOONGSON2E |INSN_LOONGSON2F )) {/* Loongson CPU uses a load to zero register for prefetch. We emulate it as a NOP. On other CPU we must perform the actual memory access. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -2125,20 +2120,17 @@ static void gen_ld(DisasContext *ctx, uint32_t opc,tcg_gen_qemu_ld_tl (t0, t0, ctx->mem_idx,MO_TEUL | ctx->default_tcg_memop_mask);gen_store_gpr (t0, rt); - opn ="lwu" ;break ;case OPC_LD :tcg_gen_qemu_ld_tl (t0, t0, ctx->mem_idx,MO_TEQ | ctx->default_tcg_memop_mask);gen_store_gpr (t0, rt); - opn ="ld" ;break ;case OPC_LLD :case R6_OPC_LLD :save_cpu_state (ctx,1 );op_ld_lld (t0, t0, ctx);gen_store_gpr (t0, rt); - opn ="lld" ;break ;case OPC_LDL : t1 =tcg_temp_new ();
@@ -2161,7 +2153,6 @@ static void gen_ld(DisasContext *ctx, uint32_t opc,tcg_gen_or_tl (t0, t0, t1);tcg_temp_free (t1);gen_store_gpr (t0, rt); - opn ="ldl" ;break ;case OPC_LDR : t1 =tcg_temp_new ();
@@ -2185,7 +2176,6 @@ static void gen_ld(DisasContext *ctx, uint32_t opc,tcg_gen_or_tl (t0, t0, t1);tcg_temp_free (t1);gen_store_gpr (t0, rt); - opn ="ldr" ;break ;case OPC_LDPC : t1 =tcg_const_tl (pc_relative_pc (ctx));
@@ -2193,7 +2183,6 @@ static void gen_ld(DisasContext *ctx, uint32_t opc,tcg_temp_free (t1);tcg_gen_qemu_ld_tl (t0, t0, ctx->mem_idx,MO_TEQ );gen_store_gpr (t0, rt); - opn ="ldpc" ;break ;#endif case OPC_LWPC :
@@ -2202,35 +2191,29 @@ static void gen_ld(DisasContext *ctx, uint32_t opc,tcg_temp_free (t1);tcg_gen_qemu_ld_tl (t0, t0, ctx->mem_idx,MO_TESL );gen_store_gpr (t0, rt); - opn ="lwpc" ;break ;case OPC_LW :tcg_gen_qemu_ld_tl (t0, t0, ctx->mem_idx,MO_TESL | ctx->default_tcg_memop_mask);gen_store_gpr (t0, rt); - opn ="lw" ;break ;case OPC_LH :tcg_gen_qemu_ld_tl (t0, t0, ctx->mem_idx,MO_TESW | ctx->default_tcg_memop_mask);gen_store_gpr (t0, rt); - opn ="lh" ;break ;case OPC_LHU :tcg_gen_qemu_ld_tl (t0, t0, ctx->mem_idx,MO_TEUW | ctx->default_tcg_memop_mask);gen_store_gpr (t0, rt); - opn ="lhu" ;break ;case OPC_LB :tcg_gen_qemu_ld_tl (t0, t0, ctx->mem_idx,MO_SB );gen_store_gpr (t0, rt); - opn ="lb" ;break ;case OPC_LBU :tcg_gen_qemu_ld_tl (t0, t0, ctx->mem_idx,MO_UB );gen_store_gpr (t0, rt); - opn ="lbu" ;break ;case OPC_LWL : t1 =tcg_temp_new ();
@@ -2254,7 +2237,6 @@ static void gen_ld(DisasContext *ctx, uint32_t opc,tcg_temp_free (t1);tcg_gen_ext32s_tl (t0, t0);gen_store_gpr (t0, rt); - opn ="lwl" ;break ;case OPC_LWR : t1 =tcg_temp_new ();
@@ -2279,18 +2261,14 @@ static void gen_ld(DisasContext *ctx, uint32_t opc,tcg_temp_free (t1);tcg_gen_ext32s_tl (t0, t0);gen_store_gpr (t0, rt); - opn ="lwr" ;break ;case OPC_LL :case R6_OPC_LL :save_cpu_state (ctx,1 );op_ld_ll (t0, t0, ctx);gen_store_gpr (t0, rt); - opn ="ll" ;break ; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %d(%s)" , opn, regnames[rt], offset, regnames[base]);tcg_temp_free (t0); }
@@ -2298,7 +2276,6 @@ static void gen_ld(DisasContext *ctx, uint32_t opc,static void gen_st (DisasContext *ctx,uint32_t opc,int rt,int base,int16_t offset) { -const char *opn ="st" ;TCGv t0 =tcg_temp_new ();TCGv t1 =tcg_temp_new ();
@@ -2309,46 +2286,36 @@ static void gen_st (DisasContext *ctx, uint32_t opc, int rt,case OPC_SD :tcg_gen_qemu_st_tl (t1, t0, ctx->mem_idx,MO_TEQ | ctx->default_tcg_memop_mask); - opn ="sd" ;break ;case OPC_SDL :save_cpu_state (ctx,1 );gen_helper_0e2i (sdl, t1, t0, ctx->mem_idx); - opn ="sdl" ;break ;case OPC_SDR :save_cpu_state (ctx,1 );gen_helper_0e2i (sdr, t1, t0, ctx->mem_idx); - opn ="sdr" ;break ;#endif case OPC_SW :tcg_gen_qemu_st_tl (t1, t0, ctx->mem_idx,MO_TEUL | ctx->default_tcg_memop_mask); - opn ="sw" ;break ;case OPC_SH :tcg_gen_qemu_st_tl (t1, t0, ctx->mem_idx,MO_TEUW | ctx->default_tcg_memop_mask); - opn ="sh" ;break ;case OPC_SB :tcg_gen_qemu_st_tl (t1, t0, ctx->mem_idx,MO_8 ); - opn ="sb" ;break ;case OPC_SWL :save_cpu_state (ctx,1 );gen_helper_0e2i (swl, t1, t0, ctx->mem_idx); - opn ="swl" ;break ;case OPC_SWR :save_cpu_state (ctx,1 );gen_helper_0e2i (swr, t1, t0, ctx->mem_idx); - opn ="swr" ;break ; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %d(%s)" , opn, regnames[rt], offset, regnames[base]);tcg_temp_free (t0);tcg_temp_free (t1); }
@@ -2358,7 +2325,6 @@ static void gen_st (DisasContext *ctx, uint32_t opc, int rt,static void gen_st_cond (DisasContext *ctx,uint32_t opc,int rt,int base,int16_t offset) { -const char *opn ="st_cond" ;TCGv t0, t1;#ifdef CONFIG_USER_ONLY
@@ -2376,18 +2342,14 @@ static void gen_st_cond (DisasContext *ctx, uint32_t opc, int rt,case R6_OPC_SCD :save_cpu_state (ctx,1 );op_st_scd (t1, t0, rt, ctx); - opn ="scd" ;break ;#endif case OPC_SC :case R6_OPC_SC :save_cpu_state (ctx,1 );op_st_sc (t1, t0, rt, ctx); - opn ="sc" ;break ; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %d(%s)" , opn, regnames[rt], offset, regnames[base]);tcg_temp_free (t1);tcg_temp_free (t0); }
@@ -2396,7 +2358,6 @@ static void gen_st_cond (DisasContext *ctx, uint32_t opc, int rt,static void gen_flt_ldst (DisasContext *ctx,uint32_t opc,int ft,int base,int16_t offset) { -const char *opn ="flt_ldst" ;TCGv t0 =tcg_temp_new ();gen_base_offset_addr (ctx, t0, base, offset);
@@ -2411,7 +2372,6 @@ static void gen_flt_ldst (DisasContext *ctx, uint32_t opc, int ft,gen_store_fpr32 (ctx, fp0, ft);tcg_temp_free_i32 (fp0); } - opn ="lwc1" ;break ;case OPC_SWC1 : {
@@ -2421,7 +2381,6 @@ static void gen_flt_ldst (DisasContext *ctx, uint32_t opc, int ft, ctx->default_tcg_memop_mask);tcg_temp_free_i32 (fp0); } - opn ="swc1" ;break ;case OPC_LDC1 : {
@@ -2431,7 +2390,6 @@ static void gen_flt_ldst (DisasContext *ctx, uint32_t opc, int ft,gen_store_fpr64 (ctx, fp0, ft);tcg_temp_free_i64 (fp0); } - opn ="ldc1" ;break ;case OPC_SDC1 : {
@@ -2441,15 +2399,12 @@ static void gen_flt_ldst (DisasContext *ctx, uint32_t opc, int ft, ctx->default_tcg_memop_mask);tcg_temp_free_i64 (fp0); } - opn ="sdc1" ;break ;default : -MIPS_INVAL (opn); +MIPS_INVAL ("flt_ldst" );generate_exception (ctx,EXCP_RI ); goto out; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %d(%s)" , opn, fregnames[ft], offset, regnames[base]); out:tcg_temp_free (t0); }
@@ -2477,12 +2432,10 @@ static void gen_arith_imm(DisasContext *ctx, uint32_t opc, int rt, int rs, int16_t imm) { target_ulong uimm = (target_long)imm; /* Sign extend to 32/64 bits */ -const char *opn ="imm arith" ;if (rt ==0 && opc !=OPC_ADDI && opc !=OPC_DADDI ) {/* If no destination, treat it as a NOP. For addi, we must generate the overflow exception when needed. */ -MIPS_DEBUG ("NOP" );return ; }switch (opc) {
@@ -2510,7 +2463,6 @@ static void gen_arith_imm(DisasContext *ctx, uint32_t opc,gen_store_gpr (t0, rt);tcg_temp_free (t0); } - opn ="addi" ;break ;case OPC_ADDIU :if (rs !=0 ) {
@@ -2519,7 +2471,6 @@ static void gen_arith_imm(DisasContext *ctx, uint32_t opc, }else {tcg_gen_movi_tl (cpu_gpr[rt], uimm); } - opn ="addiu" ;break ;#if defined(TARGET_MIPS64 )case OPC_DADDI :
@@ -2544,7 +2495,6 @@ static void gen_arith_imm(DisasContext *ctx, uint32_t opc,gen_store_gpr (t0, rt);tcg_temp_free (t0); } - opn ="daddi" ;break ;case OPC_DADDIU :if (rs !=0 ) {
@@ -2552,12 +2502,9 @@ static void gen_arith_imm(DisasContext *ctx, uint32_t opc, } else {tcg_gen_movi_tl (cpu_gpr[rt], uimm); } - opn ="daddiu" ;break ;#endif } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s, " TARGET_FMT_lx, opn, regnames[rt], regnames[rs], uimm); }/* Logic with immediate operand */
@@ -2568,7 +2515,6 @@ static void gen_logic_imm(DisasContext *ctx, uint32_t opc,if (rt ==0 ) {/* If no destination, treat it as a NOP. */ -MIPS_DEBUG ("NOP" );return ; } uimm = (uint16_t )imm;
@@ -2578,39 +2524,30 @@ static void gen_logic_imm(DisasContext *ctx, uint32_t opc,tcg_gen_andi_tl (cpu_gpr[rt], cpu_gpr[rs], uimm); else tcg_gen_movi_tl(cpu_gpr[rt], 0); -MIPS_DEBUG ("andi %s, %s, " TARGET_FMT_lx, regnames[rt], - regnames[rs], uimm);break ;case OPC_ORI :if (rs !=0 )tcg_gen_ori_tl (cpu_gpr[rt], cpu_gpr[rs], uimm);else tcg_gen_movi_tl (cpu_gpr[rt], uimm); -MIPS_DEBUG ("ori %s, %s, " TARGET_FMT_lx, regnames[rt], - regnames[rs], uimm);break ;case OPC_XORI :if (likely (rs !=0 ))tcg_gen_xori_tl (cpu_gpr[rt], cpu_gpr[rs], uimm);else tcg_gen_movi_tl (cpu_gpr[rt], uimm); -MIPS_DEBUG ("xori %s, %s, " TARGET_FMT_lx, regnames[rt], - regnames[rs], uimm);break ;case OPC_LUI :if (rs !=0 && (ctx->insn_flags &ISA_MIPS32R6 )) {/* OPC_AUI */ tcg_gen_addi_tl (cpu_gpr[rt], cpu_gpr[rs], imm <<16 );tcg_gen_ext32s_tl (cpu_gpr[rt], cpu_gpr[rt]); -MIPS_DEBUG ("aui %s, %s, %04x" , regnames[rt], regnames[rs], imm); }else {tcg_gen_movi_tl (cpu_gpr[rt], imm <<16 ); -MIPS_DEBUG ("lui %s, " TARGET_FMT_lx, regnames[rt], uimm); }break ;default : -MIPS_DEBUG ("Unknown logical immediate opcode %08x" , opc);break ; } }
@@ -2620,12 +2557,10 @@ static void gen_slt_imm(DisasContext *ctx, uint32_t opc, int rt, int rs, int16_t imm) { target_ulong uimm = (target_long)imm; /* Sign extend to 32/64 bits */ -const char *opn ="imm arith" ;TCGv t0;if (rt ==0 ) {/* If no destination, treat it as a NOP. */ -MIPS_DEBUG ("NOP" );return ; } t0 =tcg_temp_new ();
@@ -2633,15 +2568,11 @@ static void gen_slt_imm(DisasContext *ctx, uint32_t opc,switch (opc) {case OPC_SLTI :tcg_gen_setcondi_tl (TCG_COND_LT , cpu_gpr[rt], t0, uimm); - opn ="slti" ;break ;case OPC_SLTIU :tcg_gen_setcondi_tl (TCG_COND_LTU , cpu_gpr[rt], t0, uimm); - opn ="sltiu" ;break ; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s, " TARGET_FMT_lx, opn, regnames[rt], regnames[rs], uimm);tcg_temp_free (t0); }
@@ -2650,12 +2581,10 @@ static void gen_shift_imm(DisasContext *ctx, uint32_t opc, int rt, int rs, int16_t imm) { target_ulong uimm = ((uint16_t)imm) & 0x1f; -const char *opn ="imm shift" ;TCGv t0;if (rt ==0 ) {/* If no destination, treat it as a NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -2665,11 +2594,9 @@ static void gen_shift_imm(DisasContext *ctx, uint32_t opc,case OPC_SLL :tcg_gen_shli_tl (t0, t0, uimm);tcg_gen_ext32s_tl (cpu_gpr[rt], t0); - opn ="sll" ;break ;case OPC_SRA :tcg_gen_sari_tl (cpu_gpr[rt], t0, uimm); - opn ="sra" ;break ;case OPC_SRL :if (uimm !=0 ) {
@@ -2678,7 +2605,6 @@ static void gen_shift_imm(DisasContext *ctx, uint32_t opc, }else {tcg_gen_ext32s_tl (cpu_gpr[rt], t0); } - opn ="srl" ;break ;case OPC_ROTR :if (uimm !=0 ) {
@@ -2691,20 +2617,16 @@ static void gen_shift_imm(DisasContext *ctx, uint32_t opc, }else {tcg_gen_ext32s_tl (cpu_gpr[rt], t0); } - opn ="rotr" ;break ;#if defined(TARGET_MIPS64 )case OPC_DSLL :tcg_gen_shli_tl (cpu_gpr[rt], t0, uimm); - opn ="dsll" ;break ;case OPC_DSRA :tcg_gen_sari_tl (cpu_gpr[rt], t0, uimm); - opn ="dsra" ;break ;case OPC_DSRL :tcg_gen_shri_tl (cpu_gpr[rt], t0, uimm); - opn ="dsrl" ;break ;case OPC_DROTR :if (uimm !=0 ) {
@@ -2712,28 +2634,21 @@ static void gen_shift_imm(DisasContext *ctx, uint32_t opc, } else {tcg_gen_mov_tl (cpu_gpr[rt], t0); } - opn ="drotr" ;break ;case OPC_DSLL32 :tcg_gen_shli_tl (cpu_gpr[rt], t0, uimm +32 ); - opn ="dsll32" ;break ;case OPC_DSRA32 :tcg_gen_sari_tl (cpu_gpr[rt], t0, uimm +32 ); - opn ="dsra32" ;break ;case OPC_DSRL32 :tcg_gen_shri_tl (cpu_gpr[rt], t0, uimm +32 ); - opn ="dsrl32" ;break ;case OPC_DROTR32 :tcg_gen_rotri_tl (cpu_gpr[rt], t0, uimm +32 ); - opn ="drotr32" ;break ;#endif } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s, " TARGET_FMT_lx, opn, regnames[rt], regnames[rs], uimm);tcg_temp_free (t0); }
@@ -2741,13 +2656,10 @@ static void gen_shift_imm(DisasContext *ctx, uint32_t opc,static void gen_arith (DisasContext *ctx,uint32_t opc,int rd,int rs,int rt) { -const char *opn ="arith" ; -if (rd ==0 && opc !=OPC_ADD && opc !=OPC_SUB && opc !=OPC_DADD && opc !=OPC_DSUB ) {/* If no destination, treat it as a NOP. For add & sub, we must generate the overflow exception when needed. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -2775,7 +2687,6 @@ static void gen_arith(DisasContext *ctx, uint32_t opc,gen_store_gpr (t0, rd);tcg_temp_free (t0); } - opn ="add" ;break ;case OPC_ADDU :if (rs !=0 && rt !=0 ) {
@@ -2788,7 +2699,6 @@ static void gen_arith(DisasContext *ctx, uint32_t opc, }else {tcg_gen_movi_tl (cpu_gpr[rd],0 ); } - opn ="addu" ;break ;case OPC_SUB : {
@@ -2813,7 +2723,6 @@ static void gen_arith(DisasContext *ctx, uint32_t opc,gen_store_gpr (t0, rd);tcg_temp_free (t0); } - opn ="sub" ;break ;case OPC_SUBU :if (rs !=0 && rt !=0 ) {
@@ -2827,7 +2736,6 @@ static void gen_arith(DisasContext *ctx, uint32_t opc, }else {tcg_gen_movi_tl (cpu_gpr[rd],0 ); } - opn ="subu" ;break ;#if defined(TARGET_MIPS64 )case OPC_DADD :
@@ -2852,7 +2760,6 @@ static void gen_arith(DisasContext *ctx, uint32_t opc,gen_store_gpr (t0, rd);tcg_temp_free (t0); } - opn ="dadd" ;break ;case OPC_DADDU :if (rs !=0 && rt !=0 ) {
@@ -2864,7 +2771,6 @@ static void gen_arith(DisasContext *ctx, uint32_t opc, }else {tcg_gen_movi_tl (cpu_gpr[rd],0 ); } - opn ="daddu" ;break ;case OPC_DSUB : {
@@ -2888,7 +2794,6 @@ static void gen_arith(DisasContext *ctx, uint32_t opc,gen_store_gpr (t0, rd);tcg_temp_free (t0); } - opn ="dsub" ;break ;case OPC_DSUBU :if (rs !=0 && rt !=0 ) {
@@ -2900,7 +2805,6 @@ static void gen_arith(DisasContext *ctx, uint32_t opc, } else {tcg_gen_movi_tl (cpu_gpr[rd],0 ); } - opn ="dsubu" ;break ;#endif case OPC_MUL :
@@ -2910,23 +2814,18 @@ static void gen_arith(DisasContext *ctx, uint32_t opc, }else {tcg_gen_movi_tl (cpu_gpr[rd],0 ); } - opn ="mul" ;break ; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s, %s" , opn, regnames[rd], regnames[rs], regnames[rt]); }/* Conditional move */ static void gen_cond_move (DisasContext *ctx,uint32_t opc,int rd,int rs,int rt) { -const char *opn ="cond move" ;TCGv t0, t1, t2;if (rd ==0 ) {/* If no destination, treat it as a NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -2938,38 +2837,28 @@ static void gen_cond_move(DisasContext *ctx, uint32_t opc,switch (opc) {case OPC_MOVN :tcg_gen_movcond_tl (TCG_COND_NE , cpu_gpr[rd], t0, t1, t2, cpu_gpr[rd]); - opn ="movn" ;break ;case OPC_MOVZ :tcg_gen_movcond_tl (TCG_COND_EQ , cpu_gpr[rd], t0, t1, t2, cpu_gpr[rd]); - opn ="movz" ;break ;case OPC_SELNEZ :tcg_gen_movcond_tl (TCG_COND_NE , cpu_gpr[rd], t0, t1, t2, t1); - opn ="selnez" ;break ;case OPC_SELEQZ :tcg_gen_movcond_tl (TCG_COND_EQ , cpu_gpr[rd], t0, t1, t2, t1); - opn ="seleqz" ;break ; }tcg_temp_free (t2);tcg_temp_free (t1);tcg_temp_free (t0); - - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s, %s" , opn, regnames[rd], regnames[rs], regnames[rt]); }/* Logic */ static void gen_logic (DisasContext *ctx,uint32_t opc,int rd,int rs,int rt) { -const char *opn ="logic" ; -if (rd ==0 ) {/* If no destination, treat it as a NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -2980,7 +2869,6 @@ static void gen_logic(DisasContext *ctx, uint32_t opc, }else {tcg_gen_movi_tl (cpu_gpr[rd],0 ); } - opn ="and" ;break ;case OPC_NOR :if (rs !=0 && rt !=0 ) {
@@ -2992,7 +2880,6 @@ static void gen_logic(DisasContext *ctx, uint32_t opc, }else {tcg_gen_movi_tl (cpu_gpr[rd], ~((target_ulong )0 )); } - opn ="nor" ;break ;case OPC_OR :if (likely (rs !=0 && rt !=0 )) {
@@ -3004,7 +2891,6 @@ static void gen_logic(DisasContext *ctx, uint32_t opc, }else {tcg_gen_movi_tl (cpu_gpr[rd],0 ); } - opn ="or" ;break ;case OPC_XOR :if (likely (rs !=0 && rt !=0 )) {
@@ -3016,23 +2902,18 @@ static void gen_logic(DisasContext *ctx, uint32_t opc, }else {tcg_gen_movi_tl (cpu_gpr[rd],0 ); } - opn ="xor" ;break ; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s, %s" , opn, regnames[rd], regnames[rs], regnames[rt]); }/* Set on lower than */ static void gen_slt (DisasContext *ctx,uint32_t opc,int rd,int rs,int rt) { -const char *opn ="slt" ;TCGv t0, t1;if (rd ==0 ) {/* If no destination, treat it as a NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -3043,15 +2924,11 @@ static void gen_slt(DisasContext *ctx, uint32_t opc,switch (opc) {case OPC_SLT :tcg_gen_setcond_tl (TCG_COND_LT , cpu_gpr[rd], t0, t1); - opn ="slt" ;break ;case OPC_SLTU :tcg_gen_setcond_tl (TCG_COND_LTU , cpu_gpr[rd], t0, t1); - opn ="sltu" ;break ; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s, %s" , opn, regnames[rd], regnames[rs], regnames[rt]);tcg_temp_free (t0);tcg_temp_free (t1); }
@@ -3060,13 +2937,11 @@ static void gen_slt(DisasContext *ctx, uint32_t opc,static void gen_shift (DisasContext *ctx,uint32_t opc,int rd,int rs,int rt) { -const char *opn ="shifts" ;TCGv t0, t1;if (rd ==0 ) {/* If no destination, treat it as a NOP. For add & sub, we must generate the overflow exception when needed. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -3079,19 +2954,16 @@ static void gen_shift(DisasContext *ctx, uint32_t opc,tcg_gen_andi_tl (t0, t0,0x1f );tcg_gen_shl_tl (t0, t1, t0);tcg_gen_ext32s_tl (cpu_gpr[rd], t0); - opn ="sllv" ;break ;case OPC_SRAV :tcg_gen_andi_tl (t0, t0,0x1f );tcg_gen_sar_tl (cpu_gpr[rd], t1, t0); - opn ="srav" ;break ;case OPC_SRLV :tcg_gen_ext32u_tl (t1, t1);tcg_gen_andi_tl (t0, t0,0x1f );tcg_gen_shr_tl (t0, t1, t0);tcg_gen_ext32s_tl (cpu_gpr[rd], t0); - opn ="srlv" ;break ;case OPC_ROTRV : {
@@ -3105,34 +2977,27 @@ static void gen_shift(DisasContext *ctx, uint32_t opc,tcg_gen_ext_i32_tl (cpu_gpr[rd], t2);tcg_temp_free_i32 (t2);tcg_temp_free_i32 (t3); - opn ="rotrv" ; }break ;#if defined(TARGET_MIPS64 )case OPC_DSLLV :tcg_gen_andi_tl (t0, t0,0x3f );tcg_gen_shl_tl (cpu_gpr[rd], t1, t0); - opn ="dsllv" ;break ;case OPC_DSRAV :tcg_gen_andi_tl (t0, t0,0x3f );tcg_gen_sar_tl (cpu_gpr[rd], t1, t0); - opn ="dsrav" ;break ;case OPC_DSRLV :tcg_gen_andi_tl (t0, t0,0x3f );tcg_gen_shr_tl (cpu_gpr[rd], t1, t0); - opn ="dsrlv" ;break ;case OPC_DROTRV :tcg_gen_andi_tl (t0, t0,0x3f );tcg_gen_rotr_tl (cpu_gpr[rd], t1, t0); - opn ="drotrv" ;break ;#endif } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s, %s" , opn, regnames[rd], regnames[rs], regnames[rt]);tcg_temp_free (t0);tcg_temp_free (t1); }
@@ -3140,11 +3005,8 @@ static void gen_shift(DisasContext *ctx, uint32_t opc,/* Arithmetic on HI/LO registers */ static void gen_HILO (DisasContext *ctx,uint32_t opc,int acc,int reg) { -const char *opn ="hilo" ; -if (reg ==0 && (opc ==OPC_MFHI || opc ==OPC_MFLO )) {/* Treat as NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -3162,7 +3024,6 @@ static void gen_HILO(DisasContext *ctx, uint32_t opc, int acc, int reg) {tcg_gen_mov_tl (cpu_gpr[reg], cpu_HI[acc]); } - opn ="mfhi" ;break ;case OPC_MFLO :#if defined(TARGET_MIPS64 )
@@ -3173,7 +3034,6 @@ static void gen_HILO(DisasContext *ctx, uint32_t opc, int acc, int reg) {tcg_gen_mov_tl (cpu_gpr[reg], cpu_LO[acc]); } - opn ="mflo" ;break ;case OPC_MTHI :if (reg !=0 ) {
@@ -3188,7 +3048,6 @@ static void gen_HILO(DisasContext *ctx, uint32_t opc, int acc, int reg) }else {tcg_gen_movi_tl (cpu_HI[acc],0 ); } - opn ="mthi" ;break ;case OPC_MTLO :if (reg !=0 ) {
@@ -3203,11 +3062,8 @@ static void gen_HILO(DisasContext *ctx, uint32_t opc, int acc, int reg) }else {tcg_gen_movi_tl (cpu_LO[acc],0 ); } - opn ="mtlo" ;break ; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s" , opn, regnames[reg]); } static inline void gen_r6_ld(target_long addr, int reg, int memidx,
@@ -3284,12 +3140,10 @@ static inline void gen_pcrel(DisasContext *ctx, int opc, target_ulong pc,static void gen_r6_muldiv (DisasContext *ctx,int opc,int rd,int rs,int rt) { -const char *opn ="r6 mul/div" ;TCGv t0, t1;if (rd ==0 ) {/* Treat as NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -3318,7 +3172,6 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_temp_free (t3);tcg_temp_free (t2); } - opn ="div" ;break ;case R6_OPC_MOD : {
@@ -3338,7 +3191,6 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_temp_free (t3);tcg_temp_free (t2); } - opn ="mod" ;break ;case R6_OPC_DIVU : {
@@ -3352,7 +3204,6 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_temp_free (t3);tcg_temp_free (t2); } - opn ="divu" ;break ;case R6_OPC_MODU : {
@@ -3366,7 +3217,6 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_temp_free (t3);tcg_temp_free (t2); } - opn ="modu" ;break ;case R6_OPC_MUL : {
@@ -3379,7 +3229,6 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_temp_free_i32 (t2);tcg_temp_free_i32 (t3); } - opn ="mul" ;break ;case R6_OPC_MUH : {
@@ -3392,7 +3241,6 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_temp_free_i32 (t2);tcg_temp_free_i32 (t3); } - opn ="muh" ;break ;case R6_OPC_MULU : {
@@ -3405,7 +3253,6 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_temp_free_i32 (t2);tcg_temp_free_i32 (t3); } - opn ="mulu" ;break ;case R6_OPC_MUHU : {
@@ -3418,7 +3265,6 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_temp_free_i32 (t2);tcg_temp_free_i32 (t3); } - opn ="muhu" ;break ;#if defined(TARGET_MIPS64 )case R6_OPC_DDIV :
@@ -3436,7 +3282,6 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_temp_free (t3);tcg_temp_free (t2); } - opn ="ddiv" ;break ;case R6_OPC_DMOD : {
@@ -3453,7 +3298,6 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_temp_free (t3);tcg_temp_free (t2); } - opn ="dmod" ;break ;case R6_OPC_DDIVU : {
@@ -3464,7 +3308,6 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_temp_free (t3);tcg_temp_free (t2); } - opn ="ddivu" ;break ;case R6_OPC_DMODU : {
@@ -3475,11 +3318,9 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_temp_free (t3);tcg_temp_free (t2); } - opn ="dmodu" ;break ;case R6_OPC_DMUL :tcg_gen_mul_i64 (cpu_gpr[rd], t0, t1); - opn ="dmul" ;break ;case R6_OPC_DMUH : {
@@ -3487,11 +3328,9 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_gen_muls2_i64 (t2, cpu_gpr[rd], t0, t1);tcg_temp_free (t2); } - opn ="dmuh" ;break ;case R6_OPC_DMULU :tcg_gen_mul_i64 (cpu_gpr[rd], t0, t1); - opn ="dmulu" ;break ;case R6_OPC_DMUHU : {
@@ -3499,16 +3338,13 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)tcg_gen_mulu2_i64 (t2, cpu_gpr[rd], t0, t1); tcg_temp_free(t2); } - opn ="dmuhu" ;break ;#endif default : -MIPS_INVAL (opn); +MIPS_INVAL ("r6 mul/div" );generate_exception (ctx,EXCP_RI ); goto out; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s %s" , opn, regnames[rs], regnames[rt]); out:tcg_temp_free (t0);tcg_temp_free (t1);
@@ -3517,7 +3353,6 @@ static void gen_r6_muldiv(DisasContext *ctx, int opc, int rd, int rs, int rt)static void gen_muldiv (DisasContext *ctx,uint32_t opc,int acc,int rs,int rt) { -const char *opn ="mul/div" ;TCGv t0, t1; t0 =tcg_temp_new ();
@@ -3551,7 +3386,6 @@ static void gen_muldiv(DisasContext *ctx, uint32_t opc,tcg_temp_free (t3);tcg_temp_free (t2); } - opn ="div" ;break ;case OPC_DIVU : {
@@ -3567,7 +3401,6 @@ static void gen_muldiv(DisasContext *ctx, uint32_t opc,tcg_temp_free (t3);tcg_temp_free (t2); } - opn ="divu" ;break ;case OPC_MULT : {
@@ -3581,7 +3414,6 @@ static void gen_muldiv(DisasContext *ctx, uint32_t opc,tcg_temp_free_i32 (t2);tcg_temp_free_i32 (t3); } - opn ="mult" ;break ;case OPC_MULTU : {
@@ -3595,7 +3427,6 @@ static void gen_muldiv(DisasContext *ctx, uint32_t opc,tcg_temp_free_i32 (t2);tcg_temp_free_i32 (t3); } - opn ="multu" ;break ;#if defined(TARGET_MIPS64 )case OPC_DDIV :
@@ -3614,7 +3445,6 @@ static void gen_muldiv(DisasContext *ctx, uint32_t opc,tcg_temp_free (t3);tcg_temp_free (t2); } - opn ="ddiv" ;break ;case OPC_DDIVU : {
@@ -3626,15 +3456,12 @@ static void gen_muldiv(DisasContext *ctx, uint32_t opc,tcg_temp_free (t3); tcg_temp_free(t2); } - opn ="ddivu" ;break ;case OPC_DMULT :tcg_gen_muls2_i64 (cpu_LO[acc], cpu_HI[acc], t0, t1); - opn ="dmult" ;break ;case OPC_DMULTU :tcg_gen_mulu2_i64 (cpu_LO[acc], cpu_HI[acc], t0, t1); - opn ="dmultu" ;break ;#endif case OPC_MADD :
@@ -3655,7 +3482,6 @@ static void gen_muldiv(DisasContext *ctx, uint32_t opc,tcg_gen_ext32s_tl (cpu_LO[acc], t0);tcg_gen_ext32s_tl (cpu_HI[acc], t1); } - opn ="madd" ;break ;case OPC_MADDU : {
@@ -3677,7 +3503,6 @@ static void gen_muldiv(DisasContext *ctx, uint32_t opc,tcg_gen_ext32s_tl (cpu_LO[acc], t0);tcg_gen_ext32s_tl (cpu_HI[acc], t1); } - opn ="maddu" ;break ;case OPC_MSUB : {
@@ -3697,7 +3522,6 @@ static void gen_muldiv(DisasContext *ctx, uint32_t opc,tcg_gen_ext32s_tl (cpu_LO[acc], t0);tcg_gen_ext32s_tl (cpu_HI[acc], t1); } - opn ="msub" ;break ;case OPC_MSUBU : {
@@ -3719,15 +3543,12 @@ static void gen_muldiv(DisasContext *ctx, uint32_t opc,tcg_gen_ext32s_tl (cpu_LO[acc], t0);tcg_gen_ext32s_tl (cpu_HI[acc], t1); } - opn ="msubu" ;break ;default : -MIPS_INVAL (opn); +MIPS_INVAL ("mul/div" );generate_exception (ctx,EXCP_RI ); goto out; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s %s" , opn, regnames[rs], regnames[rt]); out:tcg_temp_free (t0);tcg_temp_free (t1);
@@ -3736,7 +3557,6 @@ static void gen_muldiv(DisasContext *ctx, uint32_t opc,static void gen_mul_vr54xx (DisasContext *ctx,uint32_t opc,int rd,int rs,int rt) { -const char *opn ="mul vr54xx" ;TCGv t0 =tcg_temp_new ();TCGv t1 =tcg_temp_new ();
@@ -3746,59 +3566,45 @@ static void gen_mul_vr54xx (DisasContext *ctx, uint32_t opc,switch (opc) {case OPC_VR54XX_MULS :gen_helper_muls (t0, cpu_env, t0, t1); - opn ="muls" ;break ;case OPC_VR54XX_MULSU :gen_helper_mulsu (t0, cpu_env, t0, t1); - opn ="mulsu" ;break ;case OPC_VR54XX_MACC :gen_helper_macc (t0, cpu_env, t0, t1); - opn ="macc" ;break ;case OPC_VR54XX_MACCU :gen_helper_maccu (t0, cpu_env, t0, t1); - opn ="maccu" ;break ;case OPC_VR54XX_MSAC :gen_helper_msac (t0, cpu_env, t0, t1); - opn ="msac" ;break ;case OPC_VR54XX_MSACU :gen_helper_msacu (t0, cpu_env, t0, t1); - opn ="msacu" ;break ;case OPC_VR54XX_MULHI :gen_helper_mulhi (t0, cpu_env, t0, t1); - opn ="mulhi" ;break ;case OPC_VR54XX_MULHIU :gen_helper_mulhiu (t0, cpu_env, t0, t1); - opn ="mulhiu" ;break ;case OPC_VR54XX_MULSHI :gen_helper_mulshi (t0, cpu_env, t0, t1); - opn ="mulshi" ;break ;case OPC_VR54XX_MULSHIU :gen_helper_mulshiu (t0, cpu_env, t0, t1); - opn ="mulshiu" ;break ;case OPC_VR54XX_MACCHI :gen_helper_macchi (t0, cpu_env, t0, t1); - opn ="macchi" ;break ;case OPC_VR54XX_MACCHIU :gen_helper_macchiu (t0, cpu_env, t0, t1); - opn ="macchiu" ;break ;case OPC_VR54XX_MSACHI :gen_helper_msachi (t0, cpu_env, t0, t1); - opn ="msachi" ;break ;case OPC_VR54XX_MSACHIU :gen_helper_msachiu (t0, cpu_env, t0, t1); - opn ="msachiu" ;break ;default :MIPS_INVAL ("mul vr54xx" );
@@ -3806,8 +3612,6 @@ static void gen_mul_vr54xx (DisasContext *ctx, uint32_t opc, goto out; }gen_store_gpr (t0, rd); - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s, %s" , opn, regnames[rd], regnames[rs], regnames[rt]); out:tcg_temp_free (t0);
@@ -3817,12 +3621,10 @@ static void gen_mul_vr54xx (DisasContext *ctx, uint32_t opc,static void gen_cl (DisasContext *ctx,uint32_t opc,int rd,int rs) { -const char *opn ="CLx" ;TCGv t0;if (rd ==0 ) {/* Treat as NOP. */ -MIPS_DEBUG ("NOP" );return ; } t0 =tcg_temp_new ();
@@ -3831,28 +3633,22 @@ static void gen_cl (DisasContext *ctx, uint32_t opc,case OPC_CLO :case R6_OPC_CLO :gen_helper_clo (cpu_gpr[rd], t0); - opn ="clo" ;break ;case OPC_CLZ :case R6_OPC_CLZ :gen_helper_clz (cpu_gpr[rd], t0); - opn ="clz" ;break ;#if defined(TARGET_MIPS64 )case OPC_DCLO :case R6_OPC_DCLO :gen_helper_dclo (cpu_gpr[rd], t0); - opn ="dclo" ;break ;case OPC_DCLZ :case R6_OPC_DCLZ :gen_helper_dclz (cpu_gpr[rd], t0); - opn ="dclz" ;break ;#endif } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s" , opn, regnames[rd], regnames[rs]);tcg_temp_free (t0); }
@@ -3860,12 +3656,10 @@ static void gen_cl (DisasContext *ctx, uint32_t opc,static void gen_loongson_integer (DisasContext *ctx,uint32_t opc,int rd,int rs,int rt) { -const char *opn ="loongson" ;TCGv t0, t1;if (rd ==0 ) {/* Treat as NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -3897,7 +3691,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc,case OPC_MULT_G_2F :tcg_gen_mul_tl (cpu_gpr[rd], t0, t1);tcg_gen_ext32s_tl (cpu_gpr[rd], cpu_gpr[rd]); - opn ="mult.g" ;break ;case OPC_MULTU_G_2E :case OPC_MULTU_G_2F :
@@ -3905,7 +3698,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc,tcg_gen_ext32u_tl (t1, t1);tcg_gen_mul_tl (cpu_gpr[rd], t0, t1);tcg_gen_ext32s_tl (cpu_gpr[rd], cpu_gpr[rd]); - opn ="multu.g" ;break ;case OPC_DIV_G_2E :case OPC_DIV_G_2F :
@@ -3928,7 +3720,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc,tcg_gen_ext32s_tl (cpu_gpr[rd], cpu_gpr[rd]);gen_set_label (l3); } - opn ="div.g" ;break ;case OPC_DIVU_G_2E :case OPC_DIVU_G_2F :
@@ -3945,7 +3736,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc,tcg_gen_ext32s_tl (cpu_gpr[rd], cpu_gpr[rd]);gen_set_label (l2); } - opn ="divu.g" ;break ;case OPC_MOD_G_2E :case OPC_MOD_G_2F :
@@ -3966,7 +3756,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc,tcg_gen_ext32s_tl (cpu_gpr[rd], cpu_gpr[rd]);gen_set_label (l3); } - opn ="mod.g" ;break ;case OPC_MODU_G_2E :case OPC_MODU_G_2F :
@@ -3983,18 +3772,15 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc,tcg_gen_ext32s_tl (cpu_gpr[rd], cpu_gpr[rd]);gen_set_label (l2); } - opn ="modu.g" ;break ;#if defined(TARGET_MIPS64 )case OPC_DMULT_G_2E :case OPC_DMULT_G_2F :tcg_gen_mul_tl (cpu_gpr[rd], t0, t1); - opn ="dmult.g" ;break ;case OPC_DMULTU_G_2E :case OPC_DMULTU_G_2F :tcg_gen_mul_tl (cpu_gpr[rd], t0, t1); - opn ="dmultu.g" ;break ;case OPC_DDIV_G_2E :case OPC_DDIV_G_2F :
@@ -4014,7 +3800,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc,tcg_gen_div_tl (cpu_gpr[rd], t0, t1);gen_set_label (l3); } - opn ="ddiv.g" ;break ;case OPC_DDIVU_G_2E :case OPC_DDIVU_G_2F :
@@ -4028,7 +3813,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc,tcg_gen_divu_tl (cpu_gpr[rd], t0, t1);gen_set_label (l2); } - opn ="ddivu.g" ;break ;case OPC_DMOD_G_2E :case OPC_DMOD_G_2F :
@@ -4046,7 +3830,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc,tcg_gen_rem_tl (cpu_gpr[rd], t0, t1);gen_set_label (l3); } - opn ="dmod.g" ;break ;case OPC_DMODU_G_2E :case OPC_DMODU_G_2F :
@@ -4060,13 +3843,10 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc,tcg_gen_remu_tl (cpu_gpr[rd], t0, t1); gen_set_label(l2); } - opn ="dmodu.g" ;break ;#endif } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s" , opn, regnames[rd], regnames[rs]);tcg_temp_free (t0);tcg_temp_free (t1); }
@@ -4074,7 +3854,6 @@ static void gen_loongson_integer(DisasContext *ctx, uint32_t opc,/* Loongson multimedia instructions */ static void gen_loongson_multimedia (DisasContext *ctx,int rd,int rs,int rt) { -const char *opn ="loongson_cp2" ;uint32_t opc, shift_max;TCGv_i64 t0, t1;
@@ -4097,11 +3876,11 @@ static void gen_loongson_multimedia(DisasContext *ctx, int rd, int rs, int rt)gen_load_fpr64 (ctx, t1, rt);#define LMI_HELPER (UP ,LO ) \ - case OPC_##UP: gen_helper_##LO(t0, t0, t1); opn = #LO; break + case OPC_##UP: gen_helper_##LO(t0, t0, t1); break#define LMI_HELPER_1 (UP ,LO ) \ - case OPC_##UP: gen_helper_##LO(t0, t0); opn = #LO; break + case OPC_##UP: gen_helper_##LO(t0, t0); break#define LMI_DIRECT (UP ,LO ,OP ) \ - case OPC_##UP: tcg_gen_##OP##_i64(t0, t0, t1); opn = #LO; break + case OPC_##UP: tcg_gen_##OP##_i64(t0, t0, t1); breakswitch (opc) {LMI_HELPER (PADDSH , paddsh);
@@ -4172,19 +3951,15 @@ static void gen_loongson_multimedia(DisasContext *ctx, int rd, int rs, int rt)case OPC_PINSRH_0 :tcg_gen_deposit_i64 (t0, t0, t1,0 ,16 ); - opn ="pinsrh_0" ;break ;case OPC_PINSRH_1 :tcg_gen_deposit_i64 (t0, t0, t1,16 ,16 ); - opn ="pinsrh_1" ;break ;case OPC_PINSRH_2 :tcg_gen_deposit_i64 (t0, t0, t1,32 ,16 ); - opn ="pinsrh_2" ;break ;case OPC_PINSRH_3 :tcg_gen_deposit_i64 (t0, t0, t1,48 ,16 ); - opn ="pinsrh_3" ;break ;case OPC_PEXTRH :
@@ -4192,42 +3967,33 @@ static void gen_loongson_multimedia(DisasContext *ctx, int rd, int rs, int rt)tcg_gen_shli_i64 (t1, t1,4 );tcg_gen_shr_i64 (t0, t0, t1);tcg_gen_ext16u_i64 (t0, t0); - opn ="pextrh" ;break ;case OPC_ADDU_CP2 :tcg_gen_add_i64 (t0, t0, t1);tcg_gen_ext32s_i64 (t0, t0); - opn ="addu" ;break ;case OPC_SUBU_CP2 :tcg_gen_sub_i64 (t0, t0, t1);tcg_gen_ext32s_i64 (t0, t0); - opn ="addu" ;break ;case OPC_SLL_CP2 : - opn ="sll" ; shift_max =32 ; goto do_shift;case OPC_SRL_CP2 : - opn ="srl" ; shift_max =32 ; goto do_shift;case OPC_SRA_CP2 : - opn ="sra" ; shift_max =32 ; goto do_shift;case OPC_DSLL_CP2 : - opn ="dsll" ; shift_max =64 ; goto do_shift;case OPC_DSRL_CP2 : - opn ="dsrl" ; shift_max =64 ; goto do_shift;case OPC_DSRA_CP2 : - opn ="dsra" ; shift_max =64 ; goto do_shift; do_shift:
@@ -4282,8 +4048,6 @@ static void gen_loongson_multimedia(DisasContext *ctx, int rd, int rs, int rt)tcg_gen_brcondi_i64 (TCG_COND_GE , t1,0 , lab);generate_exception (ctx,EXCP_OVERFLOW );gen_set_label (lab); - - opn = (opc ==OPC_ADD_CP2 ?"add" :"dadd" );break ; }
@@ -4305,8 +4069,6 @@ static void gen_loongson_multimedia(DisasContext *ctx, int rd, int rs, int rt)tcg_gen_brcondi_i64 (TCG_COND_GE , t1,0 , lab);generate_exception (ctx,EXCP_OVERFLOW );gen_set_label (lab); - - opn = (opc ==OPC_SUB_CP2 ?"sub" :"dsub" );break ; }
@@ -4314,7 +4076,6 @@ static void gen_loongson_multimedia(DisasContext *ctx, int rd, int rs, int rt)tcg_gen_ext32u_i64 (t0, t0);tcg_gen_ext32u_i64 (t1, t1);tcg_gen_mul_i64 (t0, t0, t1); - opn ="pmuluw" ;break ;case OPC_SEQU_CP2 :
@@ -4326,7 +4087,7 @@ static void gen_loongson_multimedia(DisasContext *ctx, int rd, int rs, int rt)/* ??? Document is unclear: Set FCC[CC]. Does that mean the FD field is the CC field? */ default : -MIPS_INVAL (opn); +MIPS_INVAL ("loongson_cp2" );generate_exception (ctx,EXCP_RI );return ; }
@@ -4336,9 +4097,6 @@ static void gen_loongson_multimedia(DisasContext *ctx, int rd, int rs, int rt)gen_store_fpr64 (ctx, t0, rd); - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s, %s" , opn, - fregnames[rd], fregnames[rs], fregnames[rt]);tcg_temp_free_i64 (t0);tcg_temp_free_i64 (t1); }
@@ -4554,20 +4312,17 @@ static void gen_compute_branch (DisasContext *ctx, uint32_t opc,case OPC_BLEZL :/* 0 <= 0 likely */ /* Always take */ ctx->hflags |=MIPS_HFLAG_B ; -MIPS_DEBUG ("balways" );break ;case OPC_BGEZAL :/* 0 >= 0 */ case OPC_BGEZALL :/* 0 >= 0 likely */ /* Always take and link */ blink =31 ; ctx->hflags |=MIPS_HFLAG_B ; -MIPS_DEBUG ("balways and link" );break ;case OPC_BNE :/* rx != rx */ case OPC_BGTZ :/* 0 > 0 */ case OPC_BLTZ :/* 0 < 0 */ /* Treat as NOP. */ -MIPS_DEBUG ("bnever (NOP)" ); goto out;case OPC_BLTZAL :/* 0 < 0 */ /* Handle as an unconditional branch to get correct delay
@@ -4575,24 +4330,20 @@ static void gen_compute_branch (DisasContext *ctx, uint32_t opc, blink =31 ; btgt = ctx->pc + insn_bytes + delayslot_size; ctx->hflags |=MIPS_HFLAG_B ; -MIPS_DEBUG ("bnever and link" );break ;case OPC_BLTZALL :/* 0 < 0 likely */ tcg_gen_movi_tl (cpu_gpr[31 ], ctx->pc +8 );/* Skip the instruction in the delay slot */ -MIPS_DEBUG ("bnever, link and skip" ); ctx->pc +=4 ; goto out;case OPC_BNEL :/* rx != rx likely */ case OPC_BGTZL :/* 0 > 0 likely */ case OPC_BLTZL :/* 0 < 0 likely */ /* Skip the instruction in the delay slot */ -MIPS_DEBUG ("bnever and skip" ); ctx->pc +=4 ; goto out;case OPC_J : ctx->hflags |=MIPS_HFLAG_B ; -MIPS_DEBUG ("j " TARGET_FMT_lx, btgt);break ;case OPC_JALX : ctx->hflags |=MIPS_HFLAG_BX ;
@@ -4600,16 +4351,13 @@ static void gen_compute_branch (DisasContext *ctx, uint32_t opc,case OPC_JAL : blink =31 ; ctx->hflags |=MIPS_HFLAG_B ; -MIPS_DEBUG ("jal " TARGET_FMT_lx, btgt);break ;case OPC_JR : ctx->hflags |=MIPS_HFLAG_BR ; -MIPS_DEBUG ("jr %s" , regnames[rs]);break ;case OPC_JALR : blink = rt; ctx->hflags |=MIPS_HFLAG_BR ; -MIPS_DEBUG ("jalr %s, %s" , regnames[rt], regnames[rs]);break ;default :MIPS_INVAL ("branch/jump" );
@@ -4620,87 +4368,65 @@ static void gen_compute_branch (DisasContext *ctx, uint32_t opc,switch (opc) {case OPC_BEQ :tcg_gen_setcond_tl (TCG_COND_EQ , bcond, t0, t1); -MIPS_DEBUG ("beq %s, %s, " TARGET_FMT_lx, - regnames[rs], regnames[rt], btgt); goto not_likely;case OPC_BEQL :tcg_gen_setcond_tl (TCG_COND_EQ , bcond, t0, t1); -MIPS_DEBUG ("beql %s, %s, " TARGET_FMT_lx, - regnames[rs], regnames[rt], btgt); goto likely;case OPC_BNE :tcg_gen_setcond_tl (TCG_COND_NE , bcond, t0, t1); -MIPS_DEBUG ("bne %s, %s, " TARGET_FMT_lx, - regnames[rs], regnames[rt], btgt); goto not_likely;case OPC_BNEL :tcg_gen_setcond_tl (TCG_COND_NE , bcond, t0, t1); -MIPS_DEBUG ("bnel %s, %s, " TARGET_FMT_lx, - regnames[rs], regnames[rt], btgt); goto likely;case OPC_BGEZ :tcg_gen_setcondi_tl (TCG_COND_GE , bcond, t0,0 ); -MIPS_DEBUG ("bgez %s, " TARGET_FMT_lx, regnames[rs], btgt); goto not_likely;case OPC_BGEZL :tcg_gen_setcondi_tl (TCG_COND_GE , bcond, t0,0 ); -MIPS_DEBUG ("bgezl %s, " TARGET_FMT_lx, regnames[rs], btgt); goto likely;case OPC_BGEZAL :tcg_gen_setcondi_tl (TCG_COND_GE , bcond, t0,0 ); -MIPS_DEBUG ("bgezal %s, " TARGET_FMT_lx, regnames[rs], btgt); blink =31 ; goto not_likely;case OPC_BGEZALL :tcg_gen_setcondi_tl (TCG_COND_GE , bcond, t0,0 ); blink =31 ; -MIPS_DEBUG ("bgezall %s, " TARGET_FMT_lx, regnames[rs], btgt); goto likely;case OPC_BGTZ :tcg_gen_setcondi_tl (TCG_COND_GT , bcond, t0,0 ); -MIPS_DEBUG ("bgtz %s, " TARGET_FMT_lx, regnames[rs], btgt); goto not_likely;case OPC_BGTZL :tcg_gen_setcondi_tl (TCG_COND_GT , bcond, t0,0 ); -MIPS_DEBUG ("bgtzl %s, " TARGET_FMT_lx, regnames[rs], btgt); goto likely;case OPC_BLEZ :tcg_gen_setcondi_tl (TCG_COND_LE , bcond, t0,0 ); -MIPS_DEBUG ("blez %s, " TARGET_FMT_lx, regnames[rs], btgt); goto not_likely;case OPC_BLEZL :tcg_gen_setcondi_tl (TCG_COND_LE , bcond, t0,0 ); -MIPS_DEBUG ("blezl %s, " TARGET_FMT_lx, regnames[rs], btgt); goto likely;case OPC_BLTZ :tcg_gen_setcondi_tl (TCG_COND_LT , bcond, t0,0 ); -MIPS_DEBUG ("bltz %s, " TARGET_FMT_lx, regnames[rs], btgt); goto not_likely;case OPC_BLTZL :tcg_gen_setcondi_tl (TCG_COND_LT , bcond, t0,0 ); -MIPS_DEBUG ("bltzl %s, " TARGET_FMT_lx, regnames[rs], btgt); goto likely;case OPC_BPOSGE32 :tcg_gen_setcondi_tl (TCG_COND_GE , bcond, t0,32 ); -MIPS_DEBUG ("bposge32 " TARGET_FMT_lx, btgt); goto not_likely;#if defined(TARGET_MIPS64 )case OPC_BPOSGE64 :tcg_gen_setcondi_tl (TCG_COND_GE , bcond, t0,64 ); -MIPS_DEBUG ("bposge64 " TARGET_FMT_lx, btgt); goto not_likely;#endif case OPC_BLTZAL :tcg_gen_setcondi_tl (TCG_COND_LT , bcond, t0,0 ); blink =31 ; -MIPS_DEBUG ("bltzal %s, " TARGET_FMT_lx, regnames[rs], btgt); not_likely: ctx->hflags |=MIPS_HFLAG_BC ;break ;case OPC_BLTZALL :tcg_gen_setcondi_tl (TCG_COND_LT , bcond, t0,0 ); blink =31 ; -MIPS_DEBUG ("bltzall %s, " TARGET_FMT_lx, regnames[rs], btgt); likely: ctx->hflags |=MIPS_HFLAG_BL ;break ;
@@ -4710,8 +4436,6 @@ static void gen_compute_branch (DisasContext *ctx, uint32_t opc, goto out; } } -MIPS_DEBUG ("enter ds: link %d cond %02x target " TARGET_FMT_lx, - blink, ctx->hflags, btgt); ctx->btarget = btgt;
@@ -4818,7 +4542,6 @@ static void gen_bshfl (DisasContext *ctx, uint32_t op2, int rt, int rd)if (rd ==0 ) {/* If no destination, treat it as a NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -8276,7 +7999,6 @@ static void gen_cp0 (CPUMIPSState *env, DisasContext *ctx, uint32_t opc, int rt,case OPC_ERET :/* OPC_ERETNC */ if ((ctx->insn_flags &ISA_MIPS32R6 ) && (ctx->hflags &MIPS_HFLAG_BMASK )) { -MIPS_DEBUG ("CTI in delay / forbidden slot" ); goto die; }else {int bit_shift = (ctx->hflags &MIPS_HFLAG_M16 ) ?16 :6 ;
@@ -8299,7 +8021,6 @@ static void gen_cp0 (CPUMIPSState *env, DisasContext *ctx, uint32_t opc, int rt,check_insn (ctx,ISA_MIPS32 );if ((ctx->insn_flags &ISA_MIPS32R6 ) && (ctx->hflags &MIPS_HFLAG_BMASK )) { -MIPS_DEBUG ("CTI in delay / forbidden slot" ); goto die; }if (!(ctx->hflags &MIPS_HFLAG_DM )) {
@@ -8315,7 +8036,6 @@ static void gen_cp0 (CPUMIPSState *env, DisasContext *ctx, uint32_t opc, int rt,check_insn (ctx,ISA_MIPS3 |ISA_MIPS32 );if ((ctx->insn_flags &ISA_MIPS32R6 ) && (ctx->hflags &MIPS_HFLAG_BMASK )) { -MIPS_DEBUG ("CTI in delay / forbidden slot" ); goto die; }/* If we get an exception, we want to restart at next instruction */
@@ -8332,7 +8052,6 @@ static void gen_cp0 (CPUMIPSState *env, DisasContext *ctx, uint32_t opc, int rt, return; } (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s %d" , opn, regnames[rt], rd); }#endif /* !CONFIG_USER_ONLY */
@@ -8341,11 +8060,9 @@ static void gen_compute_branch1(DisasContext *ctx, uint32_t op, int32_t cc, int32_t offset) {target_ulong btarget; -const char *opn ="cp1 cond branch" ;TCGv_i32 t0 =tcg_temp_new_i32 ();if ((ctx->insn_flags &ISA_MIPS32R6 ) && (ctx->hflags &MIPS_HFLAG_BMASK )) { -MIPS_DEBUG ("CTI in delay / forbidden slot" );generate_exception (ctx,EXCP_RI ); goto out; }
@@ -8361,26 +8078,22 @@ static void gen_compute_branch1(DisasContext *ctx, uint32_t op,tcg_gen_not_i32 (t0, t0);tcg_gen_andi_i32 (t0, t0,1 );tcg_gen_extu_i32_tl (bcond, t0); - opn ="bc1f" ; goto not_likely;case OPC_BC1FL :tcg_gen_shri_i32 (t0, fpu_fcr31,get_fp_bit (cc));tcg_gen_not_i32 (t0, t0);tcg_gen_andi_i32 (t0, t0,1 );tcg_gen_extu_i32_tl (bcond, t0); - opn ="bc1fl" ; goto likely;case OPC_BC1T :tcg_gen_shri_i32 (t0, fpu_fcr31,get_fp_bit (cc));tcg_gen_andi_i32 (t0, t0,1 );tcg_gen_extu_i32_tl (bcond, t0); - opn ="bc1t" ; goto not_likely;case OPC_BC1TL :tcg_gen_shri_i32 (t0, fpu_fcr31,get_fp_bit (cc));tcg_gen_andi_i32 (t0, t0,1 );tcg_gen_extu_i32_tl (bcond, t0); - opn ="bc1tl" ; likely: ctx->hflags |=MIPS_HFLAG_BL ;break ;
@@ -8394,7 +8107,6 @@ static void gen_compute_branch1(DisasContext *ctx, uint32_t op,tcg_gen_andi_i32 (t0, t0,1 );tcg_gen_extu_i32_tl (bcond, t0); } - opn ="bc1any2f" ; goto not_likely;case OPC_BC1TANY2 : {
@@ -8406,7 +8118,6 @@ static void gen_compute_branch1(DisasContext *ctx, uint32_t op,tcg_gen_andi_i32 (t0, t0,1 );tcg_gen_extu_i32_tl (bcond, t0); } - opn ="bc1any2t" ; goto not_likely;case OPC_BC1FANY4 : {
@@ -8422,7 +8133,6 @@ static void gen_compute_branch1(DisasContext *ctx, uint32_t op,tcg_gen_andi_i32 (t0, t0,1 );tcg_gen_extu_i32_tl (bcond, t0); } - opn ="bc1any4f" ; goto not_likely;case OPC_BC1TANY4 : {
@@ -8438,18 +8148,14 @@ static void gen_compute_branch1(DisasContext *ctx, uint32_t op,tcg_gen_andi_i32 (t0, t0,1 );tcg_gen_extu_i32_tl (bcond, t0); } - opn ="bc1any4t" ; not_likely: ctx->hflags |=MIPS_HFLAG_BC ;break ;default : -MIPS_INVAL (opn); +MIPS_INVAL ("cp1 cond branch" );generate_exception (ctx,EXCP_RI ); goto out; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s: cond %02x target " TARGET_FMT_lx, opn, - ctx->hflags, btarget); ctx->btarget = btarget; ctx->hflags |=MIPS_HFLAG_BDS32 ; out:
@@ -8462,7 +8168,6 @@ static void gen_compute_branch1_r6(DisasContext *ctx, uint32_t op, int delayslot_size) {target_ulong btarget; -const char *opn ="cp1 cond branch" ;TCGv_i64 t0 =tcg_temp_new_i64 ();if (ctx->hflags &MIPS_HFLAG_BMASK ) {
@@ -8482,25 +8187,20 @@ static void gen_compute_branch1_r6(DisasContext *ctx, uint32_t op,switch (op) {case OPC_BC1EQZ :tcg_gen_xori_i64 (t0, t0,1 ); - opn ="bc1eqz" ; ctx->hflags |=MIPS_HFLAG_BC ;break ;case OPC_BC1NEZ :/* t0 already set */ - opn ="bc1nez" ; ctx->hflags |=MIPS_HFLAG_BC ;break ;default : -MIPS_INVAL (opn); +MIPS_INVAL ("cp1 cond branch" );generate_exception (ctx,EXCP_RI ); goto out; }tcg_gen_trunc_i64_tl (bcond, t0); - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s: cond %02x target " TARGET_FMT_lx, opn, - ctx->hflags, btarget); ctx->btarget = btarget;switch (delayslot_size) {
@@ -8731,7 +8431,6 @@ enum r6_f_cmp_op { };static void gen_cp1 (DisasContext *ctx,uint32_t opc,int rt,int fs) { -const char *opn ="cp1 move" ;TCGv t0 =tcg_temp_new ();switch (opc) {
@@ -8744,7 +8443,6 @@ static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs)tcg_temp_free_i32 (fp0); }gen_store_gpr (t0, rt); - opn ="mfc1" ;break ;case OPC_MTC1 :gen_load_gpr (t0, rt);
@@ -8755,12 +8453,10 @@ static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs)gen_store_fpr32 (ctx, fp0, fs);tcg_temp_free_i32 (fp0); } - opn ="mtc1" ;break ;case OPC_CFC1 :gen_helper_1e0i (cfc1, t0, fs);gen_store_gpr (t0, rt); - opn ="cfc1" ;break ;case OPC_CTC1 :gen_load_gpr (t0, rt);
@@ -8773,18 +8469,15 @@ static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs) }/* Stop translation as we may have changed hflags */ ctx->bstate =BS_STOP ; - opn ="ctc1" ;break ;#if defined(TARGET_MIPS64 )case OPC_DMFC1 :gen_load_fpr64 (ctx, t0, fs);gen_store_gpr (t0, rt); - opn ="dmfc1" ;break ;case OPC_DMTC1 :gen_load_gpr (t0, rt);gen_store_fpr64 (ctx, t0, fs); - opn ="dmtc1" ;break ;#endif case OPC_MFHC1 :
@@ -8796,7 +8489,6 @@ static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs)tcg_temp_free_i32 (fp0); }gen_store_gpr (t0, rt); - opn ="mfhc1" ;break ;case OPC_MTHC1 :gen_load_gpr (t0, rt);
@@ -8807,15 +8499,12 @@ static void gen_cp1 (DisasContext *ctx, uint32_t opc, int rt, int fs)gen_store_fpr32h (ctx, fp0, fs);tcg_temp_free_i32 (fp0); } - opn ="mthc1" ;break ;default : -MIPS_INVAL (opn); +MIPS_INVAL ("cp1 move" );generate_exception (ctx,EXCP_RI ); goto out; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s %s" , opn, regnames[rt], fregnames[fs]); out:tcg_temp_free (t0);
@@ -8996,44 +8685,6 @@ static void gen_sel_d(DisasContext *ctx, enum fopcode op1, int fd, int ft,static void gen_farith (DisasContext *ctx,enum fopcode op1,int ft,int fs,int fd,int cc) { -const char *opn ="farith" ; -const char *condnames[] = { -"c.f" , -"c.un" , -"c.eq" , -"c.ueq" , -"c.olt" , -"c.ult" , -"c.ole" , -"c.ule" , -"c.sf" , -"c.ngle" , -"c.seq" , -"c.ngl" , -"c.lt" , -"c.nge" , -"c.le" , -"c.ngt" , - }; -const char *condnames_abs[] = { -"cabs.f" , -"cabs.un" , -"cabs.eq" , -"cabs.ueq" , -"cabs.olt" , -"cabs.ult" , -"cabs.ole" , -"cabs.ule" , -"cabs.sf" , -"cabs.ngle" , -"cabs.seq" , -"cabs.ngl" , -"cabs.lt" , -"cabs.nge" , -"cabs.le" , -"cabs.ngt" , - }; -enum {BINOP ,CMPOP ,OTHEROP } optype =OTHEROP ;uint32_t func = ctx->opcode &0x3f ;switch (op1) {case OPC_ADD_S :
@@ -9048,8 +8699,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="add.s" ; - optype =BINOP ;break ;case OPC_SUB_S : {
@@ -9063,8 +8712,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="sub.s" ; - optype =BINOP ;break ;case OPC_MUL_S : {
@@ -9078,8 +8725,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="mul.s" ; - optype =BINOP ;break ;case OPC_DIV_S : {
@@ -9093,8 +8738,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="div.s" ; - optype =BINOP ;break ;case OPC_SQRT_S : {
@@ -9105,7 +8748,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="sqrt.s" ;break ;case OPC_ABS_S : {
@@ -9116,7 +8758,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="abs.s" ;break ;case OPC_MOV_S : {
@@ -9126,7 +8767,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="mov.s" ;break ;case OPC_NEG_S : {
@@ -9137,7 +8777,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="neg.s" ;break ;case OPC_ROUND_L_S :check_cp1_64bitmode (ctx);
@@ -9151,7 +8790,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp64, fd);tcg_temp_free_i64 (fp64); } - opn ="round.l.s" ;break ;case OPC_TRUNC_L_S :check_cp1_64bitmode (ctx);
@@ -9165,7 +8803,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp64, fd);tcg_temp_free_i64 (fp64); } - opn ="trunc.l.s" ;break ;case OPC_CEIL_L_S :check_cp1_64bitmode (ctx);
@@ -9179,7 +8816,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp64, fd);tcg_temp_free_i64 (fp64); } - opn ="ceil.l.s" ;break ;case OPC_FLOOR_L_S :check_cp1_64bitmode (ctx);
@@ -9193,7 +8829,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp64, fd);tcg_temp_free_i64 (fp64); } - opn ="floor.l.s" ;break ;case OPC_ROUND_W_S : {
@@ -9204,7 +8839,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="round.w.s" ;break ;case OPC_TRUNC_W_S : {
@@ -9215,7 +8849,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="trunc.w.s" ;break ;case OPC_CEIL_W_S : {
@@ -9226,7 +8859,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="ceil.w.s" ;break ;case OPC_FLOOR_W_S : {
@@ -9237,27 +8869,22 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="floor.w.s" ;break ;case OPC_SEL_S :check_insn (ctx,ISA_MIPS32R6 );gen_sel_s (ctx, op1, fd, ft, fs); - opn ="sel.s" ;break ;case OPC_SELEQZ_S :check_insn (ctx,ISA_MIPS32R6 );gen_sel_s (ctx, op1, fd, ft, fs); - opn ="seleqz.s" ;break ;case OPC_SELNEZ_S :check_insn (ctx,ISA_MIPS32R6 );gen_sel_s (ctx, op1, fd, ft, fs); - opn ="selnez.s" ;break ;case OPC_MOVCF_S :check_insn_opc_removed (ctx,ISA_MIPS32R6 );gen_movcf_s (ctx, fs, fd, (ft >>2 ) &0x7 , ft &0x1 ); - opn ="movcf.s" ;break ;case OPC_MOVZ_S :check_insn_opc_removed (ctx,ISA_MIPS32R6 );
@@ -9274,7 +8901,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,tcg_temp_free_i32 (fp0);gen_set_label (l1); } - opn ="movz.s" ;break ;case OPC_MOVN_S :check_insn_opc_removed (ctx,ISA_MIPS32R6 );
@@ -9291,7 +8917,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_set_label (l1); } } - opn ="movn.s" ;break ;case OPC_RECIP_S :check_cop1x (ctx);
@@ -9303,7 +8928,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="recip.s" ;break ;case OPC_RSQRT_S :check_cop1x (ctx);
@@ -9315,7 +8939,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="rsqrt.s" ;break ;case OPC_MADDF_S :check_insn (ctx,ISA_MIPS32R6 );
@@ -9331,7 +8954,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,tcg_temp_free_i32 (fp2);tcg_temp_free_i32 (fp1);tcg_temp_free_i32 (fp0); - opn ="maddf.s" ; }break ;case OPC_MSUBF_S :
@@ -9348,7 +8970,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,tcg_temp_free_i32 (fp2);tcg_temp_free_i32 (fp1);tcg_temp_free_i32 (fp0); - opn ="msubf.s" ; }break ;case OPC_RINT_S :
@@ -9359,7 +8980,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_helper_float_rint_s (fp0, cpu_env, fp0);gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); - opn ="rint.s" ; }break ;case OPC_CLASS_S :
@@ -9370,7 +8990,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_helper_float_class_s (fp0, fp0);gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); - opn ="class.s" ; }break ;case OPC_MIN_S :/* OPC_RECIP2_S */
@@ -9386,7 +9005,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,tcg_temp_free_i32 (fp2);tcg_temp_free_i32 (fp1);tcg_temp_free_i32 (fp0); - opn ="min.s" ; }else {/* OPC_RECIP2_S */ check_cp1_64bitmode (ctx);
@@ -9401,7 +9019,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="recip2.s" ; }break ;case OPC_MINA_S :/* OPC_RECIP1_S */
@@ -9417,7 +9034,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,tcg_temp_free_i32 (fp2);tcg_temp_free_i32 (fp1);tcg_temp_free_i32 (fp0); - opn ="mina.s" ; }else {/* OPC_RECIP1_S */ check_cp1_64bitmode (ctx);
@@ -9429,7 +9045,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="recip1.s" ; }break ;case OPC_MAX_S :/* OPC_RSQRT1_S */
@@ -9443,7 +9058,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp1, fd);tcg_temp_free_i32 (fp1);tcg_temp_free_i32 (fp0); - opn ="max.s" ; }else {/* OPC_RSQRT1_S */ check_cp1_64bitmode (ctx);
@@ -9455,7 +9069,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="rsqrt1.s" ; }break ;case OPC_MAXA_S :/* OPC_RSQRT2_S */
@@ -9469,7 +9082,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp1, fd);tcg_temp_free_i32 (fp1);tcg_temp_free_i32 (fp0); - opn ="maxa.s" ; }else {/* OPC_RSQRT2_S */ check_cp1_64bitmode (ctx);
@@ -9484,7 +9096,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="rsqrt2.s" ; }break ;case OPC_CVT_D_S :
@@ -9499,7 +9110,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp64, fd);tcg_temp_free_i64 (fp64); } - opn ="cvt.d.s" ;break ;case OPC_CVT_W_S : {
@@ -9510,7 +9120,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="cvt.w.s" ;break ;case OPC_CVT_L_S :check_cp1_64bitmode (ctx);
@@ -9524,7 +9133,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp64, fd);tcg_temp_free_i64 (fp64); } - opn ="cvt.l.s" ;break ;case OPC_CVT_PS_S :check_ps (ctx);
@@ -9541,7 +9149,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp64, fd);tcg_temp_free_i64 (fp64); } - opn ="cvt.ps.s" ;break ;case OPC_CMP_F_S :case OPC_CMP_UN_S :
@@ -9562,12 +9169,9 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,check_insn_opc_removed (ctx,ISA_MIPS32R6 );if (ctx->opcode & (1 <<6 )) {gen_cmpabs_s (ctx, func-48 , ft, fs, cc); - opn = condnames_abs[func-48 ]; }else {gen_cmp_s (ctx, func-48 , ft, fs, cc); - opn = condnames[func-48 ]; } - optype =CMPOP ;break ;case OPC_ADD_D :check_cp1_registers (ctx, fs | ft | fd);
@@ -9582,8 +9186,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="add.d" ; - optype =BINOP ;break ;case OPC_SUB_D :check_cp1_registers (ctx, fs | ft | fd);
@@ -9598,8 +9200,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="sub.d" ; - optype =BINOP ;break ;case OPC_MUL_D :check_cp1_registers (ctx, fs | ft | fd);
@@ -9614,8 +9214,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="mul.d" ; - optype =BINOP ;break ;case OPC_DIV_D :check_cp1_registers (ctx, fs | ft | fd);
@@ -9630,8 +9228,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="div.d" ; - optype =BINOP ;break ;case OPC_SQRT_D :check_cp1_registers (ctx, fs | fd);
@@ -9643,7 +9239,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="sqrt.d" ;break ;case OPC_ABS_D :check_cp1_registers (ctx, fs | fd);
@@ -9655,7 +9250,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="abs.d" ;break ;case OPC_MOV_D :check_cp1_registers (ctx, fs | fd);
@@ -9666,7 +9260,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="mov.d" ;break ;case OPC_NEG_D :check_cp1_registers (ctx, fs | fd);
@@ -9678,7 +9271,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="neg.d" ;break ;case OPC_ROUND_L_D :check_cp1_64bitmode (ctx);
@@ -9690,7 +9282,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="round.l.d" ;break ;case OPC_TRUNC_L_D :check_cp1_64bitmode (ctx);
@@ -9702,7 +9293,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="trunc.l.d" ;break ;case OPC_CEIL_L_D :check_cp1_64bitmode (ctx);
@@ -9714,7 +9304,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="ceil.l.d" ;break ;case OPC_FLOOR_L_D :check_cp1_64bitmode (ctx);
@@ -9726,7 +9315,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="floor.l.d" ;break ;case OPC_ROUND_W_D :check_cp1_registers (ctx, fs);
@@ -9740,7 +9328,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp32, fd);tcg_temp_free_i32 (fp32); } - opn ="round.w.d" ;break ;case OPC_TRUNC_W_D :check_cp1_registers (ctx, fs);
@@ -9754,7 +9341,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp32, fd);tcg_temp_free_i32 (fp32); } - opn ="trunc.w.d" ;break ;case OPC_CEIL_W_D :check_cp1_registers (ctx, fs);
@@ -9768,7 +9354,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp32, fd);tcg_temp_free_i32 (fp32); } - opn ="ceil.w.d" ;break ;case OPC_FLOOR_W_D :check_cp1_registers (ctx, fs);
@@ -9782,27 +9367,22 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp32, fd);tcg_temp_free_i32 (fp32); } - opn ="floor.w.d" ;break ;case OPC_SEL_D :check_insn (ctx,ISA_MIPS32R6 );gen_sel_d (ctx, op1, fd, ft, fs); - opn ="sel.d" ;break ;case OPC_SELEQZ_D :check_insn (ctx,ISA_MIPS32R6 );gen_sel_d (ctx, op1, fd, ft, fs); - opn ="seleqz.d" ;break ;case OPC_SELNEZ_D :check_insn (ctx,ISA_MIPS32R6 );gen_sel_d (ctx, op1, fd, ft, fs); - opn ="selnez.d" ;break ;case OPC_MOVCF_D :check_insn_opc_removed (ctx,ISA_MIPS32R6 );gen_movcf_d (ctx, fs, fd, (ft >>2 ) &0x7 , ft &0x1 ); - opn ="movcf.d" ;break ;case OPC_MOVZ_D :check_insn_opc_removed (ctx,ISA_MIPS32R6 );
@@ -9819,7 +9399,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,tcg_temp_free_i64 (fp0);gen_set_label (l1); } - opn ="movz.d" ;break ;case OPC_MOVN_D :check_insn_opc_removed (ctx,ISA_MIPS32R6 );
@@ -9836,7 +9415,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_set_label (l1); } } - opn ="movn.d" ;break ;case OPC_RECIP_D :check_cp1_64bitmode (ctx);
@@ -9848,7 +9426,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="recip.d" ;break ;case OPC_RSQRT_D :check_cp1_64bitmode (ctx);
@@ -9860,7 +9437,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="rsqrt.d" ;break ;case OPC_MADDF_D :check_insn (ctx,ISA_MIPS32R6 );
@@ -9876,7 +9452,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,tcg_temp_free_i64 (fp2);tcg_temp_free_i64 (fp1);tcg_temp_free_i64 (fp0); - opn ="maddf.d" ; }break ;case OPC_MSUBF_D :
@@ -9893,7 +9468,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,tcg_temp_free_i64 (fp2);tcg_temp_free_i64 (fp1);tcg_temp_free_i64 (fp0); - opn ="msubf.d" ; }break ;case OPC_RINT_D :
@@ -9904,7 +9478,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_helper_float_rint_d (fp0, cpu_env, fp0);gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); - opn ="rint.d" ; }break ;case OPC_CLASS_D :
@@ -9915,7 +9488,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_helper_float_class_d (fp0, fp0);gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); - opn ="class.d" ; }break ;case OPC_MIN_D :/* OPC_RECIP2_D */
@@ -9929,7 +9501,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp1, fd);tcg_temp_free_i64 (fp1);tcg_temp_free_i64 (fp0); - opn ="min.d" ; }else {/* OPC_RECIP2_D */ check_cp1_64bitmode (ctx);
@@ -9944,7 +9515,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="recip2.d" ; }break ;case OPC_MINA_D :/* OPC_RECIP1_D */
@@ -9958,7 +9528,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp1, fd);tcg_temp_free_i64 (fp1);tcg_temp_free_i64 (fp0); - opn ="mina.d" ; }else {/* OPC_RECIP1_D */ check_cp1_64bitmode (ctx);
@@ -9970,7 +9539,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="recip1.d" ; }break ;case OPC_MAX_D :/* OPC_RSQRT1_D */
@@ -9984,7 +9552,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp1, fd);tcg_temp_free_i64 (fp1);tcg_temp_free_i64 (fp0); - opn ="max.d" ; }else {/* OPC_RSQRT1_D */ check_cp1_64bitmode (ctx);
@@ -9996,7 +9563,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="rsqrt1.d" ; }break ;case OPC_MAXA_D :/* OPC_RSQRT2_D */
@@ -10010,7 +9576,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp1, fd);tcg_temp_free_i64 (fp1);tcg_temp_free_i64 (fp0); - opn ="maxa.d" ; }else {/* OPC_RSQRT2_D */ check_cp1_64bitmode (ctx);
@@ -10025,7 +9590,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="rsqrt2.d" ; }break ;case OPC_CMP_F_D :
@@ -10047,12 +9611,9 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,check_insn_opc_removed (ctx,ISA_MIPS32R6 );if (ctx->opcode & (1 <<6 )) {gen_cmpabs_d (ctx, func-48 , ft, fs, cc); - opn = condnames_abs[func-48 ]; }else {gen_cmp_d (ctx, func-48 , ft, fs, cc); - opn = condnames[func-48 ]; } - optype =CMPOP ;break ;case OPC_CVT_S_D :check_cp1_registers (ctx, fs);
@@ -10066,7 +9627,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp32, fd);tcg_temp_free_i32 (fp32); } - opn ="cvt.s.d" ;break ;case OPC_CVT_W_D :check_cp1_registers (ctx, fs);
@@ -10080,7 +9640,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp32, fd);tcg_temp_free_i32 (fp32); } - opn ="cvt.w.d" ;break ;case OPC_CVT_L_D :check_cp1_64bitmode (ctx);
@@ -10092,7 +9651,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="cvt.l.d" ;break ;case OPC_CVT_S_W : {
@@ -10103,7 +9661,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="cvt.s.w" ;break ;case OPC_CVT_D_W :check_cp1_registers (ctx, fd);
@@ -10117,7 +9674,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp64, fd);tcg_temp_free_i64 (fp64); } - opn ="cvt.d.w" ;break ;case OPC_CVT_S_L :check_cp1_64bitmode (ctx);
@@ -10131,7 +9687,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp32, fd);tcg_temp_free_i32 (fp32); } - opn ="cvt.s.l" ;break ;case OPC_CVT_D_L :check_cp1_64bitmode (ctx);
@@ -10143,7 +9698,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="cvt.d.l" ;break ;case OPC_CVT_PS_PW :check_ps (ctx);
@@ -10155,7 +9709,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="cvt.ps.pw" ;break ;case OPC_ADD_PS :check_ps (ctx);
@@ -10170,7 +9723,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="add.ps" ;break ;case OPC_SUB_PS :check_ps (ctx);
@@ -10185,7 +9737,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="sub.ps" ;break ;case OPC_MUL_PS :check_ps (ctx);
@@ -10200,7 +9751,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="mul.ps" ;break ;case OPC_ABS_PS :check_ps (ctx);
@@ -10212,7 +9762,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="abs.ps" ;break ;case OPC_MOV_PS :check_ps (ctx);
@@ -10223,7 +9772,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="mov.ps" ;break ;case OPC_NEG_PS :check_ps (ctx);
@@ -10235,12 +9783,10 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="neg.ps" ;break ;case OPC_MOVCF_PS :check_ps (ctx);gen_movcf_ps (ctx, fs, fd, (ft >>2 ) &0x7 , ft &0x1 ); - opn ="movcf.ps" ;break ;case OPC_MOVZ_PS :check_ps (ctx);
@@ -10256,7 +9802,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,tcg_temp_free_i64 (fp0);gen_set_label (l1); } - opn ="movz.ps" ;break ;case OPC_MOVN_PS :check_ps (ctx);
@@ -10273,7 +9818,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_set_label (l1); } } - opn ="movn.ps" ;break ;case OPC_ADDR_PS :check_ps (ctx);
@@ -10288,7 +9832,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="addr.ps" ;break ;case OPC_MULR_PS :check_ps (ctx);
@@ -10303,7 +9846,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="mulr.ps" ;break ;case OPC_RECIP2_PS :check_ps (ctx);
@@ -10318,7 +9860,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="recip2.ps" ;break ;case OPC_RECIP1_PS :check_ps (ctx);
@@ -10330,7 +9871,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="recip1.ps" ;break ;case OPC_RSQRT1_PS :check_ps (ctx);
@@ -10342,7 +9882,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="rsqrt1.ps" ;break ;case OPC_RSQRT2_PS :check_ps (ctx);
@@ -10357,7 +9896,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="rsqrt2.ps" ;break ;case OPC_CVT_S_PU :check_cp1_64bitmode (ctx);
@@ -10369,7 +9907,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="cvt.s.pu" ;break ;case OPC_CVT_PW_PS :check_ps (ctx);
@@ -10381,7 +9918,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="cvt.pw.ps" ;break ;case OPC_CVT_S_PL :check_cp1_64bitmode (ctx);
@@ -10393,7 +9929,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="cvt.s.pl" ;break ;case OPC_PLL_PS :check_ps (ctx);
@@ -10408,7 +9943,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,tcg_temp_free_i32 (fp0);tcg_temp_free_i32 (fp1); } - opn ="pll.ps" ;break ;case OPC_PLU_PS :check_ps (ctx);
@@ -10423,7 +9957,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,tcg_temp_free_i32 (fp0);tcg_temp_free_i32 (fp1); } - opn ="plu.ps" ;break ;case OPC_PUL_PS :check_ps (ctx);
@@ -10438,7 +9971,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,tcg_temp_free_i32 (fp0);tcg_temp_free_i32 (fp1); } - opn ="pul.ps" ;break ;case OPC_PUU_PS :check_ps (ctx);
@@ -10453,7 +9985,6 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,tcg_temp_free_i32 (fp0);tcg_temp_free_i32 (fp1); } - opn ="puu.ps" ;break ;case OPC_CMP_F_PS :case OPC_CMP_UN_PS :
@@ -10473,38 +10004,21 @@ static void gen_farith (DisasContext *ctx, enum fopcode op1,case OPC_CMP_NGT_PS :if (ctx->opcode & (1 <<6 )) {gen_cmpabs_ps (ctx, func-48 , ft, fs, cc); - opn = condnames_abs[func-48 ]; }else {gen_cmp_ps (ctx, func-48 , ft, fs, cc); - opn = condnames[func-48 ]; } - optype =CMPOP ;break ;default : -MIPS_INVAL (opn); +MIPS_INVAL ("farith" );generate_exception (ctx,EXCP_RI );return ; } - (void )opn;/* avoid a compiler warning */ -switch (optype) { -case BINOP : -MIPS_DEBUG ("%s %s, %s, %s" , opn, fregnames[fd], fregnames[fs], fregnames[ft]); -break ; -case CMPOP : -MIPS_DEBUG ("%s %s,%s" , opn, fregnames[fs], fregnames[ft]); -break ; -default : -MIPS_DEBUG ("%s %s,%s" , opn, fregnames[fd], fregnames[fs]); -break ; - } }/* Coprocessor 3 (FPU) */ static void gen_flt3_ldst (DisasContext *ctx,uint32_t opc,int fd,int fs,int base,int index) { -const char *opn ="extended float load/store" ; -int store =0 ;TCGv t0 =tcg_temp_new ();if (base ==0 ) {
@@ -10527,7 +10041,6 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc,gen_store_fpr32 (ctx, fp0, fd);tcg_temp_free_i32 (fp0); } - opn ="lwxc1" ;break ;case OPC_LDXC1 :check_cop1x (ctx);
@@ -10538,7 +10051,6 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="ldxc1" ;break ;case OPC_LUXC1 :check_cp1_64bitmode (ctx);
@@ -10550,7 +10062,6 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc,gen_store_fpr64 (ctx, fp0, fd);tcg_temp_free_i64 (fp0); } - opn ="luxc1" ;break ;case OPC_SWXC1 :check_cop1x (ctx);
@@ -10560,8 +10071,6 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc,tcg_gen_qemu_st_i32 (fp0, t0, ctx->mem_idx,MO_TEUL );tcg_temp_free_i32 (fp0); } - opn ="swxc1" ; - store =1 ;break ;case OPC_SDXC1 :check_cop1x (ctx);
@@ -10572,8 +10081,6 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc,tcg_gen_qemu_st_i64 (fp0, t0, ctx->mem_idx,MO_TEQ );tcg_temp_free_i64 (fp0); } - opn ="sdxc1" ; - store =1 ;break ;case OPC_SUXC1 :check_cp1_64bitmode (ctx);
@@ -10584,21 +10091,14 @@ static void gen_flt3_ldst (DisasContext *ctx, uint32_t opc,tcg_gen_qemu_st_i64 (fp0, t0, ctx->mem_idx,MO_TEQ );tcg_temp_free_i64 (fp0); } - opn ="suxc1" ; - store =1 ;break ; }tcg_temp_free (t0); - (void )opn; (void )store;/* avoid compiler warnings */ -MIPS_DEBUG ("%s %s, %s(%s)" , opn, fregnames[store ? fs : fd], - regnames[index], regnames[base]); }static void gen_flt3_arith (DisasContext *ctx,uint32_t opc,int fd,int fr,int fs,int ft) { -const char *opn ="flt3_arith" ; -switch (opc) {case OPC_ALNV_PS :check_ps (ctx);
@@ -10636,7 +10136,6 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc,tcg_temp_free_i32 (fp);tcg_temp_free_i32 (fph); } - opn ="alnv.ps" ;break ;case OPC_MADD_S :check_cop1x (ctx);
@@ -10654,7 +10153,6 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc,gen_store_fpr32 (ctx, fp2, fd);tcg_temp_free_i32 (fp2); } - opn ="madd.s" ;break ;case OPC_MADD_D :check_cop1x (ctx);
@@ -10673,7 +10171,6 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc,gen_store_fpr64 (ctx, fp2, fd);tcg_temp_free_i64 (fp2); } - opn ="madd.d" ;break ;case OPC_MADD_PS :check_ps (ctx);
@@ -10691,7 +10188,6 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc,gen_store_fpr64 (ctx, fp2, fd);tcg_temp_free_i64 (fp2); } - opn ="madd.ps" ;break ;case OPC_MSUB_S :check_cop1x (ctx);
@@ -10709,7 +10205,6 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc,gen_store_fpr32 (ctx, fp2, fd);tcg_temp_free_i32 (fp2); } - opn ="msub.s" ;break ;case OPC_MSUB_D :check_cop1x (ctx);
@@ -10728,7 +10223,6 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc,gen_store_fpr64 (ctx, fp2, fd);tcg_temp_free_i64 (fp2); } - opn ="msub.d" ;break ;case OPC_MSUB_PS :check_ps (ctx);
@@ -10746,7 +10240,6 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc,gen_store_fpr64 (ctx, fp2, fd);tcg_temp_free_i64 (fp2); } - opn ="msub.ps" ;break ;case OPC_NMADD_S :check_cop1x (ctx);
@@ -10764,7 +10257,6 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc,gen_store_fpr32 (ctx, fp2, fd);tcg_temp_free_i32 (fp2); } - opn ="nmadd.s" ;break ;case OPC_NMADD_D :check_cop1x (ctx);
@@ -10783,7 +10275,6 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc,gen_store_fpr64 (ctx, fp2, fd);tcg_temp_free_i64 (fp2); } - opn ="nmadd.d" ;break ;case OPC_NMADD_PS :check_ps (ctx);
@@ -10801,7 +10292,6 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc,gen_store_fpr64 (ctx, fp2, fd);tcg_temp_free_i64 (fp2); } - opn ="nmadd.ps" ;break ;case OPC_NMSUB_S :check_cop1x (ctx);
@@ -10819,7 +10309,6 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc,gen_store_fpr32 (ctx, fp2, fd);tcg_temp_free_i32 (fp2); } - opn ="nmsub.s" ;break ;case OPC_NMSUB_D :check_cop1x (ctx);
@@ -10838,7 +10327,6 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc,gen_store_fpr64 (ctx, fp2, fd);tcg_temp_free_i64 (fp2); } - opn ="nmsub.d" ;break ;case OPC_NMSUB_PS :check_ps (ctx);
@@ -10856,16 +10344,12 @@ static void gen_flt3_arith (DisasContext *ctx, uint32_t opc,gen_store_fpr64 (ctx, fp2, fd);tcg_temp_free_i64 (fp2); } - opn ="nmsub.ps" ;break ;default : -MIPS_INVAL (opn); +MIPS_INVAL ("flt3_arith" );generate_exception (ctx,EXCP_RI );return ; } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s, %s, %s" , opn, fregnames[fd], fregnames[fr], - fregnames[fs], fregnames[ft]); }static void gen_rdhwr (DisasContext *ctx,int rt,int rd)
@@ -10947,12 +10431,10 @@ static void gen_branch(DisasContext *ctx, int insn_bytes)/* FIXME: Need to clear can_do_io. */ switch (proc_hflags &MIPS_HFLAG_BMASK_BASE ) {case MIPS_HFLAG_FBNSLOT : -MIPS_DEBUG ("forbidden slot" );gen_goto_tb (ctx,0 , ctx->pc + insn_bytes);break ;case MIPS_HFLAG_B :/* unconditional branch */ -MIPS_DEBUG ("unconditional branch" );if (proc_hflags &MIPS_HFLAG_BX ) {tcg_gen_xori_i32 (hflags, hflags,MIPS_HFLAG_M16 ); }
@@ -10960,12 +10442,10 @@ static void gen_branch(DisasContext *ctx, int insn_bytes)break ;case MIPS_HFLAG_BL :/* blikely taken case */ -MIPS_DEBUG ("blikely branch taken" );gen_goto_tb (ctx,0 , ctx->btarget);break ;case MIPS_HFLAG_BC :/* Conditional branch */ -MIPS_DEBUG ("conditional branch" ); {TCGLabel *l1 =gen_new_label ();
@@ -10977,7 +10457,6 @@ static void gen_branch(DisasContext *ctx, int insn_bytes)break ;case MIPS_HFLAG_BR :/* unconditional branch to register */ -MIPS_DEBUG ("branch to register" );if (ctx->insn_flags & (ASE_MIPS16 |ASE_MICROMIPS )) {TCGv t0 =tcg_temp_new ();TCGv_i32 t1 =tcg_temp_new_i32 ();
@@ -11236,7 +10715,6 @@ static void gen_compute_compact_branch(DisasContext *ctx, uint32_t opc,gen_set_label (fs); ctx->hflags |=MIPS_HFLAG_FBNSLOT ; -MIPS_DEBUG ("Compact conditional branch" ); } out:
@@ -13027,7 +12505,6 @@ static void gen_andi16(DisasContext *ctx)static void gen_ldst_multiple (DisasContext *ctx,uint32_t opc,int reglist,int base,int16_t offset) { -const char *opn ="ldst_multiple" ;TCGv t0, t1;TCGv_i32 t2;
@@ -13047,25 +12524,19 @@ static void gen_ldst_multiple (DisasContext *ctx, uint32_t opc, int reglist,switch (opc) {case LWM32 :gen_helper_lwm (cpu_env, t0, t1, t2); - opn ="lwm" ;break ;case SWM32 :gen_helper_swm (cpu_env, t0, t1, t2); - opn ="swm" ;break ;#ifdef TARGET_MIPS64 case LDM :gen_helper_ldm (cpu_env, t0, t1, t2); - opn ="ldm" ;break ;case SDM :gen_helper_sdm (cpu_env, t0, t1, t2); - opn ="sdm" ;break ;#endif } - (void )opn; -MIPS_DEBUG ("%s, %x, %d(%s)" , opn, reglist, offset, regnames[base]);tcg_temp_free (t0);tcg_temp_free (t1);tcg_temp_free_i32 (t2);
@@ -13322,7 +12793,6 @@ static void gen_ldxs (DisasContext *ctx, int base, int index, int rd)static void gen_ldst_pair (DisasContext *ctx,uint32_t opc,int rd,int base,int16_t offset) { -const char *opn ="ldst_pair" ;TCGv t0, t1;if (ctx->hflags &MIPS_HFLAG_BMASK || rd ==31 ) {
@@ -13347,7 +12817,6 @@ static void gen_ldst_pair (DisasContext *ctx, uint32_t opc, int rd,gen_op_addr_add (ctx, t0, t0, t1);tcg_gen_qemu_ld_tl (t1, t0, ctx->mem_idx,MO_TESL );gen_store_gpr (t1, rd+1 ); - opn ="lwp" ;break ;case SWP :gen_load_gpr (t1, rd);
@@ -13356,7 +12825,6 @@ static void gen_ldst_pair (DisasContext *ctx, uint32_t opc, int rd,gen_op_addr_add (ctx, t0, t0, t1);gen_load_gpr (t1, rd+1 );tcg_gen_qemu_st_tl (t1, t0, ctx->mem_idx,MO_TEUL ); - opn ="swp" ;break ;#ifdef TARGET_MIPS64 case LDP :
@@ -13370,7 +12838,6 @@ static void gen_ldst_pair (DisasContext *ctx, uint32_t opc, int rd,gen_op_addr_add (ctx, t0, t0, t1);tcg_gen_qemu_ld_tl (t1, t0, ctx->mem_idx,MO_TEQ );gen_store_gpr (t1, rd+1 ); - opn ="ldp" ;break ;case SDP :gen_load_gpr (t1, rd);
@@ -13379,12 +12846,9 @@ static void gen_ldst_pair (DisasContext *ctx, uint32_t opc, int rd,gen_op_addr_add (ctx, t0, t0, t1);gen_load_gpr (t1, rd+1 );tcg_gen_qemu_st_tl (t1, t0, ctx->mem_idx,MO_TEQ ); - opn ="sdp" ;break ;#endif } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s, %s, %d(%s)" , opn, regnames[rd], offset, regnames[base]);tcg_temp_free (t0);tcg_temp_free (t1); }
@@ -15517,7 +14981,6 @@ static int decode_micromips_opc (CPUMIPSState *env, DisasContext *ctx)static void gen_mipsdsp_ld (DisasContext *ctx,uint32_t opc,int rd,int base,int offset) { -const char *opn ="ldx" ;TCGv t0;check_dsp (ctx);
@@ -15535,42 +14998,33 @@ static void gen_mipsdsp_ld(DisasContext *ctx, uint32_t opc,case OPC_LBUX :tcg_gen_qemu_ld_tl (t0, t0, ctx->mem_idx,MO_UB );gen_store_gpr (t0, rd); - opn ="lbux" ;break ;case OPC_LHX :tcg_gen_qemu_ld_tl (t0, t0, ctx->mem_idx,MO_TESW );gen_store_gpr (t0, rd); - opn ="lhx" ;break ;case OPC_LWX :tcg_gen_qemu_ld_tl (t0, t0, ctx->mem_idx,MO_TESL );gen_store_gpr (t0, rd); - opn ="lwx" ;break ;#if defined(TARGET_MIPS64 )case OPC_LDX :tcg_gen_qemu_ld_tl (t0, t0, ctx->mem_idx,MO_TEQ );gen_store_gpr (t0, rd); - opn ="ldx" ;break ;#endif } - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s %s, %s(%s)" , opn, - regnames[rd], regnames[offset], regnames[base]);tcg_temp_free (t0); }static void gen_mipsdsp_arith (DisasContext *ctx,uint32_t op1,uint32_t op2,int ret,int v1,int v2) { -const char *opn ="mipsdsp arith" ;TCGv v1_t;TCGv v2_t;if (ret ==0 ) {/* Treat as NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -16010,23 +15464,18 @@ static void gen_mipsdsp_arith(DisasContext *ctx, uint32_t op1, uint32_t op2,tcg_temp_free (v1_t);tcg_temp_free (v2_t); - - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s" , opn); }static void gen_mipsdsp_shift (DisasContext *ctx,uint32_t opc,int ret,int v1,int v2) {uint32_t op2; -const char *opn ="mipsdsp shift" ;TCGv t0;TCGv v1_t;TCGv v2_t;if (ret ==0 ) {/* Treat as NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -16258,21 +15707,17 @@ static void gen_mipsdsp_shift(DisasContext *ctx, uint32_t opc,tcg_temp_free (t0);tcg_temp_free (v1_t);tcg_temp_free (v2_t); - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s" , opn); }static void gen_mipsdsp_multiply (DisasContext *ctx,uint32_t op1,uint32_t op2,int ret,int v1,int v2,int check_ret) { -const char *opn ="mipsdsp multiply" ;TCGv_i32 t0;TCGv v1_t;TCGv v2_t;if ((ret ==0 ) && (check_ret ==1 )) {/* Treat as NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -16570,23 +16015,17 @@ static void gen_mipsdsp_multiply(DisasContext *ctx, uint32_t op1, uint32_t op2,tcg_temp_free_i32 (t0);tcg_temp_free (v1_t);tcg_temp_free (v2_t); - - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s" , opn); - }static void gen_mipsdsp_bitinsn (DisasContext *ctx,uint32_t op1,uint32_t op2,int ret,int val) { -const char *opn ="mipsdsp Bit/ Manipulation" ;int16_t imm;TCGv t0;TCGv val_t;if (ret ==0 ) {/* Treat as NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -16714,23 +16153,18 @@ static void gen_mipsdsp_bitinsn(DisasContext *ctx, uint32_t op1, uint32_t op2, }tcg_temp_free (t0);tcg_temp_free (val_t); - - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s" , opn); }static void gen_mipsdsp_add_cmp_pick (DisasContext *ctx,uint32_t op1,uint32_t op2,int ret,int v1,int v2,int check_ret) { -const char *opn ="mipsdsp add compare pick" ;TCGv t1;TCGv v1_t;TCGv v2_t;if ((ret ==0 ) && (check_ret ==1 )) {/* Treat as NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -16905,22 +16339,17 @@ static void gen_mipsdsp_add_cmp_pick(DisasContext *ctx,tcg_temp_free (t1);tcg_temp_free (v1_t);tcg_temp_free (v2_t); - - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s" , opn); }static void gen_mipsdsp_append (CPUMIPSState *env,DisasContext *ctx,uint32_t op1,int rt,int rs,int sa) { -const char *opn ="mipsdsp append/dappend" ;TCGv t0;check_dspr2 (ctx);if (rt ==0 ) {/* Treat as NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -16998,15 +16427,12 @@ static void gen_mipsdsp_append(CPUMIPSState *env, DisasContext *ctx,#endif }tcg_temp_free (t0); - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s" , opn); }static void gen_mipsdsp_accinsn (DisasContext *ctx,uint32_t op1,uint32_t op2,int ret,int v1,int v2,int check_ret) { -const char *opn ="mipsdsp accumulator" ;TCGv t0;TCGv t1;TCGv v1_t;
@@ -17015,7 +16441,6 @@ static void gen_mipsdsp_accinsn(DisasContext *ctx, uint32_t op1, uint32_t op2,if ((ret ==0 ) && (check_ret ==1 )) {/* Treat as NOP. */ -MIPS_DEBUG ("NOP" );return ; }
@@ -17227,9 +16652,6 @@ static void gen_mipsdsp_accinsn(DisasContext *ctx, uint32_t op1, uint32_t op2,tcg_temp_free (t1);tcg_temp_free (v1_t);tcg_temp_free (v2_t); - - (void )opn;/* avoid a compiler warning */ -MIPS_DEBUG ("%s" , opn); }/* End MIPSDSP functions. */
@@ -17431,7 +16853,6 @@ static void decode_opc_special(CPUMIPSState *env, DisasContext *ctx) rs == 0 && rt == 0) { /* PAUSE */if ((ctx->insn_flags &ISA_MIPS32R6 ) && (ctx->hflags &MIPS_HFLAG_BMASK )) { -MIPS_DEBUG ("CTI in delay / forbidden slot" );generate_exception (ctx,EXCP_RI );break ; }
@@ -17985,7 +17406,6 @@ static void decode_opc_special3_legacy(CPUMIPSState *env, DisasContext *ctx)TCGv t0, t1;if (rt ==0 ) { -MIPS_DEBUG ("NOP" );break ;
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.1.4
Part of the diff is not shown here. View the raw message.
PATCH 2/2 target-mips: get rid of MIPS_DEBUG_SIGN_EXTENSIONS
In reply to Aurelien JarnoMIPS_DEBUG_SIGN_EXTENSIONS was used sometimes ago to verify that 32-bit instructions correctly sign extend their results. It's now not need anymore, remove it.
--- target-mips/translate.c | 39 --------------------------------------- 1 file changed, 39 deletions(-)
target-mips/translate.c +0 -39
@@ -33,9 +33,7 @@#include "trace-tcg.h" -#define MIPS_DEBUG_DISAS 0 -//#define MIPS_DEBUG_SIGN_EXTENSIONS /* MIPS major opcodes */ #define MASK_OP_MAJOR (op) (op & (0x3F << 26))
@@ -19806,40 +19804,6 @@ static void fpu_dump_state(CPUMIPSState *env, FILE *f, fprintf_function fpu_fpri#undef printfpr } -#if defined(TARGET_MIPS64 ) && defined(MIPS_DEBUG_SIGN_EXTENSIONS ) -/* Debug help: The architecture requires 32bit code to maintain proper -sign-extended values on 64bit machines. */ - -#define SIGN_EXT_P (val) ((((val) & ~0x7fffffff) == 0) || (((val) & ~0x7fffffff) == ~0x7fffffff)) - -static void -cpu_mips_check_sign_extensions (CPUMIPSState *env,FILE *f, -fprintf_function cpu_fprintf, -int flags) -{ -int i; - -if (!SIGN_EXT_P (env->active_tc.PC)) -cpu_fprintf (f,"BROKEN: pc=0x" TARGET_FMT_lx"\n" , env->active_tc.PC); -if (!SIGN_EXT_P (env->active_tc.HI[0 ])) -cpu_fprintf (f,"BROKEN: HI=0x" TARGET_FMT_lx"\n" , env->active_tc.HI[0 ]); -if (!SIGN_EXT_P (env->active_tc.LO[0 ])) -cpu_fprintf (f,"BROKEN: LO=0x" TARGET_FMT_lx"\n" , env->active_tc.LO[0 ]); -if (!SIGN_EXT_P (env->btarget)) -cpu_fprintf (f,"BROKEN: btarget=0x" TARGET_FMT_lx"\n" , env->btarget); - -for (i =0 ; i <32 ; i++) { -if (!SIGN_EXT_P (env->active_tc.gpr[i])) -cpu_fprintf (f,"BROKEN: %s=0x" TARGET_FMT_lx"\n" , regnames[i], env->active_tc.gpr[i]); - } - -if (!SIGN_EXT_P (env->CP0_EPC)) -cpu_fprintf (f,"BROKEN: EPC=0x" TARGET_FMT_lx"\n" , env->CP0_EPC); -if (!SIGN_EXT_P (env->lladdr)) -cpu_fprintf (f,"BROKEN: LLAddr=0x" TARGET_FMT_lx"\n" , env->lladdr); -} -#endif -void mips_cpu_dump_state (CPUState *cs,FILE *f,fprintf_function cpu_fprintf,int flags) {
@@ -19871,9 +19835,6 @@ void mips_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, env->CP0_Config4, env->CP0_Config5);if (env->hflags &MIPS_HFLAG_FPU )fpu_dump_state (env, f, cpu_fprintf, flags); -#if defined(TARGET_MIPS64 ) && defined(MIPS_DEBUG_SIGN_EXTENSIONS ) -cpu_mips_check_sign_extensions (env, f, cpu_fprintf, flags); -#endif }void mips_tcg_init (void )
Signature · 1 line
2.1.4
Quoted 9 lines · Aurelien Jarno
This patchset get rid of old debugging code in
translate.c, that has been superseded by other debugging way (e.g. (-d in_asm,op). It comes from the discussion there:https://lists.gnu.org/archive/html/qemu-devel/2015-07/msg03162.html
I had it ready for some time, now that 2.4 has been release, it's probably time to apply it.
Quoted 7 lines
Aurelien Jarno (2):
target-mips: get rid ofMIPS_DEBUG
target-mips: get rid ofMIPS_DEBUG_SIGN_EXTENSIONStarget-mips/translate.c | 663 ++---------------------------------------------- 1 file changed, 19 insertions(+), 644 deletions(-)
Thanks,
Leon