From nobody Tue May 13 23:04:19 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1677317079; cv=none; d=zohomail.com; s=zohoarc; b=ISLM1U+S4+AgC9Ke+LtaPt8krEP6tS6GsjWSVtz9ROgCAlgoM9tftJluTT41RFS5CPJF6A7AkwuhBsv/AVDw25BNslxe0o3IMGxfuM9ImA4WSNOnz/kqXGGXinrpe6kzWq5EyUrXfrmfNs9c/fsa8DhmLlDo3aS9L46m3BxaJIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1677317079; h=Content-Transfer-Encoding:Cc: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=JVVeIuhjPjLUHH6q7jjqGdCcXDfNuJxyB7TieFblvRI=; b=Ga1GZ8YbBYYEyxpNVUfFVw9QSeS8IM0O1aCD9VU/TS8Ls1lRtXIDCcCLcJhdDdOkIQU+aSvMn1gYpZbwyEVLNMxI9W2DWQETloxKkuOqxJWIubHxT5c2b5CGYlHKh4fPRMbfEi2rWiGd8fWTgBkYOYWh/tCmbc+sT7XjEzT5YPo= 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+importer2=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 1677317079138149.45021603846465; Sat, 25 Feb 2023 01:24:39 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pVqjk-0000EM-SM; Sat, 25 Feb 2023 04:21:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pVqj4-0006DK-6f for qemu-devel@nongnu.org; Sat, 25 Feb 2023 04:20:19 -0500 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pVqix-00030G-St for qemu-devel@nongnu.org; Sat, 25 Feb 2023 04:20:15 -0500 Received: by mail-pj1-x1034.google.com with SMTP id cp7-20020a17090afb8700b0023756229427so5243500pjb.1 for ; Sat, 25 Feb 2023 01:20:07 -0800 (PST) Received: from stoup.. (rrcs-173-198-77-218.west.biz.rr.com. [173.198.77.218]) by smtp.gmail.com with ESMTPSA id 26-20020aa7921a000000b00592417157f2sm843114pfo.148.2023.02.25.01.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Feb 2023 01:20:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JVVeIuhjPjLUHH6q7jjqGdCcXDfNuJxyB7TieFblvRI=; b=LY2uiDmi7z7IMLZRRhroaSSQ5rik/sZgWw3+h6xoiPdIkpREbC0re6BrFoMldoL+oz w6aTyFIdpJogoxREX+a8+nbv8ChProZ0QVn6JQbfEIURC9N4OPhBp5AwO9nCj3LioK7+ cJvFdM99laqdLsuWLJ24d3BF3oQp4Vsfqg4LSJXDjdKbNU0kVVhTlj6VmK7RmT5Cl+cu Mhds9czblelAM+atIIQmCnT7MChBalvsxolhC+gfTSOlG1Gp/qdh2c0d0XW47+vmtam5 X9CY9uWF+eB+sHMG+ROnPHESbofC4B1Lv9Wu+VASH1a8SJBc4j7rsbkxuDg6EcOQVYhL 1k4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JVVeIuhjPjLUHH6q7jjqGdCcXDfNuJxyB7TieFblvRI=; b=y6S0YYzclotYXkB7wcHt8fHtUum3HxggodfGNf83N4PG45yWfhKo7r5+hHhyJYF9Ld H/aVi0G9a2fBueoDmxZz5yBe/rnIvF2CJKtBhL042yGnWpM5gOK5zHr0IPz//0XxjG3d 1LrJRa/01ZsR1QcqguCOzM3nUTml2mul0E1bUnkefrinZ2HmBsEI1F79cQiFQEJRChZg g3UDZLYEnN3/S+WFMIEKfoiuAF2XtAj/2lFvAOoeS1qK4JQ3KrYw0ckfqPHXRVeh3UvX jOCXZBlLmcUdWMf9JBChAN+1TiHVb9SLrYEM9/wVH5bqFjx/kz1RfdnF/uh6slMKgn4T gXXQ== X-Gm-Message-State: AO0yUKWKxWFsI3EsMlQX7zKjVEDq7jQQMYQLvc9MswiKUNWpihvA2yGa OUoheuvb9BEx7OMk6TzL4gSaBbPSWpPw4Oanqks= X-Google-Smtp-Source: AK7set9z7IrRDcYpa0Sadc+79uJJPMki7/l+6VO8ZjssFtqsxb5W0/dMRytX7b7boSHoBXBNgd87EA== X-Received: by 2002:a05:6a20:3951:b0:bc:59e9:f3d9 with SMTP id r17-20020a056a20395100b000bc59e9f3d9mr23804041pzg.0.1677316806844; Sat, 25 Feb 2023 01:20:06 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-s390x@nongnu.org, jcmvbkbc@gmail.com, kbastian@mail.uni-paderborn.de, ysato@users.sourceforge.jp, gaosong@loongson.cn, jiaxun.yang@flygoat.com, tsimpson@quicinc.com, ale@rev.ng, mrolnik@gmail.com, edgar.iglesias@gmail.com Subject: [PATCH 59/76] target/s390x: Drop free_compare Date: Fri, 24 Feb 2023 23:14:10 -1000 Message-Id: <20230225091427.1817156-60-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230225091427.1817156-1-richard.henderson@linaro.org> References: <20230225091427.1817156-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1034.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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1677317080490100001 Content-Type: text/plain; charset="utf-8" Translators are no longer required to free tcg temporaries. Remove the g1 and g2 members of DisasCompare, as they were used to track which temps needed to be freed. Signed-off-by: Richard Henderson --- target/s390x/tcg/translate.c | 46 +----------------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 811049ea28..76a1233946 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -156,8 +156,6 @@ struct DisasContext { typedef struct { TCGCond cond:8; bool is_64; - bool g1; - bool g2; union { struct { TCGv_i64 a, b; } s64; struct { TCGv_i32 a, b; } s32; @@ -722,7 +720,6 @@ static void disas_jcc(DisasContext *s, DisasCompare *c,= uint32_t mask) c->cond =3D (mask ? TCG_COND_ALWAYS : TCG_COND_NEVER); c->u.s32.a =3D cc_op; c->u.s32.b =3D cc_op; - c->g1 =3D c->g2 =3D true; c->is_64 =3D false; return; } @@ -839,7 +836,6 @@ static void disas_jcc(DisasContext *s, DisasCompare *c,= uint32_t mask) =20 /* Load up the arguments of the comparison. */ c->is_64 =3D true; - c->g1 =3D c->g2 =3D false; switch (old_cc_op) { case CC_OP_LTGT0_32: c->is_64 =3D false; @@ -861,13 +857,11 @@ static void disas_jcc(DisasContext *s, DisasCompare *= c, uint32_t mask) case CC_OP_FLOGR: c->u.s64.a =3D cc_dst; c->u.s64.b =3D tcg_constant_i64(0); - c->g1 =3D true; break; case CC_OP_LTGT_64: case CC_OP_LTUGTU_64: c->u.s64.a =3D cc_src; c->u.s64.b =3D cc_dst; - c->g1 =3D c->g2 =3D true; break; =20 case CC_OP_TM_32: @@ -882,7 +876,6 @@ static void disas_jcc(DisasContext *s, DisasCompare *c,= uint32_t mask) case CC_OP_SUBU: c->is_64 =3D true; c->u.s64.b =3D tcg_constant_i64(0); - c->g1 =3D true; switch (mask) { case 8 | 2: case 4 | 1: /* result */ @@ -900,7 +893,6 @@ static void disas_jcc(DisasContext *s, DisasCompare *c,= uint32_t mask) case CC_OP_STATIC: c->is_64 =3D false; c->u.s32.a =3D cc_op; - c->g1 =3D true; switch (mask) { case 0x8 | 0x4 | 0x2: /* cc !=3D 3 */ cond =3D TCG_COND_NE; @@ -916,7 +908,6 @@ static void disas_jcc(DisasContext *s, DisasCompare *c,= uint32_t mask) break; case 0x8 | 0x2: /* cc =3D=3D 0 || cc =3D=3D 2 =3D> (cc & 1) =3D=3D= 0 */ cond =3D TCG_COND_EQ; - c->g1 =3D false; c->u.s32.a =3D tcg_temp_new_i32(); c->u.s32.b =3D tcg_constant_i32(0); tcg_gen_andi_i32(c->u.s32.a, cc_op, 1); @@ -935,7 +926,6 @@ static void disas_jcc(DisasContext *s, DisasCompare *c,= uint32_t mask) break; case 0x4 | 0x1: /* cc =3D=3D 1 || cc =3D=3D 3 =3D> (cc & 1) !=3D 0= */ cond =3D TCG_COND_NE; - c->g1 =3D false; c->u.s32.a =3D tcg_temp_new_i32(); c->u.s32.b =3D tcg_constant_i32(0); tcg_gen_andi_i32(c->u.s32.a, cc_op, 1); @@ -959,7 +949,6 @@ static void disas_jcc(DisasContext *s, DisasCompare *c,= uint32_t mask) default: /* CC is masked by something else: (8 >> cc) & mask. */ cond =3D TCG_COND_NE; - c->g1 =3D false; c->u.s32.a =3D tcg_temp_new_i32(); c->u.s32.b =3D tcg_constant_i32(0); tcg_gen_shr_i32(c->u.s32.a, tcg_constant_i32(8), cc_op); @@ -974,24 +963,6 @@ static void disas_jcc(DisasContext *s, DisasCompare *c= , uint32_t mask) c->cond =3D cond; } =20 -static void free_compare(DisasCompare *c) -{ - if (!c->g1) { - if (c->is_64) { - tcg_temp_free_i64(c->u.s64.a); - } else { - tcg_temp_free_i32(c->u.s32.a); - } - } - if (!c->g2) { - if (c->is_64) { - tcg_temp_free_i64(c->u.s64.b); - } else { - tcg_temp_free_i32(c->u.s32.b); - } - } -} - /* =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */ /* Define the insn format enumeration. */ #define F0(N) FMT_##N, @@ -1302,7 +1273,6 @@ static DisasJumpType help_branch(DisasContext *s, Dis= asCompare *c, } =20 egress: - free_compare(c); return ret; } =20 @@ -1612,8 +1582,6 @@ static DisasJumpType op_bct32(DisasContext *s, DisasO= ps *o) =20 c.cond =3D TCG_COND_NE; c.is_64 =3D false; - c.g1 =3D false; - c.g2 =3D false; =20 t =3D tcg_temp_new_i64(); tcg_gen_subi_i64(t, regs[r1], 1); @@ -1635,8 +1603,6 @@ static DisasJumpType op_bcth(DisasContext *s, DisasOp= s *o) =20 c.cond =3D TCG_COND_NE; c.is_64 =3D false; - c.g1 =3D false; - c.g2 =3D false; =20 t =3D tcg_temp_new_i64(); tcg_gen_shri_i64(t, regs[r1], 32); @@ -1659,8 +1625,6 @@ static DisasJumpType op_bct64(DisasContext *s, DisasO= ps *o) =20 c.cond =3D TCG_COND_NE; c.is_64 =3D true; - c.g1 =3D true; - c.g2 =3D false; =20 tcg_gen_subi_i64(regs[r1], regs[r1], 1); c.u.s64.a =3D regs[r1]; @@ -1680,8 +1644,6 @@ static DisasJumpType op_bx32(DisasContext *s, DisasOp= s *o) =20 c.cond =3D (s->insn->data ? TCG_COND_LE : TCG_COND_GT); c.is_64 =3D false; - c.g1 =3D false; - c.g2 =3D false; =20 t =3D tcg_temp_new_i64(); tcg_gen_add_i64(t, regs[r1], regs[r3]); @@ -1708,15 +1670,12 @@ static DisasJumpType op_bx64(DisasContext *s, Disas= Ops *o) =20 if (r1 =3D=3D (r3 | 1)) { c.u.s64.b =3D load_reg(r3 | 1); - c.g2 =3D false; } else { c.u.s64.b =3D regs[r3 | 1]; - c.g2 =3D true; } =20 tcg_gen_add_i64(regs[r1], regs[r1], regs[r3]); c.u.s64.a =3D regs[r1]; - c.g1 =3D true; =20 return help_branch(s, &c, is_imm, imm, o->in2); } @@ -1731,7 +1690,7 @@ static DisasJumpType op_cj(DisasContext *s, DisasOps = *o) if (s->insn->data) { c.cond =3D tcg_unsigned_cond(c.cond); } - c.is_64 =3D c.g1 =3D c.g2 =3D true; + c.is_64 =3D true; c.u.s64.a =3D o->in1; c.u.s64.b =3D o->in2; =20 @@ -2925,13 +2884,11 @@ static DisasJumpType op_loc(DisasContext *s, DisasO= ps *o) if (c.is_64) { tcg_gen_movcond_i64(c.cond, o->out, c.u.s64.a, c.u.s64.b, o->in2, o->in1); - free_compare(&c); } else { TCGv_i32 t32 =3D tcg_temp_new_i32(); TCGv_i64 t, z; =20 tcg_gen_setcond_i32(c.cond, t32, c.u.s32.a, c.u.s32.b); - free_compare(&c); =20 t =3D tcg_temp_new_i64(); tcg_gen_extu_i32_i64(t, t32); @@ -4022,7 +3979,6 @@ static DisasJumpType op_soc(DisasContext *s, DisasOps= *o) } else { tcg_gen_brcond_i32(c.cond, c.u.s32.a, c.u.s32.b, lab); } - free_compare(&c); =20 r1 =3D get_field(s, r1); a =3D get_address(s, 0, get_field(s, b2), get_field(s, d2)); --=20 2.34.1