From patchwork Sun Oct 22 05:59:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 737009 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp1006749wrl; Sat, 21 Oct 2023 23:16:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHSMDB/yS2pejXDaU/DExmnWBKfX3g8wZbI1cljUWxPE+oYMKDejWUuvCvudlkAn8v41mbx X-Received: by 2002:a05:6214:d46:b0:656:3fa4:6016 with SMTP id 6-20020a0562140d4600b006563fa46016mr8274391qvr.62.1697955395350; Sat, 21 Oct 2023 23:16:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697955395; cv=none; d=google.com; s=arc-20160816; b=PgpRCZ9WqZgVJCdLyW/ozLdSslHBY/WFeadBnFSirGdA2OlPLVe3FZqufijjKDwzmi jMv0JDriJ7wI/QyAV1qfDJoce+N2fa8fg0bPvXrfM8ivzqB9CsjIKax064uKuGExyWTb WN3VaGsutV1dvqzkdwdaDeVZ5swWAv/1j01HxPv8chAoZ/t1vftXFWZRK7W2g+ByO8Yw ybrgOZrl1IJ0Ji5N73MxKTi+KDFAt0LZqpwQWt5XFzoMq64SgaapTfpZSomEJzNDKrlk xE7euSdXSRIAgyHSuwAkAzPC951jA1Rj0kNPzQEyyZs6zQ8iWXhSsgDnusyeOlofHFGV eqKw== 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=wmDa64Gca20nDmrXVypVfD852JFXcmSGDjcXXZ4bM8M=; fh=GkmytpQ/aBK+SnhsUxtqa1dYh9qnVue5D4c8ejqHfb0=; b=YHsgNYlwjT/4u9adelHHuLkePX/nimTAlSnup10Dd7hrUlQOjisUbwgILoEwk86aJK l73VFjCYsboquMNXvsUSA5Rrmusyl7ZzCyWInvQX2Hd91LPDKu/iA2gcup0D2kCvzNo1 of/jso+WIj8vcsRrWPyWFk/bH3L6WnUch7Il9Pe1bcOx6tZa8FZBSHJ75NZWqphuZosr iRaVUIq9Pp0laaQw2rTdCcFS8WIEPk316Y5DR7PjOPofyx5OLdGYvsXZcRufpjBaA+Sa 3qapq3PhmxrxCO37ukl3baEc61688l9ZjLk9ebD2xugwx673Y7Ptm0fp/4o/Db1EciMN RyVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UQAarqwJ; 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 ff3-20020a0562140bc300b0066ceeacae81si3899913qvb.536.2023.10.21.23.16.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Oct 2023 23:16:35 -0700 (PDT) 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=UQAarqwJ; 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 1quRW6-0000XB-2b; Sun, 22 Oct 2023 02:00:50 -0400 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 1quRW4-0000WP-Mt for qemu-devel@nongnu.org; Sun, 22 Oct 2023 02:00:48 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1quRW3-0001YF-5W for qemu-devel@nongnu.org; Sun, 22 Oct 2023 02:00:48 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-6b26a3163acso1592228b3a.2 for ; Sat, 21 Oct 2023 23:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697954445; x=1698559245; darn=nongnu.org; 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=wmDa64Gca20nDmrXVypVfD852JFXcmSGDjcXXZ4bM8M=; b=UQAarqwJBEjeGheaKzZW8N8Rm5YbQuJ9j/gTLhAWsSO8trtf5bHqb2jxRDTAtAyfH2 6/eldwo9Iht0FZT/kWLvFgv2mJs6xR5ED48GCB+GUNqXGJ67TlccQQz4GcVvmt8Y55aj 8M59C5lGjVzBbBvVnrtegffLW2FD2l5qdBMsGfLJdQXHqCvgCbsDb7iI4Yb3aEk0T28c +PyEBAknsrwDMkifGP3iDHLJrEfE/XZ1x5u3UCLy+2B2S2BcLWgzALtia+eEgPSyL6gE +oG39ieaVRzx6byOPCdMZmWBkagxqEA9penfxuQSiVhLUuO1n9zTmqojwmNmDCZCAXCO c3Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697954445; x=1698559245; 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=wmDa64Gca20nDmrXVypVfD852JFXcmSGDjcXXZ4bM8M=; b=I+FVyFNqqkqXNcpUveONGcfQ+/NFWLS+5SnrVVGSVbC36w0+QzOCNmJEBgTPIPZjlX Kz+jyKTDD0P615V9A6k8AQlXVybzbHdPb2RdgGN/UCibx9rZVdqTp8mtFNVymH2h2UWT SErNwQdl2m0b7yxHiRS01NJuzFux77TTS8/Kj63ZWon4e4xlxkicSAbYrgNMsa1yJzNK K74EKQOSMJzjkZ2b0a49jcseNupHa59PmYyywxy5fYbEdw3KFDqPwDlXYSqqEUQNP2S2 n65Mm7G9jCO5DnRns3sexUUz3m37+BlrVhil+reGItUIEURZwKXzoAyz2bEl2v8lJEpB NPzg== X-Gm-Message-State: AOJu0Yx29M55KraZ9NDKwlM3tLAvShyQQwv4X+d6GbTtjDhShFemaLGG 4D4a+3J9p2uPnWffenaMKDCAWE/LTnj/oVabXOU= X-Received: by 2002:a17:902:e5c5:b0:1c4:56c8:27f8 with SMTP id u5-20020a170902e5c500b001c456c827f8mr3697257plf.68.1697954445623; Sat, 21 Oct 2023 23:00:45 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id je17-20020a170903265100b001c728609574sm3999887plb.6.2023.10.21.23.00.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 23:00:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v4 15/90] target/sparc: Merge gen_cond with only caller Date: Sat, 21 Oct 2023 22:59:16 -0700 Message-Id: <20231022060031.490251-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231022060031.490251-1-richard.henderson@linaro.org> References: <20231022060031.490251-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.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 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/sparc/translate.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 69e85b1842..2664db302d 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -1309,20 +1309,6 @@ static void gen_fcompare(DisasCompare *cmp, unsigned int cc, unsigned int cond) } } -static void gen_cond(TCGv r_dst, unsigned int cc, unsigned int cond, - DisasContext *dc) -{ - DisasCompare cmp; - gen_compare(&cmp, cc, cond, dc); - - /* The interface is to return a boolean in r_dst. */ - if (cmp.is_bool) { - tcg_gen_mov_tl(r_dst, cmp.c1); - } else { - tcg_gen_setcond_tl(cmp.cond, r_dst, cmp.c1, cmp.c2); - } -} - static void gen_fcond(TCGv r_dst, unsigned int cc, unsigned int cond) { DisasCompare cmp; @@ -2980,6 +2966,7 @@ static bool advance_jump_cond(DisasContext *dc, bool annul, target_ulong dest) static bool do_bpcc(DisasContext *dc, arg_bcc *a) { target_long target = address_mask_i(dc, dc->pc + a->i * 4); + DisasCompare cmp; switch (a->cond) { case 0x0: @@ -2988,7 +2975,13 @@ static bool do_bpcc(DisasContext *dc, arg_bcc *a) return advance_jump_uncond_always(dc, a->a, target); default: flush_cond(dc); - gen_cond(cpu_cond, a->cc, a->cond, dc); + + gen_compare(&cmp, a->cc, a->cond, dc); + if (cmp.is_bool) { + tcg_gen_mov_tl(cpu_cond, cmp.c1); + } else { + tcg_gen_setcond_tl(cmp.cond, cpu_cond, cmp.c1, cmp.c2); + } return advance_jump_cond(dc, a->a, target); } }