From patchwork Thu Oct 26 00:14:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 738218 Delivered-To: patch@linaro.org Received: by 2002:adf:f842:0:b0:32d:baff:b0ca with SMTP id d2csp554605wrq; Wed, 25 Oct 2023 17:24:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEeU/bk2sxWM7QTotMt4ft8ot4KAbFF0WYudzMXvM4ATPCwDYfWEgu6y6PRYWV+q+X4/iQ/ X-Received: by 2002:a05:600c:20c:b0:408:5a65:c9b2 with SMTP id 12-20020a05600c020c00b004085a65c9b2mr10507272wmi.15.1698279880507; Wed, 25 Oct 2023 17:24:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698279880; cv=none; d=google.com; s=arc-20160816; b=Tq/mmc8CYg6T5GHUkJl/EsDb6+6mkrgHOdSBPBUSbGByN50pg7g+QodaUX5q+FL9Sh yWvbJaHhVNZJCtXzzaF9jUL9QJSQ2RzK2Fy8yaBpmPdN0PpOrs0jPS9094/bmeZYyir0 beNXgahx8e9rwYD5HHDtjJEUkNmb3PqG6XRspIL3X2AtKyKugJ1G+JnX3TVIxAX1Bmr6 ryKHDgNZWtyT95AZu8tEHqegCPDti16woIJ653pVjfkMijjH+n8E2pDsGkXhHzAKb5bE ovb8zScF1zb88XS8V7jNQorXFJ05aXtiiNAnWsQC13eFUQ+yBh043xVurzkQCSVo5jSE VI5g== 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=ii+UgCJP+tPdYxSJC+tW/iaYho3LkDYSDzYDIA5OxYY=; fh=rYI8DiHAAFX3O5g969KmOAQ7d45Sb8OxQX1+DywGDk4=; b=flBubTwuwDW7FeTZMA2Ws4kZslznGFvBUpXKDhBjaUKeT4CW9nsV3c/rWyaFDrYkTW prQaxW6mGknjTmQcjoO6UXbQRJPJxc2adwtYizzUFCWpgsh6gKQZqT3brgUW0TAbUoox RLfOSvR3zirlataTf8PNwWjkqSnTwCPuK+oYpFSPcLWX+aUndx+sgkz3QvsLvIwB5nvZ nZxde6ug3MShnbQ2bx3grC2IADpGv2/0Od/8fe6bVNiNgRzEfnRFgFPEUQSXEGnMCos4 Wz6z5Qo1dQ17BN1PlMql9M1KIxjzvzSiDbq0i57X19WabPk2+Ns+uoQx14NhiG4Or6/J M7jA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZSdBgwra; 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 q10-20020a05600c46ca00b004064b67428dsi802632wmo.2.2023.10.25.17.24.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Oct 2023 17:24:40 -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=ZSdBgwra; 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 1qvo6z-0002Mx-Mc; Wed, 25 Oct 2023 20:20:34 -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 1qvo6G-0001Dz-OI for qemu-devel@nongnu.org; Wed, 25 Oct 2023 20:19:48 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvo66-0006eJ-G9 for qemu-devel@nongnu.org; Wed, 25 Oct 2023 20:19:48 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1c9b7c234a7so2320485ad.3 for ; Wed, 25 Oct 2023 17:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698279577; x=1698884377; 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=ii+UgCJP+tPdYxSJC+tW/iaYho3LkDYSDzYDIA5OxYY=; b=ZSdBgwragL1KvGUP0Fuk+D9WS3MzvYj6MUu24GxX/cSphnyWKpObfhkOFYwNg54hLp bfgmQEe6AmIioYOA3/Obr3Ct360l6uGjzxSXT4OvULUYx69o6xRZQqSUA32cxPpSYOq2 YGHWwFHyjM99y7jv16sniH0DNMFkUNIYPsDGM1zUmgZl2gMwnkRHfSr+TO3TexYzYgWM 1wHv9acXMBwyYder8uZXNUOmamzGBN+FmUTz4khukMxCtCoztNBVzBCxNlQAjWsPxZJn eH93dV3sGfvvWHwAfQ+ZmxzYmmfHgQ0q7FzteLrLRh1NkkDdX3aQ1OItrwXT6CVZqTTe Aa9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698279577; x=1698884377; 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=ii+UgCJP+tPdYxSJC+tW/iaYho3LkDYSDzYDIA5OxYY=; b=bdf5KEAU14ey3E50RcLM0/zYivVCpKGVOZOQAnPXwIyjNTNor5sf2lUhOH8Lqbqxsi zwiD5FYDvsW0e5kjHGItorvFG+1fQe1DRyiKdQQkB1Tz51ABKlDsxJ8VTt9H0soS2pVj vdakLEjTAddmezi3w1RWWXwFG3v+gE3WtLKt5voVfZ7x+dAglhkjhdXo7bBlcdx+2UNq plOM0+Oss8NlypyXEHGcxfyzjDSCe3lxMD75J9hGMrJEbuXqeNn/YiKpIMrHs6ajKaE8 VQVQIJgvtnvKhkTe7hbQAvxu3j75M1RblLahN6A9KcLXayIR+zdb7JtLCUqMZ1Ydfb9y u31A== X-Gm-Message-State: AOJu0Yxa1HqvC7he4MYOH6BaGBtNks9n7jiLV5Tt6IpEFsvF4vYefPv9 5sRKL78+haGVWD57jqcbaDQbqr1aJBUR2mjevwQ= X-Received: by 2002:a17:903:191:b0:1c5:c546:febf with SMTP id z17-20020a170903019100b001c5c546febfmr18470105plg.35.1698279577073; Wed, 25 Oct 2023 17:19:37 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id jh1-20020a170903328100b001c5fc291ef9sm9754655plb.209.2023.10.25.17.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 17:19:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland Subject: [PULL 35/94] target/sparc: Move MULX to decodetree Date: Wed, 25 Oct 2023 17:14:43 -0700 Message-Id: <20231026001542.1141412-65-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231026001542.1141412-1-richard.henderson@linaro.org> References: <20231026001542.1141412-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x635.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 | 3 +++ target/sparc/translate.c | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/target/sparc/insns.decode b/target/sparc/insns.decode index 1cff18fa1f..1a04a8e229 100644 --- a/target/sparc/insns.decode +++ b/target/sparc/insns.decode @@ -31,6 +31,7 @@ CALL 01 i:s30 &r_r_ri_cc rd rs1 rs2_or_imm imm:bool cc:bool @r_r_ri_cc .. rd:5 . cc:1 .... rs1:5 imm:1 rs2_or_imm:s13 &r_r_ri_cc +@r_r_ri_cc0 .. rd:5 ...... rs1:5 imm:1 rs2_or_imm:s13 &r_r_ri_cc cc=0 { [ @@ -165,6 +166,8 @@ ORN 10 ..... 0.0110 ..... . ............. @r_r_ri_cc XORN 10 ..... 0.0111 ..... . ............. @r_r_ri_cc ADDC 10 ..... 0.1000 ..... . ............. @r_r_ri_cc +MULX 10 ..... 001001 ..... . ............. @r_r_ri_cc0 + Tcc_r 10 0 cond:4 111010 rs1:5 0 cc:1 0000000 rs2:5 { # For v7, the entire simm13 field is present, but masked to 7 bits. diff --git a/target/sparc/translate.c b/target/sparc/translate.c index eb829acc68..2ecd9edb33 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -4073,6 +4073,7 @@ static bool do_arith(DisasContext *dc, arg_r_r_ri_cc *a, int cc_op, void (*func_cc)(TCGv, TCGv, TCGv)) { if (a->cc) { + assert(cc_op >= 0); return do_arith_int(dc, a, cc_op, func_cc, NULL); } return do_arith_int(dc, a, cc_op, func, funci); @@ -4096,6 +4097,8 @@ TRANS(ANDN, ALL, do_logic, a, tcg_gen_andc_tl, NULL) TRANS(ORN, ALL, do_logic, a, tcg_gen_orc_tl, NULL) TRANS(XORN, ALL, do_logic, a, tcg_gen_eqv_tl, NULL) +TRANS(MULX, 64, do_arith, a, -1, tcg_gen_mul_tl, tcg_gen_muli_tl, NULL) + static bool trans_OR(DisasContext *dc, arg_r_r_ri_cc *a) { /* OR with %g0 is the canonical alias for MOV. */ @@ -4561,11 +4564,6 @@ static void disas_sparc_legacy(DisasContext *dc, unsigned int insn) cpu_src1 = get_src1(dc, insn); cpu_src2 = get_src2(dc, insn); switch (xop & ~0x10) { -#ifdef TARGET_SPARC64 - case 0x9: /* V9 mulx */ - tcg_gen_mul_i64(cpu_dst, cpu_src1, cpu_src2); - break; -#endif case 0xa: /* umul */ CHECK_IU_FEATURE(dc, MUL); gen_op_umul(cpu_dst, cpu_src1, cpu_src2);