target-sparc: Free instruction temporaries.
Rather than creating new temporaries for constants, use the ones created in disas_sparc_insn. Remember the temps created there so that they can be freed at the end of the function. Profile data collected by TCG while booting sparc-test kernel: -avg temps/TB 70.61 max=421 +avg temps/TB 62.75 max=66 Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
parent
058ed88cc1
commit
42a8aa8393
|
@ -49,7 +49,7 @@ static TCGv cpu_y;
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
static TCGv cpu_tbr;
|
static TCGv cpu_tbr;
|
||||||
#endif
|
#endif
|
||||||
static TCGv cpu_cond, cpu_src1, cpu_src2, cpu_dst, cpu_addr, cpu_val;
|
static TCGv cpu_cond, cpu_dst, cpu_addr, cpu_val;
|
||||||
#ifdef TARGET_SPARC64
|
#ifdef TARGET_SPARC64
|
||||||
static TCGv_i32 cpu_xcc, cpu_asi, cpu_fprs;
|
static TCGv_i32 cpu_xcc, cpu_asi, cpu_fprs;
|
||||||
static TCGv cpu_gsr;
|
static TCGv cpu_gsr;
|
||||||
|
@ -1631,12 +1631,13 @@ static inline TCGv get_src1(unsigned int insn, TCGv def)
|
||||||
unsigned int rs1;
|
unsigned int rs1;
|
||||||
|
|
||||||
rs1 = GET_FIELD(insn, 13, 17);
|
rs1 = GET_FIELD(insn, 13, 17);
|
||||||
if (rs1 == 0)
|
if (rs1 == 0) {
|
||||||
r_rs1 = tcg_const_tl(0); // XXX how to free?
|
tcg_gen_movi_tl(def, 0);
|
||||||
else if (rs1 < 8)
|
} else if (rs1 < 8) {
|
||||||
r_rs1 = cpu_gregs[rs1];
|
r_rs1 = cpu_gregs[rs1];
|
||||||
else
|
} else {
|
||||||
tcg_gen_ld_tl(def, cpu_regwptr, (rs1 - 8) * sizeof(target_ulong));
|
tcg_gen_ld_tl(def, cpu_regwptr, (rs1 - 8) * sizeof(target_ulong));
|
||||||
|
}
|
||||||
return r_rs1;
|
return r_rs1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1645,20 +1646,17 @@ static inline TCGv get_src2(unsigned int insn, TCGv def)
|
||||||
TCGv r_rs2 = def;
|
TCGv r_rs2 = def;
|
||||||
|
|
||||||
if (IS_IMM) { /* immediate */
|
if (IS_IMM) { /* immediate */
|
||||||
target_long simm;
|
target_long simm = GET_FIELDs(insn, 19, 31);
|
||||||
|
tcg_gen_movi_tl(def, simm);
|
||||||
simm = GET_FIELDs(insn, 19, 31);
|
|
||||||
r_rs2 = tcg_const_tl(simm); // XXX how to free?
|
|
||||||
} else { /* register */
|
} else { /* register */
|
||||||
unsigned int rs2;
|
unsigned int rs2 = GET_FIELD(insn, 27, 31);
|
||||||
|
if (rs2 == 0) {
|
||||||
rs2 = GET_FIELD(insn, 27, 31);
|
tcg_gen_movi_tl(def, 0);
|
||||||
if (rs2 == 0)
|
} else if (rs2 < 8) {
|
||||||
r_rs2 = tcg_const_tl(0); // XXX how to free?
|
|
||||||
else if (rs2 < 8)
|
|
||||||
r_rs2 = cpu_gregs[rs2];
|
r_rs2 = cpu_gregs[rs2];
|
||||||
else
|
} else {
|
||||||
tcg_gen_ld_tl(def, cpu_regwptr, (rs2 - 8) * sizeof(target_ulong));
|
tcg_gen_ld_tl(def, cpu_regwptr, (rs2 - 8) * sizeof(target_ulong));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return r_rs2;
|
return r_rs2;
|
||||||
}
|
}
|
||||||
|
@ -1701,6 +1699,7 @@ static inline void gen_load_trap_state_at_tl(TCGv_ptr r_tsptr, TCGv_ptr cpu_env)
|
||||||
static void disas_sparc_insn(DisasContext * dc)
|
static void disas_sparc_insn(DisasContext * dc)
|
||||||
{
|
{
|
||||||
unsigned int insn, opc, rs1, rs2, rd;
|
unsigned int insn, opc, rs1, rs2, rd;
|
||||||
|
TCGv cpu_src1, cpu_src2, cpu_tmp1, cpu_tmp2;
|
||||||
target_long simm;
|
target_long simm;
|
||||||
|
|
||||||
if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP)))
|
if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP)))
|
||||||
|
@ -1710,8 +1709,8 @@ static void disas_sparc_insn(DisasContext * dc)
|
||||||
|
|
||||||
rd = GET_FIELD(insn, 2, 6);
|
rd = GET_FIELD(insn, 2, 6);
|
||||||
|
|
||||||
cpu_src1 = tcg_temp_new(); // const
|
cpu_tmp1 = cpu_src1 = tcg_temp_new();
|
||||||
cpu_src2 = tcg_temp_new(); // const
|
cpu_tmp2 = cpu_src2 = tcg_temp_new();
|
||||||
|
|
||||||
switch (opc) {
|
switch (opc) {
|
||||||
case 0: /* branches/sethi */
|
case 0: /* branches/sethi */
|
||||||
|
@ -4601,7 +4600,7 @@ static void disas_sparc_insn(DisasContext * dc)
|
||||||
dc->npc = dc->npc + 4;
|
dc->npc = dc->npc + 4;
|
||||||
}
|
}
|
||||||
jmp_insn:
|
jmp_insn:
|
||||||
return;
|
goto egress;
|
||||||
illegal_insn:
|
illegal_insn:
|
||||||
{
|
{
|
||||||
TCGv_i32 r_const;
|
TCGv_i32 r_const;
|
||||||
|
@ -4612,7 +4611,7 @@ static void disas_sparc_insn(DisasContext * dc)
|
||||||
tcg_temp_free_i32(r_const);
|
tcg_temp_free_i32(r_const);
|
||||||
dc->is_br = 1;
|
dc->is_br = 1;
|
||||||
}
|
}
|
||||||
return;
|
goto egress;
|
||||||
unimp_flush:
|
unimp_flush:
|
||||||
{
|
{
|
||||||
TCGv_i32 r_const;
|
TCGv_i32 r_const;
|
||||||
|
@ -4623,7 +4622,7 @@ static void disas_sparc_insn(DisasContext * dc)
|
||||||
tcg_temp_free_i32(r_const);
|
tcg_temp_free_i32(r_const);
|
||||||
dc->is_br = 1;
|
dc->is_br = 1;
|
||||||
}
|
}
|
||||||
return;
|
goto egress;
|
||||||
#if !defined(CONFIG_USER_ONLY)
|
#if !defined(CONFIG_USER_ONLY)
|
||||||
priv_insn:
|
priv_insn:
|
||||||
{
|
{
|
||||||
|
@ -4635,19 +4634,19 @@ static void disas_sparc_insn(DisasContext * dc)
|
||||||
tcg_temp_free_i32(r_const);
|
tcg_temp_free_i32(r_const);
|
||||||
dc->is_br = 1;
|
dc->is_br = 1;
|
||||||
}
|
}
|
||||||
return;
|
goto egress;
|
||||||
#endif
|
#endif
|
||||||
nfpu_insn:
|
nfpu_insn:
|
||||||
save_state(dc, cpu_cond);
|
save_state(dc, cpu_cond);
|
||||||
gen_op_fpexception_im(FSR_FTT_UNIMPFPOP);
|
gen_op_fpexception_im(FSR_FTT_UNIMPFPOP);
|
||||||
dc->is_br = 1;
|
dc->is_br = 1;
|
||||||
return;
|
goto egress;
|
||||||
#if !defined(CONFIG_USER_ONLY) && !defined(TARGET_SPARC64)
|
#if !defined(CONFIG_USER_ONLY) && !defined(TARGET_SPARC64)
|
||||||
nfq_insn:
|
nfq_insn:
|
||||||
save_state(dc, cpu_cond);
|
save_state(dc, cpu_cond);
|
||||||
gen_op_fpexception_im(FSR_FTT_SEQ_ERROR);
|
gen_op_fpexception_im(FSR_FTT_SEQ_ERROR);
|
||||||
dc->is_br = 1;
|
dc->is_br = 1;
|
||||||
return;
|
goto egress;
|
||||||
#endif
|
#endif
|
||||||
#ifndef TARGET_SPARC64
|
#ifndef TARGET_SPARC64
|
||||||
ncp_insn:
|
ncp_insn:
|
||||||
|
@ -4660,8 +4659,11 @@ static void disas_sparc_insn(DisasContext * dc)
|
||||||
tcg_temp_free(r_const);
|
tcg_temp_free(r_const);
|
||||||
dc->is_br = 1;
|
dc->is_br = 1;
|
||||||
}
|
}
|
||||||
return;
|
goto egress;
|
||||||
#endif
|
#endif
|
||||||
|
egress:
|
||||||
|
tcg_temp_free(cpu_tmp1);
|
||||||
|
tcg_temp_free(cpu_tmp2);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void gen_intermediate_code_internal(TranslationBlock * tb,
|
static inline void gen_intermediate_code_internal(TranslationBlock * tb,
|
||||||
|
|
Loading…
Reference in New Issue