From patchwork Thu Feb 9 06:29:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Gupta X-Patchwork-Id: 1739815 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=rivosinc-com.20210112.gappssmtp.com header.i=@rivosinc-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=t30FnQ5H; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PC6Tg0KMmz23jH for ; Thu, 9 Feb 2023 17:31:51 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQ0SR-0007lP-Hu; Thu, 09 Feb 2023 01:30:59 -0500 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 1pQ0S5-0007Z1-5Q for qemu-devel@nongnu.org; Thu, 09 Feb 2023 01:30:39 -0500 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 1pQ0S3-0000o9-9t for qemu-devel@nongnu.org; Thu, 09 Feb 2023 01:30:36 -0500 Received: by mail-pl1-x635.google.com with SMTP id u9so1833599plf.3 for ; Wed, 08 Feb 2023 22:30:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; 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=rfCWSS9jG8oH/r1HKi/uvLvwEOlj2iUYuI+0QRVQEBI=; b=t30FnQ5HaoX99Ii21dj/N8EtOEur7pO9kAl21LLxS6ZIKV+5LQQLE5xeQvP6dHwmmJ l+lsJ1vvLYcYtAl83J/zUipRUDlnPghks92akgOYzm7KpVcidm3pRWvPg5vS1yH46Vgq jZ9F/eGJHBDWxfON/xRxvBR9lmyBDwKi6mhYZACdUmuK1KLUtqclm1otpq2RbmaEByCX P8G79yBePj+lCluzq8Afodr65BRplaOe4C2ECTpzAX08RxcviyPjjiaiqY8XEQR0rcox o4f4DU/naRLlP7C37fAX3KbXtD8LqjQar7KWotODi8/ZJ6S1cx4XHe+V7pl2llzY3Y+D WMsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=rfCWSS9jG8oH/r1HKi/uvLvwEOlj2iUYuI+0QRVQEBI=; b=JbXqGrkT02BEBs/ffIDIhOnLcydHdIcfFOkh8o6Qfhxn+HqPwek7HGW5ciWyGECdo4 AT59y7vzQcIgII6887hzy+p+pr7EJCtPAuMK1Bifz8Ae75QXxNFvOW6V2mM6yoJ6h8lf W4MFBIKZfEs+++SNo69PlLpoX51DfvB7PycdHatmQVYvXua+GfeJYwPOERHH5Lrckwat VMPmSdd5OTkCDmTqqEB/lrnw7d5ROaRMyyqWkTqnL/LGbU2/Tj1mvn5y0A9Wiz1aCuD4 MqrcKS+gTCBxDwMx9VyafNIMSEhmdjdA/JYzijuECihBAgWVgvOUGFmhebDj3ZEg066T znvA== X-Gm-Message-State: AO0yUKUSgt0NtHTzguHCwK9qGBYtpj9Kbl+1irCUMqTqLjzB3/nqAMdV JkThGo5EeQR1Km7I4LqbBavn5bKAx4VpXWQB X-Google-Smtp-Source: AK7set//WQjnVauFQMciSD7aXuLNtoDl91A1cwqGpHfe7qe75MnIow8d22qPo2rVm5DJIyJOo/0o0Q== X-Received: by 2002:a05:6a21:9812:b0:a3:7d0b:5dcb with SMTP id ue18-20020a056a21981200b000a37d0b5dcbmr767910pzb.15.1675924233467; Wed, 08 Feb 2023 22:30:33 -0800 (PST) Received: from debug.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id u15-20020aa7848f000000b00593c434b1b8sm543649pfn.48.2023.02.08.22.30.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 22:30:32 -0800 (PST) From: Deepak Gupta To: qemu-devel@nongnu.org, Palmer Dabbelt , Alistair Francis Cc: Deepak Gupta , Kip Walker , qemu-riscv@nongnu.org Subject: [PATCH v1 RFC Zisslpcfi 9/9] target/riscv: diassembly support for zisslpcfi instructions Date: Wed, 8 Feb 2023 22:29:47 -0800 Message-Id: <20230209062947.3585481-10-debug@rivosinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230209062947.3585481-1-debug@rivosinc.com> References: <20230209062947.3585481-1-debug@rivosinc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=debug@rivosinc.com; helo=mail-pl1-x635.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds support to disassemble Zisslpcfi instructions. Signed-off-by: Deepak Gupta Signed-off-by: Kip Walker --- disas/riscv.c | 127 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 126 insertions(+), 1 deletion(-) diff --git a/disas/riscv.c b/disas/riscv.c index d216b9c39b..d16ee617b0 100644 --- a/disas/riscv.c +++ b/disas/riscv.c @@ -163,6 +163,7 @@ typedef enum { rv_codec_v_i, rv_codec_vsetvli, rv_codec_vsetivli, + rv_codec_lp, } rv_codec; typedef enum { @@ -935,6 +936,19 @@ typedef enum { rv_op_vsetvli = 766, rv_op_vsetivli = 767, rv_op_vsetvl = 768, + rv_op_lpsll = 769, + rv_op_lpcll = 770, + rv_op_lpsml = 771, + rv_op_lpcml = 772, + rv_op_lpsul = 773, + rv_op_lpcul = 774, + rv_op_sspush = 775, + rv_op_sspop = 776, + rv_op_ssprr = 777, + rv_op_ssamoswap = 778, + rv_op_sschkra = 779, + rv_op_zimops_r = 780, + rv_op_zimops_rr = 781, } rv_op; /* structures */ @@ -1011,6 +1025,7 @@ static const char rv_vreg_name_sym[32][4] = { #define rv_fmt_pred_succ "O\tp,s" #define rv_fmt_rs1_rs2 "O\t1,2" #define rv_fmt_rd_imm "O\t0,i" +#define rv_fmt_imm "O\ti" #define rv_fmt_rd_offset "O\t0,o" #define rv_fmt_rd_rs1_rs2 "O\t0,1,2" #define rv_fmt_frd_rs1 "O\t3,1" @@ -2065,7 +2080,20 @@ const rv_opcode_data opcode_data[] = { { "vsext.vf8", rv_codec_v_r, rv_fmt_vd_vs2_vm, NULL, rv_op_vsext_vf8, rv_op_vsext_vf8, 0 }, { "vsetvli", rv_codec_vsetvli, rv_fmt_vsetvli, NULL, rv_op_vsetvli, rv_op_vsetvli, 0 }, { "vsetivli", rv_codec_vsetivli, rv_fmt_vsetivli, NULL, rv_op_vsetivli, rv_op_vsetivli, 0 }, - { "vsetvl", rv_codec_r, rv_fmt_rd_rs1_rs2, NULL, rv_op_vsetvl, rv_op_vsetvl, 0 } + { "vsetvl", rv_codec_r, rv_fmt_rd_rs1_rs2, NULL, rv_op_vsetvl, rv_op_vsetvl, 0 }, + { "lpsll", rv_codec_lp, rv_fmt_imm, NULL, 0, 0, 0 }, + { "lpcll", rv_codec_lp, rv_fmt_imm, NULL, 0, 0, 0 }, + { "lpsml", rv_codec_lp, rv_fmt_imm, NULL, 0, 0, 0 }, + { "lpcml", rv_codec_lp, rv_fmt_imm, NULL, 0, 0, 0 }, + { "lpsul", rv_codec_lp, rv_fmt_imm, NULL, 0, 0, 0 }, + { "lpcul", rv_codec_lp, rv_fmt_imm, NULL, 0, 0, 0 }, + { "sspush", rv_codec_r, rv_fmt_rs1, NULL, 0, 0, 0 }, + { "sspop", rv_codec_r, rv_fmt_rd, NULL, 0, 0, 0 }, + { "ssprr", rv_codec_r, rv_fmt_rd, NULL, 0, 0, 0 }, + { "ssamoswap", rv_codec_r, rv_fmt_rd_rs1_rs2, NULL, 0, 0, 0 }, + { "sschkra", rv_codec_none, rv_fmt_none, NULL, 0, 0, 0 }, + { "zimops_r", rv_codec_r, rv_fmt_rd, NULL, 0, 0, 0 }, + { "zimops_rr", rv_codec_r, rv_fmt_rd, NULL, 0, 0, 0 } }; /* CSR names */ @@ -2084,6 +2112,8 @@ static const char *csr_name(int csrno) case 0x000a: return "vxrm"; case 0x000f: return "vcsr"; case 0x0015: return "seed"; + case 0x0006: return "lplr"; + case 0x0020: return "ssp"; case 0x0040: return "uscratch"; case 0x0041: return "uepc"; case 0x0042: return "ucause"; @@ -3554,6 +3584,87 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa isa) case 1: op = rv_op_csrrw; break; case 2: op = rv_op_csrrs; break; case 3: op = rv_op_csrrc; break; + case 4: + /* if matches mop_r mask */ + if ((((inst >> 15) & 0b10110011110000000) == + 0b10000001110000000)) { + if ((inst >> 25) == 0b1000000) { + switch ((inst >> 20) & 0b11) { + case 0: /* sspush and sspop */ + if (((inst >> 15) & 0b11111) && + !((inst >> 7) & 0b11111)) + op = rv_op_sspush; + if (!((inst >> 15) & 0b11111) && + ((inst >> 7) & 0b11111)) + op = rv_op_sspop; + break; + + case 1: /* ssprr */ + if (!((inst >> 15) & 0b11111) && + ((inst >> 7) & 0b11111)) + op = rv_op_ssprr; + break; + + default: + op = rv_op_zimops_r; + break; + } + } else { + op = rv_op_zimops_r; + } + } else if (((inst >> 15) & 0b10110010000000000) == + 0b10000010000000000) { /* if matches mop_rr mask */ + switch (inst >> 28) { + case 0b1000: + switch ((inst >> 7) & 0b11111) { + case 0b00000: + /* collect 5 bits */ + switch (((inst >> 23) & 0b11111)) { + case 23: + op = rv_op_lpcul; + break; + case 22: + op = rv_op_lpsul; + break; + case 13: + op = rv_op_lpcml; + break; + case 12: + op = rv_op_lpsml; + break; + case 6: + case 7: + op = rv_op_lpcll; + break; + case 4: + case 5: + op = rv_op_lpsll; + break; + default: + if (inst == + 0b10001010000100101100000001110011) { + op = rv_op_sschkra; + } else { + op = rv_op_zimops_rr; + } + break; + } + break; + default: + if ((inst >> 26) == 0b100000) { + op = rv_op_ssamoswap; + } else { + op = rv_op_zimops_rr; + } + break; + } + break; + default: + op = rv_op_zimops_rr; + break; + } + } + break; case 5: op = rv_op_csrrwi; break; case 6: op = rv_op_csrrsi; break; case 7: op = rv_op_csrrci; break; @@ -3883,6 +3994,17 @@ static uint32_t operand_vm(rv_inst inst) return (inst << 38) >> 63; } +static uint32_t operand_lpl(rv_inst inst) +{ + uint32_t label_width = 9; + + if ((inst >> 26) & 0b11) { + label_width = 8; + } + + return (inst >> 15) & ((1 << label_width) - 1); +} + /* decode operands */ static void decode_inst_operands(rv_decode *dec, rv_isa isa) @@ -4199,6 +4321,9 @@ static void decode_inst_operands(rv_decode *dec, rv_isa isa) dec->imm = operand_vimm(inst); dec->vzimm = operand_vzimm10(inst); break; + case rv_codec_lp: + dec->imm = operand_lpl(inst); + break; }; }