From patchwork Sun Dec 11 15:27:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 633073 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp1991519pvb; Sun, 11 Dec 2022 07:29:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf7TyWJMugQrmrhC2QbTuGHKkKkHxNelpC3Z3LYM4329ALkASTMD+iN4yPBTqtxRY3UmIwnv X-Received: by 2002:ad4:4ee1:0:b0:4d0:ab34:6667 with SMTP id dv1-20020ad44ee1000000b004d0ab346667mr20887833qvb.12.1670772595661; Sun, 11 Dec 2022 07:29:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670772595; cv=none; d=google.com; s=arc-20160816; b=MmjHzaJ2zsrqnKhT2JIS7kE/BTN7tels0xdv2yHy1z8hM9DbX8jQGzko9D95H4LTRl i5IX0IJmA+M6KbSVYgzoU2HJ0UvZU4eQ8J5p+k6KazleQbCi/l/1r/pYqA4TiwenFdW2 7/49XOqweI2pEAGAaFbapN/uKiqOh7wZTZ1z9bCF+1/U4greUP7d61dlWsT1Is2AqNmf lfb9pkvRRHR88ljbPm63DjDa/XC2t1WHsls0HeGoDZlqWAXHapjn8UVPB/k66IzTk0uh F0y6U6xE/qFRLaVeY3Iia3WiV176uXqT9nTn7OcIC1HJu0XhByuMDoiM8eT6sA1CflP8 xx9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qCozwaU6tDOWmzdSXymSiQAl14+NiGjcB+W8aIT9X7E=; b=0OslTRXpRCH8iHZ46ZliFXXSe+huPLS4cbaHSul1MDIOv3yPn3Rh8dFZAhjn2yiy2k c93yKJntnlKdF1gvd1N0But+Hnv484WHw3WPJq2DA0tjO/E9LNJ5267T2UMBDmpIJ5uy 45tdZKhXlqvpG/QPelR84rgEibqV8VqB3k875apMKC2U/eEWLc/BDx6liS+zjfnLLVpT FfmtD8d55NLWI7psncoPkwqMkZrlWtc9/pIaYT/tIBuB07MvZ0qEkpMkQRKG/5kmHv8W fAgVfLqqq9JgbfwBV72990nAkUjIJaYY7jfquvXzFem6d6QbKGvg3K0qIAoOHD0NF2F+ dy/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y0mAmGvR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f12-20020a0562141d2c00b004e0646c7156si2669qvd.115.2022.12.11.07.29.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Dec 2022 07:29:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y0mAmGvR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4OFh-0006H4-R5; Sun, 11 Dec 2022 10:28:29 -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 1p4OFO-00066V-6g for qemu-devel@nongnu.org; Sun, 11 Dec 2022 10:28:14 -0500 Received: from mail-oi1-x22e.google.com ([2607:f8b0:4864:20::22e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p4OFM-0007FD-8S for qemu-devel@nongnu.org; Sun, 11 Dec 2022 10:28:09 -0500 Received: by mail-oi1-x22e.google.com with SMTP id k189so9060399oif.7 for ; Sun, 11 Dec 2022 07:28:07 -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=qCozwaU6tDOWmzdSXymSiQAl14+NiGjcB+W8aIT9X7E=; b=y0mAmGvRTyYnJhY/c3oJzZ3EZt1BDYnTvvJl8pJQF0GMey0hlK5vjlMbpFYbI1V6RY 4FiXKvVrAV0OCgI4r5oGK80VKhUjn87nrNINPos7ZZPr5y+MzFv2eQg1Rwn5kzRGbaH1 nCtsM653t089bNww7ePXhNjTlFfKmG4BKkMHu975L7TRefbo4fZMFi8fdkKdsOucTyRw ZZCt7USqUIev6WrlzXRFE6Mg5Ht8ZXNoYe9bqaNEMn+GUyVxGd/SfK58Hqg1RSUE8QTI fC4zqkLmpkUoYxIu4parP9RJEYWOJLXjZdWfFivpnPkyKEqIje859yN3/z8QrtQckUat B1Wg== 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=qCozwaU6tDOWmzdSXymSiQAl14+NiGjcB+W8aIT9X7E=; b=WrsNqhwhaQBFrMvn+h1fqNEFMn2jW5uDSu3GJ2BvD52o2qJzexrhJPcOorOtkmZ52W sZaa4GyKgnMAFBAz5djo43LatnhwTv9+jDUOaHZmoWveNFAKojmhPR7o7HItAFzn947M E7KwOZ1NwoJJ3qbeq9Eqj213R8EG3JASQOB91GsTvSE5ip3HPjXdE2ALFOYE8JeZtnTK iuUVn/7mU40eXwOmUW28M0w5TerKBiGWq/vdk9pEW9Ys3XTlVhgUn7W2XEaDWBFbSPAn DSFgALIBGwP0Zo+9+AJ7eVfa/MzLLLchVYDGoVRW0WWOzV4oLOpQkr5FyQPIXnKSJNDx bAxA== X-Gm-Message-State: ANoB5pmfkyxvJ6XhNcyh/HwM0oqcrsNC4Xav76HRjCMYLYZMdVZ+MWFV Kfoh+MgTvjxoCGvra1yCf1egvPuSwN6Dw8pUj7E= X-Received: by 2002:a05:6808:21a2:b0:35e:3c62:489d with SMTP id be34-20020a05680821a200b0035e3c62489dmr9525822oib.36.1670772487062; Sun, 11 Dec 2022 07:28:07 -0800 (PST) Received: from stoup.. ([2806:102e:18:2efc:7b4f:f28b:eca6:b583]) by smtp.gmail.com with ESMTPSA id q24-20020a056830233800b006708d2cd8bcsm938140otg.65.2022.12.11.07.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Dec 2022 07:28:06 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, Ilya Leoshkevich Subject: [PATCH v2 02/27] target/s390x: Use tcg_constant_* for DisasCompare Date: Sun, 11 Dec 2022 09:27:37 -0600 Message-Id: <20221211152802.923900-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221211152802.923900-1-richard.henderson@linaro.org> References: <20221211152802.923900-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22e; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22e.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The a and b fields are not modified by the consumer, and while we need not free a constant, tcg will quietly ignore such frees, so free_compare need not be changed. Reviewed-by: Ilya Leoshkevich Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- target/s390x/tcg/translate.c | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 4fb396b557..77919295d3 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -830,7 +830,7 @@ static void disas_jcc(DisasContext *s, DisasCompare *c, uint32_t mask) c->is_64 = false; c->u.s32.a = tcg_temp_new_i32(); tcg_gen_extrl_i64_i32(c->u.s32.a, cc_dst); - c->u.s32.b = tcg_const_i32(0); + c->u.s32.b = tcg_constant_i32(0); break; case CC_OP_LTGT_32: case CC_OP_LTUGTU_32: @@ -845,7 +845,7 @@ static void disas_jcc(DisasContext *s, DisasCompare *c, uint32_t mask) case CC_OP_NZ: case CC_OP_FLOGR: c->u.s64.a = cc_dst; - c->u.s64.b = tcg_const_i64(0); + c->u.s64.b = tcg_constant_i64(0); c->g1 = true; break; case CC_OP_LTGT_64: @@ -859,14 +859,14 @@ static void disas_jcc(DisasContext *s, DisasCompare *c, uint32_t mask) case CC_OP_TM_64: case CC_OP_ICM: c->u.s64.a = tcg_temp_new_i64(); - c->u.s64.b = tcg_const_i64(0); + c->u.s64.b = tcg_constant_i64(0); tcg_gen_and_i64(c->u.s64.a, cc_src, cc_dst); break; case CC_OP_ADDU: case CC_OP_SUBU: c->is_64 = true; - c->u.s64.b = tcg_const_i64(0); + c->u.s64.b = tcg_constant_i64(0); c->g1 = true; switch (mask) { case 8 | 2: @@ -889,65 +889,65 @@ static void disas_jcc(DisasContext *s, DisasCompare *c, uint32_t mask) switch (mask) { case 0x8 | 0x4 | 0x2: /* cc != 3 */ cond = TCG_COND_NE; - c->u.s32.b = tcg_const_i32(3); + c->u.s32.b = tcg_constant_i32(3); break; case 0x8 | 0x4 | 0x1: /* cc != 2 */ cond = TCG_COND_NE; - c->u.s32.b = tcg_const_i32(2); + c->u.s32.b = tcg_constant_i32(2); break; case 0x8 | 0x2 | 0x1: /* cc != 1 */ cond = TCG_COND_NE; - c->u.s32.b = tcg_const_i32(1); + c->u.s32.b = tcg_constant_i32(1); break; case 0x8 | 0x2: /* cc == 0 || cc == 2 => (cc & 1) == 0 */ cond = TCG_COND_EQ; c->g1 = false; c->u.s32.a = tcg_temp_new_i32(); - c->u.s32.b = tcg_const_i32(0); + c->u.s32.b = tcg_constant_i32(0); tcg_gen_andi_i32(c->u.s32.a, cc_op, 1); break; case 0x8 | 0x4: /* cc < 2 */ cond = TCG_COND_LTU; - c->u.s32.b = tcg_const_i32(2); + c->u.s32.b = tcg_constant_i32(2); break; case 0x8: /* cc == 0 */ cond = TCG_COND_EQ; - c->u.s32.b = tcg_const_i32(0); + c->u.s32.b = tcg_constant_i32(0); break; case 0x4 | 0x2 | 0x1: /* cc != 0 */ cond = TCG_COND_NE; - c->u.s32.b = tcg_const_i32(0); + c->u.s32.b = tcg_constant_i32(0); break; case 0x4 | 0x1: /* cc == 1 || cc == 3 => (cc & 1) != 0 */ cond = TCG_COND_NE; c->g1 = false; c->u.s32.a = tcg_temp_new_i32(); - c->u.s32.b = tcg_const_i32(0); + c->u.s32.b = tcg_constant_i32(0); tcg_gen_andi_i32(c->u.s32.a, cc_op, 1); break; case 0x4: /* cc == 1 */ cond = TCG_COND_EQ; - c->u.s32.b = tcg_const_i32(1); + c->u.s32.b = tcg_constant_i32(1); break; case 0x2 | 0x1: /* cc > 1 */ cond = TCG_COND_GTU; - c->u.s32.b = tcg_const_i32(1); + c->u.s32.b = tcg_constant_i32(1); break; case 0x2: /* cc == 2 */ cond = TCG_COND_EQ; - c->u.s32.b = tcg_const_i32(2); + c->u.s32.b = tcg_constant_i32(2); break; case 0x1: /* cc == 3 */ cond = TCG_COND_EQ; - c->u.s32.b = tcg_const_i32(3); + c->u.s32.b = tcg_constant_i32(3); break; default: /* CC is masked by something else: (8 >> cc) & mask. */ cond = TCG_COND_NE; c->g1 = false; - c->u.s32.a = tcg_const_i32(8); - c->u.s32.b = tcg_const_i32(0); - tcg_gen_shr_i32(c->u.s32.a, c->u.s32.a, cc_op); + c->u.s32.a = tcg_temp_new_i32(); + c->u.s32.b = tcg_constant_i32(0); + tcg_gen_shr_i32(c->u.s32.a, tcg_constant_i32(8), cc_op); tcg_gen_andi_i32(c->u.s32.a, c->u.s32.a, mask); break; } @@ -1604,7 +1604,7 @@ static DisasJumpType op_bct32(DisasContext *s, DisasOps *o) tcg_gen_subi_i64(t, regs[r1], 1); store_reg32_i64(r1, t); c.u.s32.a = tcg_temp_new_i32(); - c.u.s32.b = tcg_const_i32(0); + c.u.s32.b = tcg_constant_i32(0); tcg_gen_extrl_i64_i32(c.u.s32.a, t); tcg_temp_free_i64(t); @@ -1628,7 +1628,7 @@ static DisasJumpType op_bcth(DisasContext *s, DisasOps *o) tcg_gen_subi_i64(t, t, 1); store_reg32h_i64(r1, t); c.u.s32.a = tcg_temp_new_i32(); - c.u.s32.b = tcg_const_i32(0); + c.u.s32.b = tcg_constant_i32(0); tcg_gen_extrl_i64_i32(c.u.s32.a, t); tcg_temp_free_i64(t); @@ -1649,7 +1649,7 @@ static DisasJumpType op_bct64(DisasContext *s, DisasOps *o) tcg_gen_subi_i64(regs[r1], regs[r1], 1); c.u.s64.a = regs[r1]; - c.u.s64.b = tcg_const_i64(0); + c.u.s64.b = tcg_constant_i64(0); return help_branch(s, &c, is_imm, imm, o->in2); }