From nobody Sun Dec 29 00:51:04 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linux.alibaba.com ARC-Seal: i=1; a=rsa-sha256; t=1720525512; cv=none; d=zohomail.com; s=zohoarc; b=TfTivK6pMI7c/f7pia9gITeXBUYBiF0WVIzgeuReU0VMUsI9xdyC2FZtNYQ5HVaSAM7iCWftBykmZ5DdLCh5qIPJl7mhZjPxmcJ+zqN1VGeRpmv2irK2kxZxia3LGLd4Ug3PpXH0CCWGwy+Yp5fiEVF1eGYArrqsYoJzNGj7dbI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1720525512; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=p7H3GsoKl4wR7DObsUGcSIdcD1tHfgyD9YnUnKbfU0k=; b=nEfDLF8CNFuvuxu48rIlL4R0xb43q8FXnRqYcovFhkMlV4iyhTOPlZZzw5oOIEs8HmaYbLXd4W1G9yLzPYKsW5U8FHJ7fsjeKLROnHxY3V3uaDi938WTmK2uKSQ0m4Ulf4JY3ccMg4sjGb13B/KHCkVWf2cPcLcggTK0d0AXzQ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1720525512434623.9142424627968; Tue, 9 Jul 2024 04:45:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sR9Gs-0003gY-Sr; Tue, 09 Jul 2024 07:44: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 1sR9Gq-0003Tc-HF; Tue, 09 Jul 2024 07:44:32 -0400 Received: from out30-133.freemail.mail.aliyun.com ([115.124.30.133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sR9Gn-0004xj-97; Tue, 09 Jul 2024 07:44:32 -0400 Received: from L-PF1D6DP4-1208.hz.ali.com(mailfrom:zhiwei_liu@linux.alibaba.com fp:SMTPD_---0WABynTD_1720525461) by smtp.aliyun-inc.com; Tue, 09 Jul 2024 19:44:22 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1720525463; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=p7H3GsoKl4wR7DObsUGcSIdcD1tHfgyD9YnUnKbfU0k=; b=aO3R4OasMpCDBKCMMcekSSTUv0izT8Goydzc0W3KS997Z+xPZ/mWLIFMxBcFgrYI39t+EKEVakQnFpWBIM0SvRffQjbHnKT1Duj76K6bGrrgbjoRaKWX8NO7JasVfYkTJuLPTmdIL/tQgqZtD8z9buwN9ctZyQ/e4mWaryKHfsQ= X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R151e4; CH=green; DM=||false|; DS=||; FP=0|-1|-1|-1|0|-1|-1|-1; HT=maildocker-contentspam033037067109; MF=zhiwei_liu@linux.alibaba.com; NM=1; PH=DS; RN=8; SR=0; TI=SMTPD_---0WABynTD_1720525461; From: LIU Zhiwei To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, palmer@dabbelt.com, alistair.francis@wdc.com, dbarboza@ventanamicro.com, liwei1518@gmail.com, bmeng.cn@gmail.com, zhiwei_liu@linux.alibaba.com Subject: [PATCH v4 11/11] disas/riscv: Support zabha disassemble Date: Tue, 9 Jul 2024 19:36:52 +0800 Message-Id: <20240709113652.1239-12-zhiwei_liu@linux.alibaba.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20240709113652.1239-1-zhiwei_liu@linux.alibaba.com> References: <20240709113652.1239-1-zhiwei_liu@linux.alibaba.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=115.124.30.133; envelope-from=zhiwei_liu@linux.alibaba.com; helo=out30-133.freemail.mail.aliyun.com X-Spam_score_int: -174 X-Spam_score: -17.5 X-Spam_bar: ----------------- X-Spam_report: (-17.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linux.alibaba.com) X-ZM-MESSAGEID: 1720525513255116300 Content-Type: text/plain; charset="utf-8" Signed-off-by: LIU Zhiwei Acked-by: Alistair Francis --- disas/riscv.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/disas/riscv.c b/disas/riscv.c index d29cb1ff7d..c8364c2b07 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -954,6 +954,26 @@ typedef enum { rv_c_mop_11 =3D 923, rv_c_mop_13 =3D 924, rv_c_mop_15 =3D 925, + rv_op_amoswap_b =3D 926, + rv_op_amoadd_b =3D 927, + rv_op_amoxor_b =3D 928, + rv_op_amoor_b =3D 929, + rv_op_amoand_b =3D 930, + rv_op_amomin_b =3D 931, + rv_op_amomax_b =3D 932, + rv_op_amominu_b =3D 933, + rv_op_amomaxu_b =3D 934, + rv_op_amoswap_h =3D 935, + rv_op_amoadd_h =3D 936, + rv_op_amoxor_h =3D 937, + rv_op_amoor_h =3D 938, + rv_op_amoand_h =3D 939, + rv_op_amomin_h =3D 940, + rv_op_amomax_h =3D 941, + rv_op_amominu_h =3D 942, + rv_op_amomaxu_h =3D 943, + rv_op_amocas_b =3D 944, + rv_op_amocas_h =3D 945, } rv_op; =20 /* register names */ @@ -2192,6 +2212,26 @@ const rv_opcode_data rvi_opcode_data[] =3D { { "c.mop.11", rv_codec_ci_none, rv_fmt_none, NULL, 0, 0, 0 }, { "c.mop.13", rv_codec_ci_none, rv_fmt_none, NULL, 0, 0, 0 }, { "c.mop.15", rv_codec_ci_none, rv_fmt_none, NULL, 0, 0, 0 }, + { "amoswap.b", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amoadd.b", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amoxor.b", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amoor.b", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amoand.b", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amomin.b", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amomax.b", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amominu.b", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amomaxu.b", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amoswap.h", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amoadd.h", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amoxor.h", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amoor.h", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amoand.h", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amomin.h", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amomax.h", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amominu.h", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amomaxu.h", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amocas.b", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, + { "amocas.h", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1, NULL, 0, 0, 0 }, }; =20 /* CSR names */ @@ -2986,9 +3026,13 @@ static void decode_inst_opcode(rv_decode *dec, rv_is= a isa) case 11: switch (((inst >> 24) & 0b11111000) | ((inst >> 12) & 0b00000111)) { + case 0: op =3D rv_op_amoadd_b; break; + case 1: op =3D rv_op_amoadd_h; break; case 2: op =3D rv_op_amoadd_w; break; case 3: op =3D rv_op_amoadd_d; break; case 4: op =3D rv_op_amoadd_q; break; + case 8: op =3D rv_op_amoswap_b; break; + case 9: op =3D rv_op_amoswap_h; break; case 10: op =3D rv_op_amoswap_w; break; case 11: op =3D rv_op_amoswap_d; break; case 12: op =3D rv_op_amoswap_q; break; @@ -3010,27 +3054,43 @@ static void decode_inst_opcode(rv_decode *dec, rv_i= sa isa) case 26: op =3D rv_op_sc_w; break; case 27: op =3D rv_op_sc_d; break; case 28: op =3D rv_op_sc_q; break; + case 32: op =3D rv_op_amoxor_b; break; + case 33: op =3D rv_op_amoxor_h; break; case 34: op =3D rv_op_amoxor_w; break; case 35: op =3D rv_op_amoxor_d; break; case 36: op =3D rv_op_amoxor_q; break; + case 40: op =3D rv_op_amocas_b; break; + case 41: op =3D rv_op_amocas_h; break; case 42: op =3D rv_op_amocas_w; break; case 43: op =3D rv_op_amocas_d; break; case 44: op =3D rv_op_amocas_q; break; + case 64: op =3D rv_op_amoor_b; break; + case 65: op =3D rv_op_amoor_h; break; case 66: op =3D rv_op_amoor_w; break; case 67: op =3D rv_op_amoor_d; break; case 68: op =3D rv_op_amoor_q; break; + case 96: op =3D rv_op_amoand_b; break; + case 97: op =3D rv_op_amoand_h; break; case 98: op =3D rv_op_amoand_w; break; case 99: op =3D rv_op_amoand_d; break; case 100: op =3D rv_op_amoand_q; break; + case 128: op =3D rv_op_amomin_b; break; + case 129: op =3D rv_op_amomin_h; break; case 130: op =3D rv_op_amomin_w; break; case 131: op =3D rv_op_amomin_d; break; case 132: op =3D rv_op_amomin_q; break; + case 160: op =3D rv_op_amomax_b; break; + case 161: op =3D rv_op_amomax_h; break; case 162: op =3D rv_op_amomax_w; break; case 163: op =3D rv_op_amomax_d; break; case 164: op =3D rv_op_amomax_q; break; + case 192: op =3D rv_op_amominu_b; break; + case 193: op =3D rv_op_amominu_h; break; case 194: op =3D rv_op_amominu_w; break; case 195: op =3D rv_op_amominu_d; break; case 196: op =3D rv_op_amominu_q; break; + case 224: op =3D rv_op_amomaxu_b; break; + case 225: op =3D rv_op_amomaxu_h; break; case 226: op =3D rv_op_amomaxu_w; break; case 227: op =3D rv_op_amomaxu_d; break; case 228: op =3D rv_op_amomaxu_q; break; --=20 2.25.1