From patchwork Sun Oct 22 05:59:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 736926 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp1003075wrl; Sat, 21 Oct 2023 23:01:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IECH6C4Z5KrOEYxq96HYFnrs19kitecdMgI/vPiV/d0ZMc3FeoZhS8OxxuRaFOhnlZZa4OA X-Received: by 2002:ac8:59d1:0:b0:418:af7:e00a with SMTP id f17-20020ac859d1000000b004180af7e00amr7008915qtf.21.1697954514539; Sat, 21 Oct 2023 23:01:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697954514; cv=none; d=google.com; s=arc-20160816; b=GPijb6oE3/uVuDlARbMGlZOyQVdxQQtaba+cjJ1EzKUjul50aE8FeIZElWzwhcnAHV XasC7Uk6pksuNcMUlL5yCKKbzZrnJ2fSZx6F3sacqNqpHzk+uN30BRa45AsR69Pe+ykG KTgcQoex+QARWeW9mx01m3Z4ALaCTVFyZbq+2gHq2zPbzhsbCzsUWtAC1+5bT9aUHIxq z4i76RHkbd2//QPeWBNt5Eo5C6ADUFC6AJCX5A2CQLn+YckB81cpxVSg+kWPxEvENNI/ 8O1Sgm84fJ1Pmxuj7RYEbouP02inwbZyAtEj1iH5vc4lYCTJ1epIoueAZ12zEfs8h2bB 9BVA== 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=IHr5WGt23s3y3b3c9N+iOxl8EUecsea4LpR2BB84SxwbLEMMwEGrnfudgcDfHmFwLm Xnq82Ny6UT6+iKUiZCem1yTRX9FMLX9OMOh9YObemsU95bXYn+X3lg05gJTUcar7+qhJ vxMTrXFRlM32mR1UeZwOhIqgKzMSrEx90jP2KwA57LAD4tqcaAitFC/c3rjEbKL5fk2h IjpQ6SaZiUnlcdQzKDiz36E1lcQOwpbMGi1kyvstLy/I+BSEz/Ap5dA9UIagh0cwGv28 C/ziA1J4d3N04rWNhSXjgsvH2btWg7+UUSM5BKsNC2QnhmHo/llhzmQI2Tl8GedUXNZb lIBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rAxGsRbi; 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 d16-20020a05622a101000b004197c401385si3681085qte.439.2023.10.21.23.01.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Oct 2023 23:01:54 -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=rAxGsRbi; 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 1quRW8-0000ZO-K6; Sun, 22 Oct 2023 02:00:52 -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 1quRW5-0000X8-V2 for qemu-devel@nongnu.org; Sun, 22 Oct 2023 02:00:49 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1quRW3-0001YR-Vm for qemu-devel@nongnu.org; Sun, 22 Oct 2023 02:00:49 -0400 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1c77449a6daso18343645ad.0 for ; Sat, 21 Oct 2023 23:00:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697954446; x=1698559246; 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=rAxGsRbi/usu3mntgUTGFufiBC3kA3RzjmZw9cw91OmN1KPXmgZ3Cs1Zq5JiSfFXcT UGEeNGRh4kI3cNktWIuB4VdGqJNi1oFbbQQ2XFKeAcB35VzfzH7Wn73CEwmlQqBNh7XK ab8uRk1zFSCzyEIiiWJoiltpQXtC8tkT9xRDVh2id4HnAyLKohk1gacXY/sU6q/Cf+MR da/u34Bx6EX471nRm7OB27LXX0seJOQPxqb9zqYzlVH8rllgW2z1JHb9LfQfKmxsI1Lh W24z5Dwf7GNawX9WHLiBDn/jE+RwaIgA0eG9xtIRas9PCWIXh/7kjIIJ8Ds4pLSk1Wzh 1rXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697954446; x=1698559246; 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=gxmKmNdo2S9Wb122jYQ6Cfwhs3E863ZYIM0M69ffZ3J/BFnMpKb80coQOeJzxkSUns VwDEdimR0ufbZSXAreavssCj78cuGigI1PpviZgRg7P9bELiyXEDesnIocB8POdKv0LS qGQAbBUZ3Ts19K4c6pmwHAepuhL8oQjY8y1IWSzBi0QFKUClvN4htnVYVAU5SmofWzgJ Ha2D+cNvZfKNIUElLUx5MxH/KC1iLwB3qvfRSUT8ugoAhVonaiJ3szBuNDRhK+VMXo2C lct8uthDd8A6F2rtt/f0hnN0NYOLa2NnjKBOGkpd0vsRAOZvuIiLkOEMF6Ko3hR6Rsdo TBtA== X-Gm-Message-State: AOJu0YztQYlv1oU6DPMp9yLZcVXHHIgOtuVjda8lcsC32IZMImyAUvB/ qo6w0ZcQrXPHYXFCCBY0Ln6m76JsI6MnbonvOV4= X-Received: by 2002:a17:903:30d2:b0:1ca:e491:f525 with SMTP id s18-20020a17090330d200b001cae491f525mr359172plc.31.1697954446398; Sat, 21 Oct 2023 23:00:46 -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:46 -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 16/90] target/sparc: Merge gen_fcond with only caller Date: Sat, 21 Oct 2023 22:59:17 -0700 Message-Id: <20231022060031.490251-17-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::62c; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62c.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); } }