From patchwork Sun Oct 22 23:29:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 737076 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp1283570wrl; Sun, 22 Oct 2023 16:37:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGrySpxrSX+gIcAkzBLN/hy5HOn4jNstI2B593byLYSYIaqHbKbrj+5AQRwR4soZqOOmj82 X-Received: by 2002:a05:6214:d6f:b0:66d:57ca:fa59 with SMTP id 15-20020a0562140d6f00b0066d57cafa59mr8603198qvs.37.1698017829920; Sun, 22 Oct 2023 16:37:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698017829; cv=none; d=google.com; s=arc-20160816; b=yjrdB+A8/TB2PeMAMYQIviXi5nqzLZ9eDi5SqC5D/OrqSFD0NdWCEAFZjkFPakG1bk ZoeqEMgFoBmVhvqTsgUkgNpxHe2GbPGR2bMaLzXLPFdpY0T3JfvOIgdnBEjcG9ZAfirG Jjfw4p6lQUvw/b95rani2WXG4i7pmZ3WAiKkstZ7P4ezVB5Sv81MubVM3nm2YwhjskBS HP8E0Cw8HI0qc8mWJ3I3NwBtlH/tHOxZ3hSLSYsaqmdiXOgbD6BqQUKih7G/luKrAaf+ qEYhZA/GKVAcVXFtblCHrI1zifwpTy0f7fDECLvVqiFGvfKxT0wqFNjLHLqghZhIzoue oGTQ== 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=9k2xSZsz3brl6+UGLkDSwS+pwYDsLRshg5h4W43pUFQ=; fh=TYrED6TOMxGX0VC4GtjviASLbYyJe19+7/tKWjN44KQ=; b=dDZ3YBshrPaDNaTZEo2vGmUUHlZS8eAPtLLLOMfUtNHBvEnP7y8LgTpbMInLZd0o8o UwE/rm0rlsszVymc4R40J837NhhlHcbAmkkav2MUww24gMvRf84V9OSQaZaHKISGOJmV yuYDEqL3UzXJDEBAu/9X7fkprM+2BJ6AP+1IRcgLAjA9r3VZ0Fdc1Rebn0Z7hOR58tD+ iPITrq+raGT91jJiZgQqoKewYS8EYimqMNNr62Z7K5kKf9zDz+Yv3TK7co73ZtnUnVZs OMplZ3g6OpEXu9U2QUZ2YskeIy1BRdtEQQW+Zqv/SzywjejyCNSrd7Ix+AlxJyKLkP4o 35og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TPpZl5pK; 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 oq34-20020a05620a612200b0076db460394esi4549612qkn.438.2023.10.22.16.37.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Oct 2023 16:37:09 -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=TPpZl5pK; 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 1qui09-0007gC-L6; Sun, 22 Oct 2023 19:36:57 -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 1qui04-0007T6-Lv for qemu-devel@nongnu.org; Sun, 22 Oct 2023 19:36:52 -0400 Received: from mail-oo1-xc32.google.com ([2607:f8b0:4864:20::c32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qui01-0008SC-PQ for qemu-devel@nongnu.org; Sun, 22 Oct 2023 19:36:52 -0400 Received: by mail-oo1-xc32.google.com with SMTP id 006d021491bc7-583552eafd3so1523075eaf.0 for ; Sun, 22 Oct 2023 16:36:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698017808; x=1698622608; 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=9k2xSZsz3brl6+UGLkDSwS+pwYDsLRshg5h4W43pUFQ=; b=TPpZl5pKf26T77gkz6eIvsKNFdDbzL/vR8zgiohY3YZvXfYtWKrZLaHeVLTXStw9u+ USVM98tKukk1kAzuXRH78DMiqXGrnwBi3YCBDjfX7MR+31G7wBkB2jV02xHyuPZuhk/p g4CpKA7GwWbAHWtRaRzO2HVv4epahVtM5e1C1TiuHLKSl8+PWskTqaOPokBhcSn0AE27 8Ey+6Oar1PhNE7NdNYtxJy1GmOdASnOhLCH09j4Y4f2K4RXaVhsEXpJumMyGPeaHzY+u Bg96iYlkEDS7D9nYwdIWmsh1Cz2HloLyM/ok9JLv5rGiS/b2MLpV4ZmmR+Cng20npSFb 7lsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698017808; x=1698622608; 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=9k2xSZsz3brl6+UGLkDSwS+pwYDsLRshg5h4W43pUFQ=; b=nnPCo7SS9Wx2rqrfl+H/FO9e5CS8/mfqC9/PQUbEcrzcXPPlbOIAVFpkQTWmKMEUXw UU9x+c9VWNDYhfcvvU5WNM8ms9p4KAlqoOtVXcXDGqGKqDEkg1Li1h8QWj/GWUHDSpfE 1DpEVvJiAxhtKEOfIh5UOpYNmBphjXRW0xxwVNXxrvNnczZgjdJylxMbJPtotsfWNC6q Yx23uNlXv8QSYzgxO1T9NJsN93ehTtedYVn1qGpMWwXB5gJmV/3qRpK1bigFS0zk2217 /YCNINxbvCN9Dgw43wO1VyKQ70CjeowvlXYbPGAgocmJ87awOxsU2DcRS36WPNDtRAtn jJVw== X-Gm-Message-State: AOJu0YykLEfG26A3pfIkPw+oh8t7/YYMsfn5N0TQ+uLticOJ1aBrT7we +fUQtfjQt63eqYYuJmzlJMijvVhcZU/6gFcm1ow= X-Received: by 2002:a05:6358:3402:b0:143:3a49:e30d with SMTP id h2-20020a056358340200b001433a49e30dmr7983453rwd.12.1698017808380; Sun, 22 Oct 2023 16:36:48 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id k26-20020a63ba1a000000b005b25a04cf8bsm4026861pgf.12.2023.10.22.16.36.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 16:36:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk Subject: [PATCH v5 87/94] target/sparc: Move FdTOq, FxTOq to decodetree Date: Sun, 22 Oct 2023 16:29:25 -0700 Message-Id: <20231022232932.80507-88-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::c32; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc32.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 Signed-off-by: Richard Henderson --- target/sparc/insns.decode | 2 ++ target/sparc/translate.c | 47 ++++++++++++++++++++++----------------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/target/sparc/insns.decode b/target/sparc/insns.decode index c76e603f2d..e1f5394d17 100644 --- a/target/sparc/insns.decode +++ b/target/sparc/insns.decode @@ -267,6 +267,7 @@ FdTOx 10 ..... 110100 00000 0 1000 0010 ..... @r_r2 FqTOx 10 ..... 110100 00000 0 1000 0011 ..... @r_r2 FxTOs 10 ..... 110100 00000 0 1000 0100 ..... @r_r2 FxTOd 10 ..... 110100 00000 0 1000 1000 ..... @r_r2 +FxTOq 10 ..... 110100 00000 0 1000 1100 ..... @r_r2 FiTOs 10 ..... 110100 00000 0 1100 0100 ..... @r_r2 FdTOs 10 ..... 110100 00000 0 1100 0110 ..... @r_r2 FqTOs 10 ..... 110100 00000 0 1100 0111 ..... @r_r2 @@ -275,6 +276,7 @@ FsTOd 10 ..... 110100 00000 0 1100 1001 ..... @r_r2 FqTOd 10 ..... 110100 00000 0 1100 1011 ..... @r_r2 FiTOq 10 ..... 110100 00000 0 1100 1100 ..... @r_r2 FsTOq 10 ..... 110100 00000 0 1100 1101 ..... @r_r2 +FdTOq 10 ..... 110100 00000 0 1100 1110 ..... @r_r2 FsTOi 10 ..... 110100 00000 0 1101 0001 ..... @r_r2 FdTOi 10 ..... 110100 00000 0 1101 0010 ..... @r_r2 FqTOi 10 ..... 110100 00000 0 1101 0011 ..... @r_r2 diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 784558cfc5..25f92a749d 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -77,6 +77,7 @@ # define gen_helper_fstox ({ qemu_build_not_reached(); NULL; }) # define gen_helper_fxtod ({ qemu_build_not_reached(); NULL; }) # define gen_helper_fxtos ({ qemu_build_not_reached(); NULL; }) +# define gen_helper_fxtoq ({ qemu_build_not_reached(); NULL; }) # define gen_helper_pdist ({ qemu_build_not_reached(); NULL; }) # define FSR_LDXFSR_MASK 0 # define FSR_LDXFSR_OLDMASK 0 @@ -1672,19 +1673,6 @@ static void gen_ne_fop_QQ(DisasContext *dc, int rd, int rs, } #endif -static void gen_ne_fop_QD(DisasContext *dc, int rd, int rs, - void (*gen)(TCGv_ptr, TCGv_i64)) -{ - TCGv_i64 src; - - src = gen_load_fpr_D(dc, rs); - - gen(tcg_env, src); - - gen_op_store_QT0_fpr(QFPREG(rd)); - gen_update_fprs_dirty(dc, QFPREG(rd)); -} - /* asi moves */ typedef enum { GET_ASI_HELPER, @@ -4810,6 +4798,29 @@ static bool do_env_qf(DisasContext *dc, arg_r_r *a, TRANS(FiTOq, ALL, do_env_qf, a, gen_helper_fitoq) TRANS(FsTOq, ALL, do_env_qf, a, gen_helper_fstoq) +static bool do_env_qd(DisasContext *dc, arg_r_r *a, + void (*func)(TCGv_env, TCGv_i64)) +{ + TCGv_i64 src; + + if (gen_trap_ifnofpu(dc)) { + return true; + } + if (gen_trap_float128(dc)) { + return true; + } + + gen_op_clear_ieee_excp_and_FTT(); + src = gen_load_fpr_D(dc, a->rs); + func(tcg_env, src); + gen_op_store_QT0_fpr(QFPREG(a->rd)); + gen_update_fprs_dirty(dc, QFPREG(a->rd)); + return advance_pc(dc); +} + +TRANS(FdTOq, ALL, do_env_qd, a, gen_helper_fdtoq) +TRANS(FxTOq, 64, do_env_qd, a, gen_helper_fxtoq) + static bool do_fff(DisasContext *dc, arg_r_r_r *a, void (*func)(TCGv_i32, TCGv_i32, TCGv_i32)) { @@ -5097,11 +5108,9 @@ static void disas_sparc_legacy(DisasContext *dc, unsigned int insn) case 0x83: /* V9 fqtox */ case 0xcc: /* fitoq */ case 0xcd: /* fstoq */ - g_assert_not_reached(); /* in decodetree */ case 0xce: /* fdtoq */ - CHECK_FPU_FEATURE(dc, FLOAT128); - gen_ne_fop_QD(dc, rd, rs2, gen_helper_fdtoq); - break; + case 0x8c: /* V9 fxtoq */ + g_assert_not_reached(); /* in decodetree */ #ifdef TARGET_SPARC64 case 0x3: /* V9 fmovq */ CHECK_FPU_FEATURE(dc, FLOAT128); @@ -5115,10 +5124,6 @@ static void disas_sparc_legacy(DisasContext *dc, unsigned int insn) CHECK_FPU_FEATURE(dc, FLOAT128); gen_ne_fop_QQ(dc, rd, rs2, gen_helper_fabsq); break; - case 0x8c: /* V9 fxtoq */ - CHECK_FPU_FEATURE(dc, FLOAT128); - gen_ne_fop_QD(dc, rd, rs2, gen_helper_fxtoq); - break; #endif default: goto illegal_insn;