From patchwork Sun Oct 22 23:28:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 737027 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp1282368wrl; Sun, 22 Oct 2023 16:31:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH7oBJdMSCFuRE7hSv7Bfb3BPsbToTMAoL2YypzAGuZ8DVaLfd6PpKMMHSOoM6wQQstGUHI X-Received: by 2002:a05:620a:170a:b0:774:30b7:ed93 with SMTP id az10-20020a05620a170a00b0077430b7ed93mr8503277qkb.29.1698017510363; Sun, 22 Oct 2023 16:31:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698017510; cv=none; d=google.com; s=arc-20160816; b=Rv+X4gHM2ZgQbTZAIxuIGWjzAhx85SME7l9XVEPumfIpucORsrKTt7rffA7NaABHM4 td1WUo+0Bl/FQSLTj/CoozInoRQOl4E+liToUej71swQuTF0wfXua8vKediXiMgMPJSt h1M/FvW5T/m1/cqwNqeVL5i5/mmkNrVnpSVCk6ErJ/FpWi3VZ0c1iiGgGeULseqj42no EKIM4ynhudjs537vZ+veN1F5QWhmBeVKydF3x9cr1OOYgd8hrkvByZ8khO1cPhWml3P0 RqYOdkgoE/knZINUyv0m9AbHmtJGCbYBrRlcQp9xDlz/Nbrxat2Smfe7J7AaGPhzjvRP sRjA== 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=RPgAucB/EvVI7/45p+5WkYALvfhQJlj29a4kXp2aWhI=; fh=GkmytpQ/aBK+SnhsUxtqa1dYh9qnVue5D4c8ejqHfb0=; b=HMzMNcfoKvdWi1Pp0aL5+aRQ6TJqQ7tb0KCYcQ0t9P+8KteYo3PfsxGwPvM7IYI+fW oMqbZo6T38pqAgtQTJkLugFwN7UdAdI51EVC4zFaHs/qOonFA506rAZFp/VhB2YSmRvS JScCNXV2158aGY6uKy+Xb9a2U0Q6VcqqyBeo6mRXxtKXUGVhMcUb+h2N3Sp6+FWsrfBp 6MDATj2fcQauegAD33cv/HqvdBg5BbLl2b1Np8To/AQONfkWi0sTva2dZUpRLY4zyF9a P8ODgfpNdRCXzbcrufFkAacejdTPWsMn0LVzPyVTgUciV+PsxiQiPq0/RJSfShwifNIZ HHjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ox4HCqqj; 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 j13-20020a05620a288d00b00774373352acsi4639613qkp.762.2023.10.22.16.31.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Oct 2023 16:31:50 -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=Ox4HCqqj; 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 1quhtY-0007HL-Tm; Sun, 22 Oct 2023 19:30:08 -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 1quhtJ-00077h-9H for qemu-devel@nongnu.org; Sun, 22 Oct 2023 19:29:56 -0400 Received: from mail-il1-x129.google.com ([2607:f8b0:4864:20::129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1quhtF-0006l8-A1 for qemu-devel@nongnu.org; Sun, 22 Oct 2023 19:29:52 -0400 Received: by mail-il1-x129.google.com with SMTP id e9e14a558f8ab-357cd0d4e47so4203115ab.1 for ; Sun, 22 Oct 2023 16:29:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698017388; x=1698622188; 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=RPgAucB/EvVI7/45p+5WkYALvfhQJlj29a4kXp2aWhI=; b=Ox4HCqqjfIH3orRtzhLX49Swky91FgVr+/uiA/FR09PXDRfaAqJlccMiH8+yY5IK95 kfXkYwpBDQ1abis6jd9OK956h1oN4Oyc5rOlXkZsLzVo6FNqjqkKNfdljhxIYOyTPwxk h5v2cBUFvMD1RuNyDsl9AAAcmyq9REss+U5Wz0D5XikKznifclRcfVkBj+nN8bRV+h1s yF64mj1va5rdKE9fwaMlJ+/GvdNEC4QFFTNU7SAchNE02vPsPUP7jnRep27mQCu+XoY1 AM3nHIQ8U7RwXGSDxu6R9/WKl8xmDGWbxeG8I+VZXqG+FDNi9egryWAwPvXNqlC7MKNH ZrLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698017388; x=1698622188; 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=RPgAucB/EvVI7/45p+5WkYALvfhQJlj29a4kXp2aWhI=; b=PGExHTOkxhRG5YycgNSDYCiYkOtmi1JyTt4j3q6q07QeadVYGicbiRw+4gZOs/EeIL Wq0vY+WGW6lb2YPmLUrrRbHcJwzYE7jU4tTeakYf6KkJh0oGkmoG4uapiA6LVFxwyEZG c2Uj8SbcWtkwhCKXr0ilgy3mEFxnubbwGEdkGkyn3bciMhKuTrOROoQ5GE0nsXBbeYTO Uu7R+CLDKYp/DQgTOw+E7UNXFUEABuzZ8k+Ytj6pu78D1OhvasIgimwsiA3VYLGJMS8D 6taYB/lc2D1BD7dZYrAd5qLO21eRiczIwyHESprPTA2H0Uemp3P54pWH59Jp8ASr4YrG tEiQ== X-Gm-Message-State: AOJu0YxLdCJS9VUHPODonWygn85RhbqnsC3BWfAwhWHF2PRXHWydEQSM 5arkKBoGQlvAAk+2As3Qow4adsncxBjFJDgR4Eg= X-Received: by 2002:a05:6e02:12c6:b0:357:a04c:31d2 with SMTP id i6-20020a056e0212c600b00357a04c31d2mr10899571ilm.16.1698017388065; Sun, 22 Oct 2023 16:29:48 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id k26-20020a63ba1a000000b005b25a04cf8bsm4023772pgf.12.2023.10.22.16.29.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 16:29:47 -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 v5 16/94] target/sparc: Merge gen_cond with only caller Date: Sun, 22 Oct 2023 16:28:14 -0700 Message-Id: <20231022232932.80507-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231022232932.80507-1-richard.henderson@linaro.org> References: <20231022232932.80507-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::129; envelope-from=richard.henderson@linaro.org; helo=mail-il1-x129.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 Tested-by: Mark Cave-Ayland Acked-by: Mark Cave-Ayland 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); } }