target/arm: Use tcg_constant in gen_adc_CC

Note that tmp was doing double-duty as zero
and then later as a temporary in its own right.
Split the use of 0 to a new variable 'zero'.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20220426163043.100432-5-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-04-26 09:30:00 -07:00 committed by Peter Maydell
parent dd935b0697
commit bc9eb3a367

View File

@ -814,15 +814,15 @@ static void gen_adc(int sf, TCGv_i64 dest, TCGv_i64 t0, TCGv_i64 t1)
static void gen_adc_CC(int sf, TCGv_i64 dest, TCGv_i64 t0, TCGv_i64 t1) static void gen_adc_CC(int sf, TCGv_i64 dest, TCGv_i64 t0, TCGv_i64 t1)
{ {
if (sf) { if (sf) {
TCGv_i64 result, cf_64, vf_64, tmp; TCGv_i64 result = tcg_temp_new_i64();
result = tcg_temp_new_i64(); TCGv_i64 cf_64 = tcg_temp_new_i64();
cf_64 = tcg_temp_new_i64(); TCGv_i64 vf_64 = tcg_temp_new_i64();
vf_64 = tcg_temp_new_i64(); TCGv_i64 tmp = tcg_temp_new_i64();
tmp = tcg_const_i64(0); TCGv_i64 zero = tcg_constant_i64(0);
tcg_gen_extu_i32_i64(cf_64, cpu_CF); tcg_gen_extu_i32_i64(cf_64, cpu_CF);
tcg_gen_add2_i64(result, cf_64, t0, tmp, cf_64, tmp); tcg_gen_add2_i64(result, cf_64, t0, zero, cf_64, zero);
tcg_gen_add2_i64(result, cf_64, result, cf_64, t1, tmp); tcg_gen_add2_i64(result, cf_64, result, cf_64, t1, zero);
tcg_gen_extrl_i64_i32(cpu_CF, cf_64); tcg_gen_extrl_i64_i32(cpu_CF, cf_64);
gen_set_NZ64(result); gen_set_NZ64(result);
@ -838,15 +838,15 @@ static void gen_adc_CC(int sf, TCGv_i64 dest, TCGv_i64 t0, TCGv_i64 t1)
tcg_temp_free_i64(cf_64); tcg_temp_free_i64(cf_64);
tcg_temp_free_i64(result); tcg_temp_free_i64(result);
} else { } else {
TCGv_i32 t0_32, t1_32, tmp; TCGv_i32 t0_32 = tcg_temp_new_i32();
t0_32 = tcg_temp_new_i32(); TCGv_i32 t1_32 = tcg_temp_new_i32();
t1_32 = tcg_temp_new_i32(); TCGv_i32 tmp = tcg_temp_new_i32();
tmp = tcg_const_i32(0); TCGv_i32 zero = tcg_constant_i32(0);
tcg_gen_extrl_i64_i32(t0_32, t0); tcg_gen_extrl_i64_i32(t0_32, t0);
tcg_gen_extrl_i64_i32(t1_32, t1); tcg_gen_extrl_i64_i32(t1_32, t1);
tcg_gen_add2_i32(cpu_NF, cpu_CF, t0_32, tmp, cpu_CF, tmp); tcg_gen_add2_i32(cpu_NF, cpu_CF, t0_32, zero, cpu_CF, zero);
tcg_gen_add2_i32(cpu_NF, cpu_CF, cpu_NF, cpu_CF, t1_32, tmp); tcg_gen_add2_i32(cpu_NF, cpu_CF, cpu_NF, cpu_CF, t1_32, zero);
tcg_gen_mov_i32(cpu_ZF, cpu_NF); tcg_gen_mov_i32(cpu_ZF, cpu_NF);
tcg_gen_xor_i32(cpu_VF, cpu_NF, t0_32); tcg_gen_xor_i32(cpu_VF, cpu_NF, t0_32);