From patchwork Sat Oct 21 05:31:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 736688 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp636063wrl; Fri, 20 Oct 2023 22:53:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGMN7ZB3IGEB3CU4eLAD5il5DuDpAoIJlSe1MJDPesFafrbAcIkyuBcnxGFzpKakavZgqU0 X-Received: by 2002:ac8:7d8c:0:b0:412:395c:e794 with SMTP id c12-20020ac87d8c000000b00412395ce794mr4475608qtd.50.1697867588222; Fri, 20 Oct 2023 22:53:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697867588; cv=none; d=google.com; s=arc-20160816; b=Pvws4nmME22yY49Iuv+uagKs116DwTYNQcumXyDLr6aLhQUdwHifb8ExESzoqzku5O gcMKZFp6ziA73H42dTa6jN0x5PfZ698CDn1Xz89TVnYe9Btk5xnKE5zYTDp2gzOJAkZ8 MTYmG0opJOQbUK38mFan1fhazF15fNDfuRyqhb/xalXfuhMqzxAwkeh+9mUPPpb6HJBy +VvmSYlKGIstuap4djfbKYYc9MtV4TAFO+tyRY/I4LMuwWBJaCTb1VLpAMw4jVEOmt0w Y6+1xHnf9NYe5xVSX/kO5EVSINCY79+AsvgiEzFaGHcb5fRB9aXhrSUH6xLe5yyJW5BW P6TA== 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=yN7O1LFTcycPQWVuYFGE8dpxCvObaSUOlYTzTZK79/o=; fh=TYrED6TOMxGX0VC4GtjviASLbYyJe19+7/tKWjN44KQ=; b=RVKeksSTlVBii6ogrlonTPY7tqGfaMd1IKGuLUcxzQrpQ3NGBbZ2UKnsBS/mMdhbJ3 7rgg8qfsuKP/M1W7zwKFEx8Mj5kXjvhnYmWRFoYiTsVO9+LxcDN/sGGj3qZDle+3lHAl 6WljlYDf02bHKCMq1wDTGIgM8WBUgdVh5wvf5uWN1MGpQLuX3X6ZnLAkYGQUTFg/s0QK ztkdyjfJfpUNZukZHeBYuwlBAQrbmUrqTe1K/n5+1QvPTtCdCowd1bvRen7+vgdA+JdG f+G0zaF45t1QuYUGTUC/UZ8a6GMwR660e5NvkNUzzOBLgLZwiblfKjEpX6BR1hlwPZ3n BHCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=w10ndp1f; 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 g18-20020ac87f52000000b004179da82083si2456894qtk.681.2023.10.20.22.53.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Oct 2023 22:53:08 -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=w10ndp1f; 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 1qu4ed-0003NK-Bq; Sat, 21 Oct 2023 01:36:07 -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 1qu4ea-0003Lo-HS for qemu-devel@nongnu.org; Sat, 21 Oct 2023 01:36:04 -0400 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qu4eY-0001BT-S3 for qemu-devel@nongnu.org; Sat, 21 Oct 2023 01:36:04 -0400 Received: by mail-qk1-x72b.google.com with SMTP id af79cd13be357-77386822cfbso93746785a.0 for ; Fri, 20 Oct 2023 22:36:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697866562; x=1698471362; 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=yN7O1LFTcycPQWVuYFGE8dpxCvObaSUOlYTzTZK79/o=; b=w10ndp1fSx/S4rkvagpcNDr3HXOCCO+su5Iu8INc6HNN45OHx0gpZaW21NNgOtjok3 2RJ9mkAZBYcv3pzmzzaZhbWMWgNQckyNL3YxxwjCuIuIA81DKNMYH8MWKr2pyfJXKBEb XXEAMBSCYg0Ui5g7eKM89rni7KwncApIReQOhAs4Y9vLOifYYAU6z/t1HSrvD4kb0+a2 0gqPkHnW/nye5N8sMF9/6JSZP7GVypl23ENv7/3gSWZHyntrv3Qlzf8fkMnf9aRyW7wx +x6q/NDII9OPmQWV4iApvqv02EPxvfmzAyT3SKxyIWeajNsKxtUTOszQ1GZ67ky7R/qK Bw7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697866562; x=1698471362; 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=yN7O1LFTcycPQWVuYFGE8dpxCvObaSUOlYTzTZK79/o=; b=DFhevMlgWEW2O0kr3ZCOwgNEa3EjvuPrJnuAOFDZprNJ62xgNlv1CqgpZafn/sWhV4 YsvlDxfBl2zMqRB5eK2dUou3Q9s+emhj+33NqmK4WhG5jfj1JQnmROpmY65zI+C5ESee 6IN8u5/D1OxjXUmdtykw0NYoa2rGN89rL6EBaibkavu9+XIhnhUEswNDkv2cHvJroetQ EEfpwh9mRq+W00Ujxk1SH0dVSUfDWq82knML05SIm1syCN4FHt1jkHtLWmhKozPJycOR IZwoFr6DHX4lhg2rxW/dE+2vf50a1jrvqIZeKO0ilq662ylmd07II5pgEMsa4GJBf2bs zr/A== X-Gm-Message-State: AOJu0Yz0A9ac+jEHLk454Kqq1hADHf8ve/SkD75Of1/verJ3oYZAsZUZ ngsMn+dwyjnv7bXkxdkTth//ScAHbb9mIiS1kEI= X-Received: by 2002:a05:620a:462b:b0:774:2afe:97c1 with SMTP id br43-20020a05620a462b00b007742afe97c1mr4725746qkb.27.1697866561859; Fri, 20 Oct 2023 22:36:01 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id h1-20020a62b401000000b00690d255b5a1sm2427978pfn.217.2023.10.20.22.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 22:36:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 74/90] target/sparc: Move gen_fop_DDD insns to decodetree Date: Fri, 20 Oct 2023 22:31:42 -0700 Message-Id: <20231021053158.278135-75-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::72b; envelope-from=richard.henderson@linaro.org; helo=mail-qk1-x72b.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 Move FADDd, FSUBd, FMULd, FDIVd. Signed-off-by: Richard Henderson --- target/sparc/insns.decode | 4 +++ target/sparc/translate.c | 55 ++++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/target/sparc/insns.decode b/target/sparc/insns.decode index 06cab099d8..e616cb1e69 100644 --- a/target/sparc/insns.decode +++ b/target/sparc/insns.decode @@ -249,9 +249,13 @@ FSQRTs 10 ..... 110100 00000 0 0010 1001 ..... @r_r2 FSQRTd 10 ..... 110100 00000 0 0010 1010 ..... @r_r2 FSQRTq 10 ..... 110100 00000 0 0010 1011 ..... @r_r2 FADDs 10 ..... 110100 ..... 0 0100 0001 ..... @r_r_r +FADDd 10 ..... 110100 ..... 0 0100 0010 ..... @r_r_r FSUBs 10 ..... 110100 ..... 0 0100 0101 ..... @r_r_r +FSUBd 10 ..... 110100 ..... 0 0100 0110 ..... @r_r_r FMULs 10 ..... 110100 ..... 0 0100 1001 ..... @r_r_r +FMULd 10 ..... 110100 ..... 0 0100 1010 ..... @r_r_r FDIVs 10 ..... 110100 ..... 0 0100 1101 ..... @r_r_r +FDIVd 10 ..... 110100 ..... 0 0100 1110 ..... @r_r_r FdTOx 10 ..... 110100 00000 0 1000 0010 ..... @r_r2 FxTOd 10 ..... 110100 00000 0 1000 1000 ..... @r_r2 FiTOs 10 ..... 110100 00000 0 1100 0100 ..... @r_r2 diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 8a0de0803b..53a42fe1a5 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -1653,21 +1653,6 @@ static int gen_trap_ifnofpu(DisasContext *dc) return 0; } -static void gen_fop_DDD(DisasContext *dc, int rd, int rs1, int rs2, - void (*gen)(TCGv_i64, TCGv_ptr, TCGv_i64, TCGv_i64)) -{ - TCGv_i64 dst, src1, src2; - - src1 = gen_load_fpr_D(dc, rs1); - src2 = gen_load_fpr_D(dc, rs2); - dst = gen_dest_fpr_D(dc, rd); - - gen(dst, tcg_env, src1, src2); - gen_helper_check_ieee_exceptions(cpu_fsr, tcg_env); - - gen_store_fpr_D(dc, rd, dst); -} - #ifdef TARGET_SPARC64 static void gen_ne_fop_QQ(DisasContext *dc, int rd, int rs, void (*gen)(TCGv_ptr)) @@ -5053,6 +5038,30 @@ TRANS(FPACK32, VIS1, do_ddd, a, gen_op_fpack32) TRANS(FALIGNDATAg, VIS1, do_ddd, a, gen_op_faligndata) TRANS(BSHUFFLE, VIS2, do_ddd, a, gen_op_bshuffle) +static bool do_env_ddd(DisasContext *dc, arg_r_r_r *a, + void (*func)(TCGv_i64, TCGv_env, TCGv_i64, TCGv_i64)) +{ + TCGv_i64 dst, src1, src2; + + if (gen_trap_ifnofpu(dc)) { + return true; + } + + gen_op_clear_ieee_excp_and_FTT(); + dst = gen_dest_fpr_D(dc, a->rd); + src1 = gen_load_fpr_D(dc, a->rs1); + src2 = gen_load_fpr_D(dc, a->rs2); + func(dst, tcg_env, src1, src2); + gen_helper_check_ieee_exceptions(cpu_fsr, tcg_env); + gen_store_fpr_D(dc, a->rd, dst); + return advance_pc(dc); +} + +TRANS(FADDd, ALL, do_env_ddd, a, gen_helper_faddd) +TRANS(FSUBd, ALL, do_env_ddd, a, gen_helper_fsubd) +TRANS(FMULd, ALL, do_env_ddd, a, gen_helper_fmuld) +TRANS(FDIVd, ALL, do_env_ddd, a, gen_helper_fdivd) + static bool do_dddd(DisasContext *dc, arg_r_r_r *a, void (*func)(TCGv_i64, TCGv_i64, TCGv_i64, TCGv_i64)) { @@ -5130,31 +5139,23 @@ static void disas_sparc_legacy(DisasContext *dc, unsigned int insn) case 0x45: /* fsubs */ case 0x49: /* fmuls */ case 0x4d: /* fdivs */ - g_assert_not_reached(); /* in decodetree */ case 0x42: /* faddd */ - gen_fop_DDD(dc, rd, rs1, rs2, gen_helper_faddd); - break; + case 0x46: /* fsubd */ + case 0x4a: /* fmuld */ + case 0x4e: /* fdivd */ + g_assert_not_reached(); /* in decodetree */ case 0x43: /* faddq */ CHECK_FPU_FEATURE(dc, FLOAT128); gen_fop_QQQ(dc, rd, rs1, rs2, gen_helper_faddq); break; - case 0x46: /* fsubd */ - gen_fop_DDD(dc, rd, rs1, rs2, gen_helper_fsubd); - break; case 0x47: /* fsubq */ CHECK_FPU_FEATURE(dc, FLOAT128); gen_fop_QQQ(dc, rd, rs1, rs2, gen_helper_fsubq); break; - case 0x4a: /* fmuld */ - gen_fop_DDD(dc, rd, rs1, rs2, gen_helper_fmuld); - break; case 0x4b: /* fmulq */ CHECK_FPU_FEATURE(dc, FLOAT128); gen_fop_QQQ(dc, rd, rs1, rs2, gen_helper_fmulq); break; - case 0x4e: /* fdivd */ - gen_fop_DDD(dc, rd, rs1, rs2, gen_helper_fdivd); - break; case 0x4f: /* fdivq */ CHECK_FPU_FEATURE(dc, FLOAT128); gen_fop_QQQ(dc, rd, rs1, rs2, gen_helper_fdivq);