From nobody Mon Feb 9 12:38:03 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1625778074; cv=none; d=zohomail.com; s=zohoarc; b=RbQMajsy1ZanCrxXiQM48HMEL+3PGKpVdAPXTZW7fZNFUUJ6CXR0W1qXc0/YHLbmrvhQjVECEghBT6tznssqoBu3HCyWPsHKn06TwuhTNBFG99pBPCjSuXZMKVkRBxtawZLtAvpPUQXSM1mm5NIGFz9T7VUWFcQE7cJQddvw7pA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625778074; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=c1JNKEFIQfI1C230xpjHx5tNoiIpqmwgjelhG4w8h0g=; b=fKYs01QFuh27vEEqgG9pNyhwnLqKx0aC33i6gSF73fEL9c7yY12H+0gGELqgOpk6soKSB+FWXUh8UEv9yiIKVafchF2HBVITtWVEzQ1SN7OskI+S5Pvy0cbqtK6ns/ULrfESf6+vZkwp4ry1AC6xT9wPGA02xAZZpG7tcwxxP5Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625778074968961.3377736258345; Thu, 8 Jul 2021 14:01:14 -0700 (PDT) Received: from localhost ([::1]:45738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1b8z-0001BJ-Tm for importer@patchew.org; Thu, 08 Jul 2021 17:01:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1b6B-0006Zm-T5 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 16:58:19 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:45717) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1b63-0004cu-BY for qemu-devel@nongnu.org; Thu, 08 Jul 2021 16:58:19 -0400 Received: by mail-pg1-x529.google.com with SMTP id y17so7600315pgf.12 for ; Thu, 08 Jul 2021 13:58:10 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id z5sm3757000pfb.114.2021.07.08.13.58.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 13:58:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=c1JNKEFIQfI1C230xpjHx5tNoiIpqmwgjelhG4w8h0g=; b=V8E3v/HLlubZ/iH6TK07JDPnSwtewxqM7R2oSkH7kirtTxfyNBSOrtzT4m5g6Wvh/i iCMjXHrLhMixAnDpT3n1xCTCEKHw/JWOqaqCP7x9l9bXB3ovYCSeIOkTpC4571n4ZcPF Urq3YvFkekyOXMH9sAlXOmzXkGaXEwY2Gkid27liOtPnzsVBPLXNqoXg+v89mxZjvyIH 5DHqN69e5ukPiKRh5PJDBsMhmVemgEJH3KYsm7b058GtJwdBrj7dyobENIk38a1oxZIJ VkOkVgR18fFLWU2HpXPvv96N0nFWH+GEy27tYLxH4I6VpDoJyrY/E0xZEo34E2YFtgqj Po/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c1JNKEFIQfI1C230xpjHx5tNoiIpqmwgjelhG4w8h0g=; b=OCLXWpCDHhjiq3Mc21yIj2fFCtbWmxAkaMUIXE1sTW9nqKqpz+6fqtONRopDbJKkG4 scJ/c/HKkDOEYwDhkVCumsITxTouWWARWXpCrbXetHPf555jxQjCUW6FlrZquhhcwzwZ TjD6XoJ+NYxsrjt7SvJfWIwR1QhhoUfeIJQibDIcWTNTw/Uc4A0wEMzk5o1XID0w/mvd Wu5e1eobY9iOIxD1+m2YSCi8KwfYk8gzjDvDmFp/8gpNk5/a4SIge0+4iEE7yOkANoo5 WVrWPa31UJeIng9ZzA2owoyMmI1bUHXKaBjObrNS88LRW75K5GvJofQY0IMOueqd4Xuc 6x8Q== X-Gm-Message-State: AOAM531b0VvFPvvsf/FhgENaXr7SMPbopaJtazy6hznxOBpjyX2bt4jV LOXAUR6LSdQcJwH0lNx0c2/7NGrYK6r6Bg== X-Google-Smtp-Source: ABdhPJwygYlDUs7wuNJZqcoYALRa8ioXB5ZuB/FZ4SVKQurTA5t/B6EI7NnpRlb48j2d/V0SHLTAzg== X-Received: by 2002:a63:cf42:: with SMTP id b2mr1909405pgj.38.1625777889418; Thu, 08 Jul 2021 13:58:09 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/2] target/hppa: Use tcg_constant_* Date: Thu, 8 Jul 2021 13:58:06 -0700 Message-Id: <20210708205807.827147-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210708205807.827147-1-richard.henderson@linaro.org> References: <20210708205807.827147-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1625778076414100001 Content-Type: text/plain; charset="utf-8" Replace uses of tcg_const_* with the allocate and free close together. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/hppa/translate.c | 56 +++++++++++++---------------------------- 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 64af1e0d5c..d17568880f 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -145,6 +145,7 @@ #define tcg_gen_sextract_reg tcg_gen_sextract_i64 #define tcg_const_reg tcg_const_i64 #define tcg_const_local_reg tcg_const_local_i64 +#define tcg_constant_reg tcg_constant_i64 #define tcg_gen_movcond_reg tcg_gen_movcond_i64 #define tcg_gen_add2_reg tcg_gen_add2_i64 #define tcg_gen_sub2_reg tcg_gen_sub2_i64 @@ -239,6 +240,7 @@ #define tcg_gen_sextract_reg tcg_gen_sextract_i32 #define tcg_const_reg tcg_const_i32 #define tcg_const_local_reg tcg_const_local_i32 +#define tcg_constant_reg tcg_constant_i32 #define tcg_gen_movcond_reg tcg_gen_movcond_i32 #define tcg_gen_add2_reg tcg_gen_add2_i32 #define tcg_gen_sub2_reg tcg_gen_sub2_i32 @@ -772,9 +774,7 @@ static inline target_ureg iaoq_dest(DisasContext *ctx, = target_sreg disp) =20 static void gen_excp_1(int exception) { - TCGv_i32 t =3D tcg_const_i32(exception); - gen_helper_excp(cpu_env, t); - tcg_temp_free_i32(t); + gen_helper_excp(cpu_env, tcg_constant_i32(exception)); } =20 static void gen_excp(DisasContext *ctx, int exception) @@ -788,12 +788,9 @@ static void gen_excp(DisasContext *ctx, int exception) =20 static bool gen_excp_iir(DisasContext *ctx, int exc) { - TCGv_reg tmp; - nullify_over(ctx); - tmp =3D tcg_const_reg(ctx->insn); - tcg_gen_st_reg(tmp, cpu_env, offsetof(CPUHPPAState, cr[CR_IIR])); - tcg_temp_free(tmp); + tcg_gen_st_reg(tcg_constant_reg(ctx->insn), + cpu_env, offsetof(CPUHPPAState, cr[CR_IIR])); gen_excp(ctx, exc); return nullify_end(ctx); } @@ -1154,13 +1151,12 @@ static void do_add(DisasContext *ctx, unsigned rt, = TCGv_reg in1, } =20 if (!is_l || cond_need_cb(c)) { - TCGv_reg zero =3D tcg_const_reg(0); + TCGv_reg zero =3D tcg_constant_reg(0); cb_msb =3D get_temp(ctx); tcg_gen_add2_reg(dest, cb_msb, in1, zero, in2, zero); if (is_c) { tcg_gen_add2_reg(dest, cb_msb, dest, cb_msb, cpu_psw_cb_msb, z= ero); } - tcg_temp_free(zero); if (!is_l) { cb =3D get_temp(ctx); tcg_gen_xor_reg(cb, in1, in2); @@ -1246,7 +1242,7 @@ static void do_sub(DisasContext *ctx, unsigned rt, TC= Gv_reg in1, cb =3D tcg_temp_new(); cb_msb =3D tcg_temp_new(); =20 - zero =3D tcg_const_reg(0); + zero =3D tcg_constant_reg(0); if (is_b) { /* DEST,C =3D IN1 + ~IN2 + C. */ tcg_gen_not_reg(cb, in2); @@ -1262,7 +1258,6 @@ static void do_sub(DisasContext *ctx, unsigned rt, TC= Gv_reg in1, tcg_gen_eqv_reg(cb, in1, in2); tcg_gen_xor_reg(cb, cb, dest); } - tcg_temp_free(zero); =20 /* Compute signed overflow if required. */ sv =3D NULL; @@ -2453,17 +2448,16 @@ static bool trans_probe(DisasContext *ctx, arg_prob= e *a) form_gva(ctx, &addr, &ofs, a->b, 0, 0, 0, a->sp, 0, false); =20 if (a->imm) { - level =3D tcg_const_i32(a->ri); + level =3D tcg_constant_i32(a->ri); } else { level =3D tcg_temp_new_i32(); tcg_gen_trunc_reg_i32(level, load_gpr(ctx, a->ri)); tcg_gen_andi_i32(level, level, 3); } - want =3D tcg_const_i32(a->write ? PAGE_WRITE : PAGE_READ); + want =3D tcg_constant_i32(a->write ? PAGE_WRITE : PAGE_READ); =20 gen_helper_probe(dest, cpu_env, addr, level, want); =20 - tcg_temp_free_i32(want); tcg_temp_free_i32(level); =20 save_gpr(ctx, a->t, dest); @@ -2603,17 +2597,13 @@ static bool trans_lpa(DisasContext *ctx, arg_ldst *= a) =20 static bool trans_lci(DisasContext *ctx, arg_lci *a) { - TCGv_reg ci; - CHECK_MOST_PRIVILEGED(EXCP_PRIV_OPR); =20 /* The Coherence Index is an implementation-defined function of the physical address. Two addresses with the same CI have a coherent view of the cache. Our implementation is to return 0 for all, since the entire address space is coherent. */ - ci =3D tcg_const_reg(0); - save_gpr(ctx, a->t, ci); - tcg_temp_free(ci); + save_gpr(ctx, a->t, tcg_constant_reg(0)); =20 cond_free(&ctx->null_cond); return true; @@ -2714,8 +2704,6 @@ static bool trans_or(DisasContext *ctx, arg_rrr_cf *a) * currently implemented as idle. */ if ((rt =3D=3D 10 || rt =3D=3D 31) && r1 =3D=3D rt && r2 =3D=3D rt= ) { /* PAUSE */ - TCGv_i32 tmp; - /* No need to check for supervisor, as userland can only pause until the next timer interrupt. */ nullify_over(ctx); @@ -2726,10 +2714,8 @@ static bool trans_or(DisasContext *ctx, arg_rrr_cf *= a) nullify_set(ctx, 0); =20 /* Tell the qemu main loop to halt until this cpu has work. */ - tmp =3D tcg_const_i32(1); - tcg_gen_st_i32(tmp, cpu_env, -offsetof(HPPACPU, env) + - offsetof(CPUState, halted)); - tcg_temp_free_i32(tmp); + tcg_gen_st_i32(tcg_constant_i32(1), cpu_env, + offsetof(CPUState, halted) - offsetof(HPPACPU, = env)); gen_excp_1(EXCP_HALTED); ctx->base.is_jmp =3D DISAS_NORETURN; =20 @@ -2837,7 +2823,7 @@ static bool trans_ds(DisasContext *ctx, arg_rrr_cf *a) add2 =3D tcg_temp_new(); addc =3D tcg_temp_new(); dest =3D tcg_temp_new(); - zero =3D tcg_const_reg(0); + zero =3D tcg_constant_reg(0); =20 /* Form R1 << 1 | PSW[CB]{8}. */ tcg_gen_add_reg(add1, in1, in1); @@ -2855,7 +2841,6 @@ static bool trans_ds(DisasContext *ctx, arg_rrr_cf *a) tcg_gen_add2_i32(dest, cpu_psw_cb_msb, dest, cpu_psw_cb_msb, addc, zer= o); =20 tcg_temp_free(addc); - tcg_temp_free(zero); =20 /* Write back the result register. */ save_gpr(ctx, a->t, dest); @@ -2971,9 +2956,8 @@ static bool trans_ldc(DisasContext *ctx, arg_ldst *a) */ gen_helper_ldc_check(addr); =20 - zero =3D tcg_const_reg(0); + zero =3D tcg_constant_reg(0); tcg_gen_atomic_xchg_reg(dest, addr, zero, ctx->mmu_idx, mop); - tcg_temp_free(zero); =20 if (a->m) { save_gpr(ctx, a->b, ofs); @@ -3886,15 +3870,13 @@ static bool trans_fcmp_f(DisasContext *ctx, arg_fcl= ass2 *a) =20 ta =3D load_frw0_i32(a->r1); tb =3D load_frw0_i32(a->r2); - ty =3D tcg_const_i32(a->y); - tc =3D tcg_const_i32(a->c); + ty =3D tcg_constant_i32(a->y); + tc =3D tcg_constant_i32(a->c); =20 gen_helper_fcmp_s(cpu_env, ta, tb, ty, tc); =20 tcg_temp_free_i32(ta); tcg_temp_free_i32(tb); - tcg_temp_free_i32(ty); - tcg_temp_free_i32(tc); =20 return nullify_end(ctx); } @@ -3908,15 +3890,13 @@ static bool trans_fcmp_d(DisasContext *ctx, arg_fcl= ass2 *a) =20 ta =3D load_frd0(a->r1); tb =3D load_frd0(a->r2); - ty =3D tcg_const_i32(a->y); - tc =3D tcg_const_i32(a->c); + ty =3D tcg_constant_i32(a->y); + tc =3D tcg_constant_i32(a->c); =20 gen_helper_fcmp_d(cpu_env, ta, tb, ty, tc); =20 tcg_temp_free_i64(ta); tcg_temp_free_i64(tb); - tcg_temp_free_i32(ty); - tcg_temp_free_i32(tc); =20 return nullify_end(ctx); } --=20 2.25.1 From nobody Mon Feb 9 12:38:03 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1625778338; cv=none; d=zohomail.com; s=zohoarc; b=HyoST6Mb6OjO51H8OxbyiKi4JjmrgQ+raqRC26fjm0KnbsKnmW5+LKn825KGvrF9UVGosZC1dNAEmRlo8y+di210o0tcJeXeIPn6tz6VABZmn8P2o59nt4dTRoostpw8KOjeuddhGq0uc+c4m/j+C2CkdWVQPaEwzZ3qtBt48bQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1625778338; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=PxXjjDB20Mtauw+8hUpHM9KZ5JeiVgO4cr6GF629Uso=; b=EvJfe44FmWXOlY0pqdGcHH828X9hnzL5vlLZeC33Vqt4jMH5UsKCgUZx89HTy1791jiFB/f4l2nTIDTTu3YTTSHzgAv3u+cTdRXrqqbxNH9UVkyCD25BaMP6jMJCZX+/8TaVymPt22e4Wxv07dWHb70sTAwbdB5OYB5edikcRbc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1625778338692517.147101781416; Thu, 8 Jul 2021 14:05:38 -0700 (PDT) Received: from localhost ([::1]:53336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1bDF-0006t5-39 for importer@patchew.org; Thu, 08 Jul 2021 17:05:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1b69-0006Yq-Lv for qemu-devel@nongnu.org; Thu, 08 Jul 2021 16:58:17 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:39601) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1b66-0004cy-Ot for qemu-devel@nongnu.org; Thu, 08 Jul 2021 16:58:17 -0400 Received: by mail-pf1-x42d.google.com with SMTP id b12so6676978pfv.6 for ; Thu, 08 Jul 2021 13:58:11 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id z5sm3757000pfb.114.2021.07.08.13.58.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 13:58:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=PxXjjDB20Mtauw+8hUpHM9KZ5JeiVgO4cr6GF629Uso=; b=H6LzQ//z0iyMleUwEdCWcYkT/uHuUvFTtsdIXqGzn20p3c6vvLVcu0TzI1RW26XDoP 0xPRxleENDIQ6Ry1oX++4yUVDGv4EnDUK1VaCTAl8dOqRvJxZxiRUCP/YJAAuUTgxaCO IhZesjJySjsAflOUftKmmuzoA/rlT2fTGVVM/6Ngs6uJVz+2/p+bJflw3se0KcrlouJ7 tWacgII3z4WZyc4Vt75PCanPTfNBPeaA+h0pd09pDTHgcht2YqpAc83feU5FwjbpWaF0 VSPqMXHUPYz8O1jrz1HNDvS9/ChqEwn47LttkUMI+1O++WRwjeaqPTCDay2d6JbyRF8F DfqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PxXjjDB20Mtauw+8hUpHM9KZ5JeiVgO4cr6GF629Uso=; b=oxeNN14bZOQd6Ndn4LXlU67T6tXHs0a1JhNhIUwqusDyH1W9cq4Ec9I4GQOaTHUt7P eIZkw9wjf8FFp0T4nEj158kRWqrfkTM927e9UcCuDe8Lsv0F9k1OkyYLGCrF08jDoZ6V 6i3VwRmbe/PBBd7TKsRFe++ieR5mqR2UdhSXwkeCDC1Po5evKhTzrZgkdIr9JG4WDPiP 9mtRiZSx4+h8r+bfTjAlxb7i6Kf3qdKiW9fYGFe8yM0c9+nGtrKXJW8J1z+SIBxfk6r3 l48MVhSuJwwg9qcbgm+xtIU/uSeZ1sJIB3EFHu687rSjvlhZGlk/Fi8sN25dVtFu6S5p yheQ== X-Gm-Message-State: AOAM533Y/JrtvFjOIa6WkZ/srRrEyWj4eemIoCcULUMR1NfxzTjMEPje oQeCI9JLbSQlsDOSAy3WGXe7vLv+oF4iUg== X-Google-Smtp-Source: ABdhPJwsdafjmzXsI3MPG8DUmSEDLsFgzAPPkwj+FN7co1rMpazicKPiOKTnXAHc/8A4p2pNrN8IRg== X-Received: by 2002:a65:41c6:: with SMTP id b6mr34244634pgq.206.1625777890010; Thu, 08 Jul 2021 13:58:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 2/2] target/hppa: Clean up DisasCond Date: Thu, 8 Jul 2021 13:58:07 -0700 Message-Id: <20210708205807.827147-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210708205807.827147-1-richard.henderson@linaro.org> References: <20210708205807.827147-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1625778339591100001 Content-Type: text/plain; charset="utf-8" The a0_is_n flag is redundant with comparing a0 to cpu_psw_n. The a1_is_0 flag can be removed by initializing a1 to $0, which also means that cond_prep can be removed entirely. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- target/hppa/translate.c | 43 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 34 deletions(-) diff --git a/target/hppa/translate.c b/target/hppa/translate.c index d17568880f..fcb814735f 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -253,8 +253,6 @@ typedef struct DisasCond { TCGCond c; TCGv_reg a0, a1; - bool a0_is_n; - bool a1_is_0; } DisasCond; =20 typedef struct DisasContext { @@ -449,9 +447,7 @@ static DisasCond cond_make_n(void) return (DisasCond){ .c =3D TCG_COND_NE, .a0 =3D cpu_psw_n, - .a0_is_n =3D true, - .a1 =3D NULL, - .a1_is_0 =3D true + .a1 =3D tcg_constant_reg(0) }; } =20 @@ -459,7 +455,7 @@ static DisasCond cond_make_0_tmp(TCGCond c, TCGv_reg a0) { assert (c !=3D TCG_COND_NEVER && c !=3D TCG_COND_ALWAYS); return (DisasCond){ - .c =3D c, .a0 =3D a0, .a1_is_0 =3D true + .c =3D c, .a0 =3D a0, .a1 =3D tcg_constant_reg(0) }; } =20 @@ -483,26 +479,14 @@ static DisasCond cond_make(TCGCond c, TCGv_reg a0, TC= Gv_reg a1) return r; } =20 -static void cond_prep(DisasCond *cond) -{ - if (cond->a1_is_0) { - cond->a1_is_0 =3D false; - cond->a1 =3D tcg_const_reg(0); - } -} - static void cond_free(DisasCond *cond) { switch (cond->c) { default: - if (!cond->a0_is_n) { + if (cond->a0 !=3D cpu_psw_n) { tcg_temp_free(cond->a0); } - if (!cond->a1_is_0) { - tcg_temp_free(cond->a1); - } - cond->a0_is_n =3D false; - cond->a1_is_0 =3D false; + tcg_temp_free(cond->a1); cond->a0 =3D NULL; cond->a1 =3D NULL; /* fallthru */ @@ -560,9 +544,8 @@ static TCGv_reg dest_gpr(DisasContext *ctx, unsigned re= g) static void save_or_nullify(DisasContext *ctx, TCGv_reg dest, TCGv_reg t) { if (ctx->null_cond.c !=3D TCG_COND_NEVER) { - cond_prep(&ctx->null_cond); tcg_gen_movcond_reg(ctx->null_cond.c, dest, ctx->null_cond.a0, - ctx->null_cond.a1, dest, t); + ctx->null_cond.a1, dest, t); } else { tcg_gen_mov_reg(dest, t); } @@ -669,11 +652,9 @@ static void nullify_over(DisasContext *ctx) assert(ctx->null_cond.c !=3D TCG_COND_ALWAYS); =20 ctx->null_lab =3D gen_new_label(); - cond_prep(&ctx->null_cond); =20 /* If we're using PSW[N], copy it to a temp because... */ - if (ctx->null_cond.a0_is_n) { - ctx->null_cond.a0_is_n =3D false; + if (ctx->null_cond.a0 =3D=3D cpu_psw_n) { ctx->null_cond.a0 =3D tcg_temp_new(); tcg_gen_mov_reg(ctx->null_cond.a0, cpu_psw_n); } @@ -686,7 +667,7 @@ static void nullify_over(DisasContext *ctx) } =20 tcg_gen_brcond_reg(ctx->null_cond.c, ctx->null_cond.a0, - ctx->null_cond.a1, ctx->null_lab); + ctx->null_cond.a1, ctx->null_lab); cond_free(&ctx->null_cond); } } @@ -700,10 +681,9 @@ static void nullify_save(DisasContext *ctx) } return; } - if (!ctx->null_cond.a0_is_n) { - cond_prep(&ctx->null_cond); + if (ctx->null_cond.a0 !=3D cpu_psw_n) { tcg_gen_setcond_reg(ctx->null_cond.c, cpu_psw_n, - ctx->null_cond.a0, ctx->null_cond.a1); + ctx->null_cond.a0, ctx->null_cond.a1); ctx->psw_n_nonzero =3D true; } cond_free(&ctx->null_cond); @@ -1182,7 +1162,6 @@ static void do_add(DisasContext *ctx, unsigned rt, TC= Gv_reg in1, /* Emit any conditional trap before any writeback. */ cond =3D do_cond(cf, dest, cb_msb, sv); if (is_tc) { - cond_prep(&cond); tmp =3D tcg_temp_new(); tcg_gen_setcond_reg(cond.c, tmp, cond.a0, cond.a1); gen_helper_tcond(cpu_env, tmp); @@ -1277,7 +1256,6 @@ static void do_sub(DisasContext *ctx, unsigned rt, TC= Gv_reg in1, =20 /* Emit any conditional trap before any writeback. */ if (is_tc) { - cond_prep(&cond); tmp =3D tcg_temp_new(); tcg_gen_setcond_reg(cond.c, tmp, cond.a0, cond.a1); gen_helper_tcond(cpu_env, tmp); @@ -1403,7 +1381,6 @@ static void do_unit(DisasContext *ctx, unsigned rt, T= CGv_reg in1, =20 if (is_tc) { TCGv_reg tmp =3D tcg_temp_new(); - cond_prep(&cond); tcg_gen_setcond_reg(cond.c, tmp, cond.a0, cond.a1); gen_helper_tcond(cpu_env, tmp); tcg_temp_free(tmp); @@ -1859,7 +1836,6 @@ static bool do_cbranch(DisasContext *ctx, target_sreg= disp, bool is_n, } =20 taken =3D gen_new_label(); - cond_prep(cond); tcg_gen_brcond_reg(c, cond->a0, cond->a1, taken); cond_free(cond); =20 @@ -1956,7 +1932,6 @@ static bool do_ibranch(DisasContext *ctx, TCGv_reg de= st, tcg_gen_lookup_and_goto_ptr(); return nullify_end(ctx); } else { - cond_prep(&ctx->null_cond); c =3D ctx->null_cond.c; a0 =3D ctx->null_cond.a0; a1 =3D ctx->null_cond.a1; --=20 2.25.1