From patchwork Sat Oct 21 05:30:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 736605 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp631982wrl; Fri, 20 Oct 2023 22:33:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+Kg7EnEZ9rrMlBKD8bverdJEASoLcg1rZ5mhtfwncUhGJrFaImevDwKX/bYkaegWaxi0H X-Received: by 2002:ac8:5c04:0:b0:3f9:d1c3:cc45 with SMTP id i4-20020ac85c04000000b003f9d1c3cc45mr9167432qti.28.1697866394962; Fri, 20 Oct 2023 22:33:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697866394; cv=none; d=google.com; s=arc-20160816; b=vHSTaBq7Dd9KUa5TvW7AX01ws7Gl82Ekx5KK/oIbFP8Eh+Qr1f80Cdx6eA4KAM99Eu k588qbcqJ21yKYiOJuN4YzhaLjCGqeIPgCLjxPo24UDuvKsXBJxo6/bvwYCY+7kBNcV1 3B7g0jqrTiLgGLXmXUzjZE2+0VD3SEER/XfxJVr4M5GwDSP8DyOGs0QEV5iuyHOHgAEV +JjswWuBdpWLj+IilabxUMNbHG7ZM39TJTkR2u0R9BMrbi0C2e2EswFazT2y6EeJCmn0 +AbxlMZMkAbZJ7LtK8MrVQZSlBWqHn5GNDTy7pzrnK1MlW4PoUfPFdJPFAjizt7CRzz2 1e4Q== 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=pRMTQptI2nfQXOSpXQo/O0ul1mHB/BhVdQiXtwwiUDw=; fh=GkmytpQ/aBK+SnhsUxtqa1dYh9qnVue5D4c8ejqHfb0=; b=xGsAEe94nIt2T1Win45Q3zhXZT2OQ5h7tw7pzWPn3ovzIH16U5p8mAcKe5g0SqEB3d l5jC+ZcLuF6RGRywdl/JXh3/Yqt1DYOy2vnEkVM7gNY6sl2lB0KM00vQPGN8WxAg2P9D vVNeWyJJZWvtNP2m+RqCRyYY/ezkfd6+SsOOdQFU86DPfYBTX+dOyX7e99/YUfvJxPlv yj6a8garGSAkRJcIbz0boPbuSQRA1053xQiGRpHtOh3HAB2jyqkZvdNS49b8Gd+JI4JG WK8bABjFFN76A7iGWYW7/N/M2k2mODf5K5aLZi73+elnJJ0/8cZ3f5JgxNkWjxpZcHrx +uRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="B/utY966"; 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 i11-20020ac85e4b000000b0041962bf1693si2363006qtx.762.2023.10.20.22.33.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2023 22:33:14 -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="B/utY966"; 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 1qu4aw-0007Bp-VP; Sat, 21 Oct 2023 01:32:19 -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 1qu4au-0007A7-2a for qemu-devel@nongnu.org; Sat, 21 Oct 2023 01:32:16 -0400 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qu4as-0008Ov-FK for qemu-devel@nongnu.org; Sat, 21 Oct 2023 01:32:15 -0400 Received: by mail-pf1-x42e.google.com with SMTP id d2e1a72fcca58-6bf03b98b9bso1675038b3a.1 for ; Fri, 20 Oct 2023 22:32:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697866333; x=1698471133; 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=pRMTQptI2nfQXOSpXQo/O0ul1mHB/BhVdQiXtwwiUDw=; b=B/utY96650aNFsj48teI+n7ofj+ivT4P2GH4iyuoOBB0rzbTrQpw6AJ4RpGF1vTAyg RYXIIrQJBQaRSktow+cU4FjOg6PXbVH8ytAlKvFSHELw/Q/+YYxtf08KBkoPGCAcR/no WUFFYuvmjzQ5NlNB1yIMnTihPv2qasttEtDi4ppcS6XZzULBA8sODf6EV4jcZJZCsNAY oAoyNqa6z7PrN4Xsitft5tBlGphx6dCaWq6G6I5m89HRTcGa3KaAWlvJiOITOv3GlMek fDLi8cdb0aGYGjc2/QXfN1CDjBfy6Bbwg4eWSNnOvR5yW2MQ/Zz33a0mRMDRx0q1ucX7 HE0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697866333; x=1698471133; 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=pRMTQptI2nfQXOSpXQo/O0ul1mHB/BhVdQiXtwwiUDw=; b=l84ghE3iiOIRooF69BSi2zRmr51qHC6Y7CNwUvQ/Q+iCfgTD25GkPt/PHIILfvJ1wG Gx8gG/Z29Ea8Z1HaPwrH0DB836jOr+l6xlBwXBE0j8ed/i98W0N5Esd0nOqp2Oy5h8Do H05FF52GHYaX7jJNvR93j9s+FJBnj9iVrzsiGbhcRZU3L1L4n9HCcIYdj8d+AmzMnCJS z5gFadY/WAiBBap2TLo6h2NV9OO3PLFzitagdOmodu5co+y81v3fzIfCAFDceLABxXpb ffwOVhoMKJH+gTNSUIwvnBs1lhAiyqM/CWuWpTEbcwgTzPBgOcQ0ga5rP9dP23NKaYpd srKQ== X-Gm-Message-State: AOJu0YxIoG3TiG1l/ED0KNLFUGzel/Pg9dBenANKqXmn72eyqSTJ8vWl OCzgEx0KkPE13I9DckuJKUoBNeUKSWDAMdmODco= X-Received: by 2002:a05:6a20:8e23:b0:15a:4c23:870b with SMTP id y35-20020a056a208e2300b0015a4c23870bmr4682658pzj.23.1697866333106; Fri, 20 Oct 2023 22:32:13 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id f20-20020a056a001ad400b006b2677d3684sm2434831pfv.206.2023.10.20.22.32.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 22:32:12 -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 v3 16/90] target/sparc: Merge gen_fcond with only caller Date: Fri, 20 Oct 2023 22:30:44 -0700 Message-Id: <20231021053158.278135-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231021053158.278135-1-richard.henderson@linaro.org> References: <20231021053158.278135-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42e; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42e.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 | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 2664db302d..b8d51d6d64 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -1309,19 +1309,6 @@ static void gen_fcompare(DisasCompare *cmp, unsigned int cc, unsigned int cond) } } -static void gen_fcond(TCGv r_dst, unsigned int cc, unsigned int cond) -{ - DisasCompare cmp; - gen_fcompare(&cmp, cc, cond); - - /* 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); - } -} - // Inverted logic static const TCGCond gen_tcg_cond_reg[8] = { TCG_COND_NEVER, /* reserved */ @@ -2992,6 +2979,7 @@ TRANS(BPcc, 64, do_bpcc, a) static bool do_fbpfcc(DisasContext *dc, arg_bcc *a) { target_long target = address_mask_i(dc, dc->pc + a->i * 4); + DisasCompare cmp; if (gen_trap_ifnofpu(dc)) { return true; @@ -3003,7 +2991,13 @@ static bool do_fbpfcc(DisasContext *dc, arg_bcc *a) return advance_jump_uncond_always(dc, a->a, target); default: flush_cond(dc); - gen_fcond(cpu_cond, a->cc, a->cond); + + gen_fcompare(&cmp, a->cc, a->cond); + 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); } }