From nobody Fri Apr 19 05:15:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=wdc.com); dmarc=pass(p=none dis=none) header.from=wdc.com ARC-Seal: i=2; a=rsa-sha256; t=1596022209; cv=pass; d=zohomail.com; s=zohoarc; b=FmmvpUtARuq+lXqNleKZkZuWCTydkuF5uCIxV2OqD/OJbeHKwpEruIXNjjMRLIF00Rn/Z+hcDcGyNbQlGUPHfaWUMluk2RmuoY3hnnyIUboYxIFQLt99mFu4a6LGgT6blyaadYIzjnRbp/MXaqo0/v86rejW6XbBDLy2sUiCbNg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596022209; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Wj6gqpC3nsGj1KbwccBpw/cmuIwLQCeyi0Jl+MGuCvQ=; b=YKsCIKL6JlWM8e7yMXo4WM9aZcHlCx3lZlZn3Auess96FikjanYMpMCsuCT6lb4zTJ4Vn4Lam6BSDWEBLIm6Wf8hv+DVeV3RZFwYSpWFoNOjxmP76svqDnhgGcFZGVE1iw/5Z3SbSYgQpuyS4V64dtQhvPYn2Nd3fBhTBCbkndw= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=wdc.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596022208340972.2642021625644; Wed, 29 Jul 2020 04:30:08 -0700 (PDT) Received: from localhost ([::1]:52642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0kHd-0006TL-N4 for importer@patchew.org; Wed, 29 Jul 2020 07:30:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0kGH-0005AJ-Im; Wed, 29 Jul 2020 07:28:41 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:14617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0kGE-0001pU-Ed; Wed, 29 Jul 2020 07:28:41 -0400 Received: from mail-dm6nam12lp2175.outbound.protection.outlook.com (HELO NAM12-DM6-obe.outbound.protection.outlook.com) ([104.47.59.175]) by ob1.hgst.iphmx.com with ESMTP; 29 Jul 2020 19:28:35 +0800 Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM6PR04MB5753.namprd04.prod.outlook.com (2603:10b6:5:167::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.23; Wed, 29 Jul 2020 11:28:34 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::e0a4:aa82:1847:dea5]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::e0a4:aa82:1847:dea5%7]) with mapi id 15.20.3239.017; Wed, 29 Jul 2020 11:28:34 +0000 Received: from wdc.com (103.56.183.175) by BM1PR01CA0166.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:68::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.17 via Frontend Transport; Wed, 29 Jul 2020 11:28:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1596022118; x=1627558118; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=O9q0lziQmErYW67NNpuYOugAfNuDIgqzBmwVWx4B+Oo=; b=JeSSix/gXNyDRawWevRB08jwjt6BDTyh6ectXsLzK7pdmxgYtwn5AdIG Cy58Xdn30ko0kskh+q1sH0xH19jv44w5fk4UkzHFn6Cjt0X6PWpcEuGNR BwF5dsnvXw6VKaC40/6kP5bnCMLLDeMNaILTWOAfc61KNluHNUrsrdHZE Q24VXf4RoOow+pyxdqzPCui3YttJL0h5AuL23KNNm6eG23kQTHLDqqXha XeJD0i3BZrsrmmmYYYbgCBki9bo8VUxhQ5aVoVcgOHx37z0fPanH9ptLW H2GRSxZqgsQQ5wZVne5gXw8u1CTAz1CJobtGZ1OvHxELGQ8tDpgGQCDCJ g==; IronPort-SDR: P0F/atC95s201mSUoJJgSKtJH7lH7pJq/7treVUOPvpdMt4tuPhBm5UsM9nlw5Y7Gzltok4Fkm O3j+GZ1wuA2U6QXkuEzzhScT9CWJOUmFm46sHPg+Kbb8gWK/OqFKO6xZyz+bD7dnami+1j2o0S pVaPc+V5sOS+zB2++cLlUzMHpxRlPUWH8q7m/H8XxNw08/lNENIvymGL94eStlJ3a6TD0kIUqM I33OYumSshU8RCKIeZnXk6MffOBHIO1Exa22dZoZuSbmQPfdykxcosm60LCff2jE8OEIHQKSFT gY4= X-IronPort-AV: E=Sophos;i="5.75,410,1589212800"; d="scan'208";a="143644185" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nBi7CByvhmYXlHCgnA70/+fU3MQsnSi0qdiJclzUkuXCmvejPsMSBpcgGnz+MFZZDjI7VPgf8vZg2Gmf8wa7zFPHTDTHlRPAe4H2N3QsU+tkbx6GQEe229G5R32wirWtjP+BRDZD5q7PYq9WCNAwI03Ly0NEr6CPE76s8Hub2W48LBPpU2mj+CXWDpfXKo1QkMWDYpxcvJQqvOjkQverSOqMIzyrDYOiqqj/kSnaPVjhu4uSYHGUh4tTvWPF7xs/I51fyzw0ACJQ2vOuy2rcmi5MSA6Bhq0Jon2f0iIFmT9OPhcdJhowsYaLckjq7sl9UwBtWwIObI2axCOyxjD8cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Wj6gqpC3nsGj1KbwccBpw/cmuIwLQCeyi0Jl+MGuCvQ=; b=N9a98Ci58em9qeWnJtRYLUkkRO0yTMpk52Qg/RUfbwe7T4awXP7nSpAkCqcUV7lOEefGHS5sz0NUbO0Q6uDxMxdOkNgTrC34i0QOHXZa0smTr9MDpEK9kja6UZ2urMrnhF35qDzAHPE6Pp94MAwQL5YlvzKjoQXEI/VWL03yugSAajEIXKZ3WqmIDEG4foUF2WzJsJJ5uSq336Zt5Yr10ddbL0YCwFstWV8BEDaMwzH5BjCYr0L3giWk+DusB6piGbXM72ygx7E3wRRO59vV16RSpPJXjc8LzvDTOZcl4NxFYUGYI50l65kxapzaK+wrTsOV5W1BvxZLtxUPTFxeRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Wj6gqpC3nsGj1KbwccBpw/cmuIwLQCeyi0Jl+MGuCvQ=; b=oYQ4yXJfSfgiT5+X6lTqrPsexNq6pb+v8qpqlZSuqYRxbwxpf3nUAVYmA7wYy269w3hCUL7+nfl2FcVPBwEO2TH5E5yRZEMbm8hXpdwWatKmc1hs541swUiSaS1u0BVCSWq22EMcF1Nwk0ThyWRNhnN0fbae0ItNqg68Hug/ylM= Authentication-Results: linaro.org; dkim=none (message not signed) header.d=none;linaro.org; dmarc=none action=none header.from=wdc.com; From: Anup Patel To: Peter Maydell , Palmer Dabbelt , Alistair Francis , Sagar Karandikar Subject: [PATCH 1/3] target/riscv: Optional feature to provide trapped instruction in CSRs Date: Wed, 29 Jul 2020 16:57:59 +0530 Message-Id: <20200729112801.108985-2-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200729112801.108985-1-anup.patel@wdc.com> References: <20200729112801.108985-1-anup.patel@wdc.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BM1PR01CA0166.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:68::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [103.56.183.175] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 9d466722-dda5-457f-182e-08d833b2875f X-MS-TrafficTypeDiagnostic: DM6PR04MB5753: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gk5+275I2k9ITeJn/oMtfIk8+LS8MgObGtfTpcNhN+i47qjK1iVn37oJdWjaLK4HYDIuEECk9Suhl7/nMlW6ZpIeBOX9/YpCdgMQ+r9FbqPst6c8eV1W9kJwiVH7Bg/z8KXNhEXL2tP/iS7s+HNQjdOrjbfvgopCeWdEnRdfC8468UtIbKkAXtI+mT++LZkOIKmGWHLjQi8TSwyrafOfFvx0+oSQhVV2K5VJ6wEWuHg9BWBaZfTC2Ps6H5pxzY8TRH1kg2OOycOZm6bJl7mA2+M1pLy5D18uxMgdx3P/rOBUBYITGYqa9iLAVSQrjZU/ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(39860400002)(396003)(136003)(376002)(366004)(346002)(4326008)(36756003)(956004)(2616005)(52116002)(8886007)(110136005)(2906002)(83380400001)(7696005)(55016002)(8676002)(44832011)(186003)(66946007)(316002)(26005)(54906003)(16526019)(8936002)(86362001)(66556008)(5660300002)(6666004)(1076003)(478600001)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: tZPafMqQXMds8dyt1Gj/jmVtlua8L0bqlaxTC1/KOPTSK/dg2UYM+7/SZMvJg7uaJr/R+3twPey4J5ZivAsLVW0ETih/CQM8IVX+rqd1drEv/Wyzbx/XZgjDRsnlLqyg6qksGHFsKLJpenRko3c9c0uObjAIfMORcKxXIj+ZSYe+6mLPWyiyv+f3vprU9V0zmej+WqH4rQy4BEUg5E8BwacFDhtE4inkpckNE3C1n5wo0uiehTykNq05xIDwiS4mKZvW9VZ7a/aigR74nI7dItafrQ6uSz48YahNH8F0JDNKOGJVr86IbSIRPlWV7E5yTaDUjYUcJR7VPYCb6Gdw2aY0sFVXaftpbVsv3kFWdKWHAAcZZJBkRioD0Xn+vqfmyL2RlAOvtYxjso7x1lZGsS1AYkaBqwS88lieZey6HOUZyGG1mtuev9BPzcBncJSrgaOpAlwKjZhp9DbGGfeoSjmyKGYhMFFjlNLZo5brUFpHJg418+0I/4YYPOTSRyto X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d466722-dda5-457f-182e-08d833b2875f X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2020 11:28:34.4224 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lVXsO8YCqSAkp/kAvJZUMNDr1wYjOD05YWdDs1ePTteo1wJQC5vWVA0ZlzQbSuUZuDOXh971VdeP2ESa9IaLQA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5753 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.71.154.42; envelope-from=prvs=47218c038=Anup.Patel@wdc.com; helo=esa4.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/29 07:28:35 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Atish Patra , Anup Patel , qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Anup Patel Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @sharedspace.onmicrosoft.com) Content-Type: text/plain; charset="utf-8" The RISC-V spec allows implementations to provide trapped instruction opcode in MTVAL/STVAL CSR for illegal/virtual instruction traps. This is totally optional and most RISC-V implementations always set zero in the MTVAL/STVAL CSR for illegal/virtual instruction traps. When trapped instruction opcode is available in MTVAL/STVAL CSR, the M-mode runtime firmware (and Hypervisors) can skip unprivlege access for reading trapped instruction opcode which in-turn will speed-up the illegal/virtual instruction trap handling. This patch implements RISCV_FEATURE_TINST feature which when enabled provides original trapped instruction opcode in MTVAL/STVAL CSRs for illegal/virtual instruction trap. Signed-off-by: Anup Patel Reviewed-by: Alistair Francis --- target/riscv/cpu.c | 7 +++++++ target/riscv/cpu.h | 11 ++++++++++- target/riscv/cpu_helper.c | 6 ++++++ target/riscv/translate.c | 14 +++++++++++++- 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index eeb91f8513..ec098e445e 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -317,6 +317,7 @@ void restore_state_to_opc(CPURISCVState *env, Translati= onBlock *tb, target_ulong *data) { env->pc =3D data[0]; + env->trap_insn =3D data[1]; } =20 static void riscv_cpu_reset(DeviceState *dev) @@ -332,6 +333,7 @@ static void riscv_cpu_reset(DeviceState *dev) env->mstatus &=3D ~(MSTATUS_MIE | MSTATUS_MPRV); env->mcause =3D 0; env->pc =3D env->resetvec; + env->trap_insn =3D 0; #endif cs->exception_index =3D EXCP_NONE; env->load_res =3D -1; @@ -387,6 +389,10 @@ static void riscv_cpu_realize(DeviceState *dev, Error = **errp) set_feature(env, RISCV_FEATURE_PMP); } =20 + if (cpu->cfg.tinst) { + set_feature(env, RISCV_FEATURE_TINST); + } + /* If misa isn't set (rv32 and rv64 machines) set it here */ if (!env->misa) { /* Do some ISA extension error checking */ @@ -487,6 +493,7 @@ static Property riscv_cpu_properties[] =3D { DEFINE_PROP_STRING("priv_spec", RISCVCPU, cfg.priv_spec), DEFINE_PROP_BOOL("mmu", RISCVCPU, cfg.mmu, true), DEFINE_PROP_BOOL("pmp", RISCVCPU, cfg.pmp, true), + DEFINE_PROP_BOOL("tinst", RISCVCPU, cfg.tinst, false), DEFINE_PROP_END_OF_LIST(), }; =20 diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 1bb5271511..33984539d7 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -26,6 +26,12 @@ =20 #define TCG_GUEST_DEFAULT_MO 0 =20 +/* + * RISC-V-specific extra insn start words: + * 1: Original instruction opcode + */ +#define TARGET_INSN_START_EXTRA_WORDS 1 + #define TYPE_RISCV_CPU "riscv-cpu" =20 #define RISCV_CPU_TYPE_SUFFIX "-" TYPE_RISCV_CPU @@ -70,7 +76,8 @@ enum { RISCV_FEATURE_MMU, RISCV_FEATURE_PMP, - RISCV_FEATURE_MISA + RISCV_FEATURE_MISA, + RISCV_FEATURE_TINST }; =20 #define PRIV_VERSION_1_10_0 0x00011000 @@ -97,6 +104,7 @@ struct CPURISCVState { target_ulong frm; =20 target_ulong badaddr; + target_ulong trap_insn; target_ulong guest_phys_fault_addr; =20 target_ulong priv_ver; @@ -264,6 +272,7 @@ typedef struct RISCVCPU { char *user_spec; bool mmu; bool pmp; + bool tinst; } cfg; } RISCVCPU; =20 diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index eccd80cfef..e4bd45d66a 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -864,6 +864,12 @@ void riscv_cpu_do_interrupt(CPUState *cs) case RISCV_EXCP_STORE_PAGE_FAULT: tval =3D env->badaddr; break; + case RISCV_EXCP_VIRT_INSTRUCTION_FAULT: + case RISCV_EXCP_ILLEGAL_INST: + if (riscv_feature(env, RISCV_FEATURE_TINST)) { + tval =3D env->trap_insn; + } + break; default: break; } diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 1d973b62e9..03954bff62 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -56,6 +56,8 @@ typedef struct DisasContext { to reset this known value. */ int frm; bool ext_ifencei; + /* TCG op of the current insn_start. */ + TCGOp *insn_start; } DisasContext; =20 #ifdef TARGET_RISCV64 @@ -717,6 +719,13 @@ static bool gen_shift(DisasContext *ctx, arg_r *a, /* Include the auto-generated decoder for 16 bit insn */ #include "decode_insn16.inc.c" =20 +static inline void decode_save_opc(DisasContext *ctx, target_ulong opc) +{ + assert(ctx->insn_start !=3D NULL); + tcg_set_insn_start_param(ctx->insn_start, 1, opc); + ctx->insn_start =3D NULL; +} + static void decode_opc(CPURISCVState *env, DisasContext *ctx, uint16_t opc= ode) { /* check for compressed insn */ @@ -724,6 +733,7 @@ static void decode_opc(CPURISCVState *env, DisasContext= *ctx, uint16_t opcode) if (!has_ext(ctx, RVC)) { gen_exception_illegal(ctx); } else { + decode_save_opc(ctx, opcode); ctx->pc_succ_insn =3D ctx->base.pc_next + 2; if (!decode_insn16(ctx, opcode)) { /* fall back to old decoder */ @@ -734,6 +744,7 @@ static void decode_opc(CPURISCVState *env, DisasContext= *ctx, uint16_t opcode) uint32_t opcode32 =3D opcode; opcode32 =3D deposit32(opcode32, 16, 16, translator_lduw(env, ctx->base.pc_next + 2)); + decode_save_opc(ctx, opcode32); ctx->pc_succ_insn =3D ctx->base.pc_next + 4; if (!decode_insn32(ctx, opcode32)) { gen_exception_illegal(ctx); @@ -773,7 +784,8 @@ static void riscv_tr_insn_start(DisasContextBase *dcbas= e, CPUState *cpu) { DisasContext *ctx =3D container_of(dcbase, DisasContext, base); =20 - tcg_gen_insn_start(ctx->base.pc_next); + tcg_gen_insn_start(ctx->base.pc_next, 0); + ctx->insn_start =3D tcg_last_op(); } =20 static bool riscv_tr_breakpoint_check(DisasContextBase *dcbase, CPUState *= cpu, --=20 2.25.1 From nobody Fri Apr 19 05:15:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=wdc.com); dmarc=pass(p=none dis=none) header.from=wdc.com ARC-Seal: i=2; a=rsa-sha256; t=1596022316; cv=pass; d=zohomail.com; s=zohoarc; b=eOO5tRMj98kbed0LZqcoEORG/27d7fFhEScTVoJm1mmPRGolX/eJtiEpGKfIPokI3P40t8HD1W18he5hTWKKhvMkPh1dcSXO4MNSEprax3kOHlKwU+5WZwSxDfaky3eMEolTMCON0cq5jCoa+e+jjy54aRZKoFULkxywE3AWMGI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596022316; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2zucbBLuhA++Js13w8UpK5p5c03btMirgbnWzE/10yg=; b=MBVZUEYjs3LaE5sHJ30XHRCNUlb8XTOfmhkIymhnimGsnxzjmpDIhQ2xBFvIGP99LuNQZ5mJd0hcCEuJGnxLOXoZE+BLSYHp2JwrztII5QCtEJPN+KPVhKqVrEAJDP4+crrvhk+mcCx9hLeb43hDTnyyIJGxvTNzIO1J60JQ2gs= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=wdc.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596022316137161.0552994585405; Wed, 29 Jul 2020 04:31:56 -0700 (PDT) Received: from localhost ([::1]:56996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0kJO-0008T2-Qh for importer@patchew.org; Wed, 29 Jul 2020 07:31:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0kGK-0005D5-4V; Wed, 29 Jul 2020 07:28:44 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:14630) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0kGI-0001pz-0I; Wed, 29 Jul 2020 07:28:43 -0400 Received: from mail-dm6nam12lp2168.outbound.protection.outlook.com (HELO NAM12-DM6-obe.outbound.protection.outlook.com) ([104.47.59.168]) by ob1.hgst.iphmx.com with ESMTP; 29 Jul 2020 19:28:39 +0800 Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM6PR04MB5753.namprd04.prod.outlook.com (2603:10b6:5:167::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.23; Wed, 29 Jul 2020 11:28:38 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::e0a4:aa82:1847:dea5]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::e0a4:aa82:1847:dea5%7]) with mapi id 15.20.3239.017; Wed, 29 Jul 2020 11:28:38 +0000 Received: from wdc.com (103.56.183.175) by BM1PR01CA0166.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:68::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.17 via Frontend Transport; Wed, 29 Jul 2020 11:28:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1596022121; x=1627558121; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=3ovgoh9RYf9x+TXZWqjXqhdhVCBZC5tQzm8JwHuvwZA=; b=i8Ftcq+zMYmTeNerMgPmWakB/v4q6Y2QRoBeYs1zV1RCTwP+IbBR0MMf zJMCFe61nONh3CQM91PX5jh5x0BWnTQMdus3LRazkSpgaoOVvL9TevSq9 FybXrEdBHOUZf3waTA3A1gf1ckaceAokZENaxtvj5wvtHDEyJTeLIdJo+ zacjJYS8WNoZsUBsh0LmNRWFabhi9/SuoC00EDv/BrxPOp+1QZQSR7FvL eGK4NRqFL7dn9lKjCWzQZKozJSWuLqlnGsjdT+AXJksZONBJfdgvqkVxe +lxgugAZt/9Y72yOJRjkN7l9X4ug9/H39AXVxXeCZanad2X+2ygLXJOqO A==; IronPort-SDR: Uu+pcmRyLy+qVlbzzGurXQRluKS5YCflVJaI6GVreGcHebP5lA2e6hscHefKrwLBPo0yQCLTW4 K/NrdAsWply+YKGBi0cQbDtBrVlolnXNTos9WDkWobhf5GOSjPfOB7T+m5i4dBXk+79cQE7DaQ SPesg5nDinnDWtYh+OpdP99U6yZFll+9WW7jo81/WswXi5IJwKjvgmI0fe7rg0XTHKpEwQgvZ3 P4CWGH9Wl47d51lr7b0F2Uievw/DMTHL719zzIKv9YIEkmQZ2RLDEvvhW0WvM63uxpw4gX/NTH lms= X-IronPort-AV: E=Sophos;i="5.75,410,1589212800"; d="scan'208";a="143644194" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I4uYmPxCEmbfJMaKz/iNVGx2ZO0oLdoz7vv3EGKEzpMqyX2y6VBTprslcLbUTLMqkIAb+6/zricPeF+8XKKk+En0nmpl3qSDVpE256Ux5S0Uhi2xeHS5D+H3fb21BmRtq7Sj9RPuum2htcl475a1iR3HNCBBTsiibcF2VyBmaQqcRLKs5Qdf3nGbWlmDr+SCA8AY2fHfg/zwRbO9porJovjVJFPr9CG6zoHnwaC5cVPsML+YM2i+jH80fdqJQaZCYyw2Ry8RCYThYyusGuR/8/52LGf5ua21V5nKdjXUPNBC+wI+Kc0e2vut75QXXmg6EvvABKBYVhuMVLSlkXnBBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2zucbBLuhA++Js13w8UpK5p5c03btMirgbnWzE/10yg=; b=nI/EB0jFCfz4e7/En1KAdFQJfmbCcO1u2Ljc7x4aF8UL8LCCXQVip+TL66Jfs1CwqSfbwnvWMBLy/1eg6ZTDpTUj+OMlIiOfIU1ln/laXDAUtVfxNnnBEA0lOW25CH2zCAp9o8S7QfLYrb2i0YDm3ARzIBV62S9ZG0Oqy4bAtZ2XNcY56bqIK7hPT6o6b2nng/WnPZujZoXX9NUjdBhmXvhH4KJt9WzoUQDqfloZKpUfyrWV8M8SuN4lfEGCLg+7pg9mNRWCiqp9vPoicL3DKZGLXPOSgtuQ2H6NpX7SZguWXq+eomlz4+4VAnLczgNjJ71gCLmoXAFNilx9MPU1ew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2zucbBLuhA++Js13w8UpK5p5c03btMirgbnWzE/10yg=; b=pHQ9wABUQpPdAAkSwBcudrurpjUE5XweB42QSXHg/truDBcQAPSjjQdIv6AATQyeGHKE2eWGcFWP+s0U225P5jGTGeIUSH3Xf4KOm2p8Ci78qcPXAHsslMBqSwdCtXiVxQ7OOOVmbLzjJD3ISKr213ugE5lm7ifeBlhnKX+/fwY= Authentication-Results: linaro.org; dkim=none (message not signed) header.d=none;linaro.org; dmarc=none action=none header.from=wdc.com; From: Anup Patel To: Peter Maydell , Palmer Dabbelt , Alistair Francis , Sagar Karandikar Subject: [PATCH 2/3] target/riscv: Fix write_htinst() implementation Date: Wed, 29 Jul 2020 16:58:00 +0530 Message-Id: <20200729112801.108985-3-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200729112801.108985-1-anup.patel@wdc.com> References: <20200729112801.108985-1-anup.patel@wdc.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BM1PR01CA0166.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:68::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [103.56.183.175] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 564d6e7c-4e39-4a54-5cae-08d833b289dc X-MS-TrafficTypeDiagnostic: DM6PR04MB5753: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:1388; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ImuYcHTkx6qGb7C/QNazCftt3b+P0718EpHRXf9Oto+qPCv2FLXpUybvwDo+hhishBL27B9OM4Zopy/RCsf6FwLG8OVzBN0gd7e5WtZBKQDFq1ahKd/axFTT2ySFEEl4/cZ02Lo340b+rlDIQJHlRLNYBkMENwu4yRdkowFOs546xVEhI6Y3tX6SWHtx9Hg4UQBU8rFLP/JsqQ4YWNlotaVy6AvB++MqRpl+5fS6J1aRG8Qra6qtsgPs6ahd0dT5ioSj1i9Of1A8RPApPBrNqmt2do2Ii8ys/+Cu/4uMaVD6zRObsabhSKRscRCNX6gc X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(39860400002)(396003)(136003)(376002)(366004)(346002)(4326008)(36756003)(956004)(2616005)(52116002)(8886007)(110136005)(2906002)(7696005)(55016002)(8676002)(44832011)(186003)(4744005)(66946007)(316002)(26005)(54906003)(16526019)(8936002)(86362001)(66556008)(5660300002)(6666004)(1076003)(478600001)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: xf7vNfROaFLCi/6v1t2YG+Qgc6gwliR8ibRtNXFkXGbBk/59BOyTivvQUshfQOgCsJX8FU9J8LWxEeKqsDCIkWWrgGESclWIDm5WZhj65JNjGe7n2NOBuqsPGztBM7L8T46ILKIu6ATRm99gqbWyRoNSz0oskdjM+rMixqj96p+VxeK1+v707WE6oWfBjwk/hFUSARkzi63UkDq+G99kVidrzdCykK1Sn3momofneYa4p9oTuUy+dliy2R3tPA/aVIoNhK04LW8nhJ9FB2StLAWPa4v2Hdqg4pmMs+Pbx2R8op4+7r0GLyoow88A0z0Rp3xXfSdYTOaYcyzV6HHfIVe48UJtHK0FZ0eC52qYhf1N2mN6i6TFU+HKhapwlyEJQyOhps/2nrp1z++kCTPxXaqpC1fHhY62FRX7aqZA15eifCpevZkZwNAr/Mk4TvnUUjbX2PNrmWY0R6X1us90r1tJC7jc05Yql3eO9DsyThx4R9ni2Jz6O/NeRyAXII1Y X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 564d6e7c-4e39-4a54-5cae-08d833b289dc X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2020 11:28:38.7907 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: q9q6tKpLvLn8rkf8oQu5is084v71hQR31YciJkAWJmcFN2HasvtEKeHWnhkCfUUFrGoBXKqJfOry4O/8itaO9Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5753 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.71.154.42; envelope-from=prvs=47218c038=Anup.Patel@wdc.com; helo=esa4.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/29 07:28:35 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Atish Patra , Anup Patel , qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Anup Patel Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @sharedspace.onmicrosoft.com) Content-Type: text/plain; charset="utf-8" The htinst CSR is writeable from M-mode and HS-mode so we should not ignore writes to htinst CSR. Signed-off-by: Anup Patel Reviewed-by: Alistair Francis --- target/riscv/csr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index f985b85de4..99fcb7f67d 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -943,6 +943,7 @@ static int read_htinst(CPURISCVState *env, int csrno, t= arget_ulong *val) =20 static int write_htinst(CPURISCVState *env, int csrno, target_ulong val) { + env->htinst =3D val; return 0; } =20 --=20 2.25.1 From nobody Fri Apr 19 05:15:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=wdc.com); dmarc=pass(p=none dis=none) header.from=wdc.com ARC-Seal: i=2; a=rsa-sha256; t=1596022397; cv=pass; d=zohomail.com; s=zohoarc; b=kN5J4uRR3WPPRpJzdNxc824MVn8OEfcv2skF3RQptm1i9ctUtQcgXw6tdIRWEet1ilQpSyWSNU8zeL1ZwaZH9pzBZvHJWx06xt7AjRcCJTJYCC1XKc4vbutQQ7fWEyWYEi9AaD7BcvQPivyJRtR5udxtNtKIyfD0BPAp1r8U3h8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596022397; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=y6/MNSpdtXBXAJdj/SCoTexXObfJ4XCKq+mQ+4Rhpdk=; b=fMTKh83RNGO4gbxHbzlx24GHL8ZXgDkB6c8qBitVd4s1CURBKQmQWIlJIHoE7aFL5uNwa4/hUtqDTfjspvdEzox+PJuTU7Sp2CJxrnv2JqwC9U0OBT3dfn5MwsvovZbTFiaisJxJJM4Gpc+GZpg7t1nxicuIEBQCoplc5N9WrMY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=@wdc.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=wdc.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596022397926746.7997722556843; Wed, 29 Jul 2020 04:33:17 -0700 (PDT) Received: from localhost ([::1]:33760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0kKi-00027j-Kc for importer@patchew.org; Wed, 29 Jul 2020 07:33:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0kGO-0005Ho-UE; Wed, 29 Jul 2020 07:28:49 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:14634) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0kGM-0001rW-5N; Wed, 29 Jul 2020 07:28:48 -0400 Received: from mail-dm6nam12lp2172.outbound.protection.outlook.com (HELO NAM12-DM6-obe.outbound.protection.outlook.com) ([104.47.59.172]) by ob1.hgst.iphmx.com with ESMTP; 29 Jul 2020 19:28:43 +0800 Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM6PR04MB5753.namprd04.prod.outlook.com (2603:10b6:5:167::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.23; Wed, 29 Jul 2020 11:28:43 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::e0a4:aa82:1847:dea5]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::e0a4:aa82:1847:dea5%7]) with mapi id 15.20.3239.017; Wed, 29 Jul 2020 11:28:43 +0000 Received: from wdc.com (103.56.183.175) by BM1PR01CA0166.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:68::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3239.17 via Frontend Transport; Wed, 29 Jul 2020 11:28:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1596022125; x=1627558125; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=e50FjJH9uwXlMNKJAOy+HYiki8Pod1mdylF2n7eqmUU=; b=MRgocWOHTWG9xY4B4BSO2mtq2tFr+eD7fsuOLagH+BcLWBw8QJ8uJJpm G7V8QfbzTiXY/tMsaDCNAeHklCKfxVNaVYUDV3Fk+qtxYfzuGo62oufjW Hm20i37TB29MboHaAjfGSLV2Ql4r27eyAVlXRbPMPGUChmEMvvqrTc9V9 ZjEG49+lvsA+K387++swoWtBUnFhSMOH5/12qs2KC6N0tLYzg3t7nhT5l NXmESju+dnpUm6Kb5iYGTlD0Kux7rndy0TUIvj1oR3NIeHZHZtMk9a6C8 LXpVa9zJcw8GgVCbzHSBTGfdxm7gcapKgL/YEpJS1svaDBnenkH3NN5BB Q==; IronPort-SDR: 5YrV8jiF3m8hbrQomPaS05SMh0Ri954VynltwRQVTKMPIYSrKkTmUHu4ryYQ/p+iF0l04nOL57 KC1KwKQNeOWd9Eep6+E+U+UWeENNyKYbX8qHlM1K2xMtdd0991vB4OCgpvV40UCuKO+bYTYKpA GSQ0YbwlmdpFbcNpwEmsjnG00tDonNmqkFP+AR/HXZONaN4y7o0CSVHufkweUwkrijtoNbbe3e u+eBOj5JMIykXk1GWlUiPLG+em914/ijZCaAtg14cph0uOIxIDVF1w7ngy76SkpQJKyHqQf7/N y74= X-IronPort-AV: E=Sophos;i="5.75,410,1589212800"; d="scan'208";a="143644198" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ei4E8w40m7ITNJt+SSMoq4OS/MDUR6IIwZDgLzZRvbRzRhyvLjJGYM87D5SV7UQQ3rZK9XHLZDZZvvLam4YCicWgTXXlJ1dK6hayaBLXSUwpDrDB1pad4xrX0tAhHv03tfXgO8hkwWLQ5ZBASfsXecyVCA9B+qdoRhcZtlhQVLx2PFLFPYgb0Kf5y7igJz4gdCZ4DdWPNf4eKo60CYpbM6Q2SiGnG2R6aRSJu2My19/Bs1CiicUC6DTmk5O70DUkqhPd6ksTQm0Isv+czIeUXIk8U3hnn2VJRW9yXIZ/IlmR1No9HhHChNTDEdW0CVkwbNNfL7/Tf0dciI4JooWSBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=y6/MNSpdtXBXAJdj/SCoTexXObfJ4XCKq+mQ+4Rhpdk=; b=TpzLs5Y9DnqeJlbi2oHxM0D1eMRihlMK2yvgiiZCSsTdpJx5DnqS13C1MpmTc/pEbdgctTov5S0BeYU02jBcycsqqD87DoueQSGKY1fJfW85oNUEusNMuTL+sGRpCQta62LOvb8Z3hvcSxiOdasU7YyezKIu59MmeO/SgNft9m7Dbkn/V37FMrj/ZDhexUuNNlb+krHJgiMtjX3k8VnsIg72t0ow/TPndFZJXL17J1RG2VLSQuvrexS+2cwXup69i9zmXThc8PzOmYgtYzwWlWDzDPMHO4wwmIHocefaerMmMnm8CihzcLxx/pKkfCGljI6btDg6ySvwAl1llpPKsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=y6/MNSpdtXBXAJdj/SCoTexXObfJ4XCKq+mQ+4Rhpdk=; b=TyhVZZZVI9lObFhbWdQaiYRVThttgoXhKTbzU7aHKhK70d4uAmqdjYtmGnoztxQE13rZmsdiGQ6s7O5QDMJ+09e8ayIlPdUBrhZW9LA36hl5BqDne9wgyCHaKKzEFIZJGLtreaOYUuYtn1sbiOBwOelj0pFOhhN41qttawq1Eds= Authentication-Results: linaro.org; dkim=none (message not signed) header.d=none;linaro.org; dmarc=none action=none header.from=wdc.com; From: Anup Patel To: Peter Maydell , Palmer Dabbelt , Alistair Francis , Sagar Karandikar Subject: [PATCH 3/3] target/riscv: Update MTINST/HTINST CSR in riscv_cpu_do_interrupt() Date: Wed, 29 Jul 2020 16:58:01 +0530 Message-Id: <20200729112801.108985-4-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200729112801.108985-1-anup.patel@wdc.com> References: <20200729112801.108985-1-anup.patel@wdc.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BM1PR01CA0166.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:68::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [103.56.183.175] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: cf5f1004-d8b8-4a4d-9fb8-08d833b28c6b X-MS-TrafficTypeDiagnostic: DM6PR04MB5753: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PkEN2A31v5MaIsNFZasHDZg6qiCcMey76GfFo5Iu0MFYDLWrDCyAcCszkMneXGBYTH/vOnEZ0SplO/Bln1nOwrJbldVaq8ieG+pb1rx+BXKalt7OBr1aOHlXW8ezB5R1DB9puSMIFgWSIKWrcp7Pci73hyjBOwBYiDExJsZbBqLlMt5eiiONam7H2U/Gi08R3+7qJAMxUC5crZ4maZsjPln8XS536FuTIjDBZYsk94Aocw78bKqzS39Nwrq+uaAkJzzwCdFD1cefdMgKIxDeXXKSp4lm95gPK3xTdJeMN2MZC30D/cJoZgjG3oXMtBJ6 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(39860400002)(396003)(136003)(376002)(366004)(346002)(4326008)(36756003)(956004)(2616005)(52116002)(8886007)(110136005)(2906002)(83380400001)(7696005)(55016002)(8676002)(44832011)(186003)(66946007)(316002)(26005)(54906003)(16526019)(8936002)(86362001)(15650500001)(66556008)(5660300002)(6666004)(1076003)(478600001)(66476007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: vzm+Xy4/CogUyoSnT/MJ4APIJ2oKmGMQ3ba/m+4c6TNyaVSk2rcOXtPFA5mdOEfmzByKNJKP76/TFqe39rOnULkrOtCLDdMZ1dBbqhYbynXoGCRQOm7mEs0Y+EccbLjixdBalBxrHbf8dyk+SSnml0LJfnVoil3kqwQGZUhnZhCdL+HtaArZ+j74PIr9wjh9OoyKl7ppVzYw5ps5JmE087WplsVXeuAXG1nUACy9g8/HHLnPL+ESYJqnlC4HzCvwvUwwQEz/ugPxxpY4L58lyMkCnq6riD9cQedgzshdT5NEDNDyTQ8/tRrgpiws5i6KmU1ieIKDntVh1021EScbBv1PHPQqqg2bGaeB77Zt/EVOZq61Tc+kGaV2CqRBePsKCw4VGiNVsADjTtJW0GiJq1XwvzVFiv48V7Jg3kh5TVUNqkLbirDQhCHWYUo5hAP7r/LBoDjkbSf45xST1GuNTjm+l8CIW0dC2TU0h8XqRl6iPK76exWwLJa4RVw1MvbM X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf5f1004-d8b8-4a4d-9fb8-08d833b28c6b X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2020 11:28:43.0541 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SBlMwB1wKe4Pj3KMaxXofMlnXP/rIeiNDpha3w9WxPMWDFG5WvZIoulZgIhDW0Q0xkaFxWGM4N2ChOe+XPc33A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5753 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.71.154.42; envelope-from=prvs=47218c038=Anup.Patel@wdc.com; helo=esa4.hgst.iphmx.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/29 07:28:35 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Atish Patra , Anup Patel , qemu-riscv@nongnu.org, qemu-devel@nongnu.org, Anup Patel Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @sharedspace.onmicrosoft.com) Content-Type: text/plain; charset="utf-8" When RISCV_FEATURE_TINST feature is enabled, we should write transformed instruction encoding of the trapped instruction in MTINST/HTINST CSR at time of taking trap. We update riscv_cpu_do_interrupt() as-per above. Signed-off-by: Anup Patel --- target/riscv/cpu_helper.c | 166 +++++++++++++++++++++++++++++++++++++- target/riscv/instmap.h | 41 ++++++++++ 2 files changed, 204 insertions(+), 3 deletions(-) diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index e4bd45d66a..97ae23ad2b 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -22,6 +22,7 @@ #include "qemu/main-loop.h" #include "cpu.h" #include "exec/exec-all.h" +#include "instmap.h" #include "tcg/tcg-op.h" #include "trace.h" =20 @@ -820,6 +821,151 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, = int size, #endif } =20 +static target_ulong riscv_transformed_insn(CPURISCVState *env, + int xlen, target_ulong insn) +{ + target_ulong xinsn =3D 0; + + if ((insn & 0x3) !=3D 0x3) { + /* Transform 16bit instruction into 32bit instruction */ + switch (GET_C_OP(insn)) { + case OPC_RISC_C_OP_QUAD0: /* Quadrant 0 */ + switch (GET_C_FUNC(insn)) { + case OPC_RISC_C_FUNC_FLD_LQ: + if (xlen !=3D 128) { /* C.FLD (RV32/64) */ + xinsn =3D OPC_RISC_FLD; + xinsn =3D SET_RD(xinsn, GET_C_RS2S(insn)); + xinsn =3D SET_RS1(xinsn, GET_C_RS1S(insn)); + xinsn =3D SET_I_IMM(xinsn, GET_C_LD_IMM(insn)); + } + break; + case OPC_RISC_C_FUNC_LW: /* C.LW */ + xinsn =3D OPC_RISC_LW; + xinsn =3D SET_RD(xinsn, GET_C_RS2S(insn)); + xinsn =3D SET_RS1(xinsn, GET_C_RS1S(insn)); + xinsn =3D SET_I_IMM(xinsn, GET_C_LW_IMM(insn)); + break; + case OPC_RISC_C_FUNC_FLW_LD: + if (xlen =3D=3D 32) { /* C.FLW (RV32) */ + xinsn =3D OPC_RISC_FLW; + xinsn =3D SET_RD(xinsn, GET_C_RS2S(insn)); + xinsn =3D SET_RS1(xinsn, GET_C_RS1S(insn)); + xinsn =3D SET_I_IMM(xinsn, GET_C_LW_IMM(insn)); + } else { /* C.LD (RV64/RV128) */ + xinsn =3D OPC_RISC_LD; + xinsn =3D SET_RD(xinsn, GET_C_RS2S(insn)); + xinsn =3D SET_RS1(xinsn, GET_C_RS1S(insn)); + xinsn =3D SET_I_IMM(xinsn, GET_C_LD_IMM(insn)); + } + break; + case OPC_RISC_C_FUNC_FSD_SQ: + if (xlen !=3D 128) { /* C.FSD (RV32/64) */ + xinsn =3D OPC_RISC_FSD; + xinsn =3D SET_RS2(xinsn, GET_C_RS2S(insn)); + xinsn =3D SET_RS1(xinsn, GET_C_RS1S(insn)); + xinsn =3D SET_S_IMM(xinsn, GET_C_SD_IMM(insn)); + } + break; + case OPC_RISC_C_FUNC_SW: /* C.SW */ + xinsn =3D OPC_RISC_SW; + xinsn =3D SET_RS2(xinsn, GET_C_RS2S(insn)); + xinsn =3D SET_RS1(xinsn, GET_C_RS1S(insn)); + xinsn =3D SET_S_IMM(xinsn, GET_C_SW_IMM(insn)); + break; + case OPC_RISC_C_FUNC_FSW_SD: + if (xlen =3D=3D 32) { /* C.FSW (RV32) */ + xinsn =3D OPC_RISC_FSW; + xinsn =3D SET_RS2(xinsn, GET_C_RS2S(insn)); + xinsn =3D SET_RS1(xinsn, GET_C_RS1S(insn)); + xinsn =3D SET_S_IMM(xinsn, GET_C_SW_IMM(insn)); + } else { /* C.SD (RV64/RV128) */ + xinsn =3D OPC_RISC_SD; + xinsn =3D SET_RS2(xinsn, GET_C_RS2S(insn)); + xinsn =3D SET_RS1(xinsn, GET_C_RS1S(insn)); + xinsn =3D SET_S_IMM(xinsn, GET_C_SD_IMM(insn)); + } + break; + default: + break; + } + break; + case OPC_RISC_C_OP_QUAD2: /* Quadrant 2 */ + switch (GET_C_FUNC(insn)) { + case OPC_RISC_C_FUNC_FLDSP_LQSP: + if (xlen !=3D 128) { /* C.FLDSP (RV32/64) */ + xinsn =3D OPC_RISC_FLD; + xinsn =3D SET_RD(xinsn, GET_C_RD(insn)); + xinsn =3D SET_RS1(xinsn, 2); + xinsn =3D SET_I_IMM(xinsn, GET_C_LDSP_IMM(insn)); + } + break; + case OPC_RISC_C_FUNC_LWSP: /* C.LWSP */ + xinsn =3D OPC_RISC_LW; + xinsn =3D SET_RD(xinsn, GET_C_RD(insn)); + xinsn =3D SET_RS1(xinsn, 2); + xinsn =3D SET_I_IMM(xinsn, GET_C_LWSP_IMM(insn)); + break; + case OPC_RISC_C_FUNC_FLWSP_LDSP: + if (xlen =3D=3D 32) { /* C.FLWSP (RV32) */ + xinsn =3D OPC_RISC_FLW; + xinsn =3D SET_RD(xinsn, GET_C_RD(insn)); + xinsn =3D SET_RS1(xinsn, 2); + xinsn =3D SET_I_IMM(xinsn, GET_C_LWSP_IMM(insn)); + } else { /* C.LDSP (RV64/RV128) */ + xinsn =3D OPC_RISC_LD; + xinsn =3D SET_RD(xinsn, GET_C_RD(insn)); + xinsn =3D SET_RS1(xinsn, 2); + xinsn =3D SET_I_IMM(xinsn, GET_C_LDSP_IMM(insn)); + } + break; + case OPC_RISC_C_FUNC_FSDSP_SQSP: + if (xlen !=3D 128) { /* C.FSDSP (RV32/64) */ + xinsn =3D OPC_RISC_FSD; + xinsn =3D SET_RS2(xinsn, GET_C_RS2(insn)); + xinsn =3D SET_RS1(xinsn, 2); + xinsn =3D SET_S_IMM(xinsn, GET_C_SDSP_IMM(insn)); + } + break; + case OPC_RISC_C_FUNC_SWSP: /* C.SWSP */ + xinsn =3D OPC_RISC_SW; + xinsn =3D SET_RS2(xinsn, GET_C_RS2(insn)); + xinsn =3D SET_RS1(xinsn, 2); + xinsn =3D SET_S_IMM(xinsn, GET_C_SWSP_IMM(insn)); + break; + case 7: + if (xlen =3D=3D 32) { /* C.FSWSP (RV32) */ + xinsn =3D OPC_RISC_FSW; + xinsn =3D SET_RS2(xinsn, GET_C_RS2(insn)); + xinsn =3D SET_RS1(xinsn, 2); + xinsn =3D SET_S_IMM(xinsn, GET_C_SWSP_IMM(insn)); + } else { /* C.SDSP (RV64/RV128) */ + xinsn =3D OPC_RISC_SD; + xinsn =3D SET_RS2(xinsn, GET_C_RS2(insn)); + xinsn =3D SET_RS1(xinsn, 2); + xinsn =3D SET_S_IMM(xinsn, GET_C_SDSP_IMM(insn)); + } + break; + default: + break; + } + break; + default: + break; + } + + /* + * Clear Bit1 of transformed instruction to indicate that + * original insruction was a 16bit instruction + */ + xinsn &=3D ~((target_ulong)0x2); + } else { + /* No need to transform 32bit (or wider) instructions */ + xinsn =3D insn; + } + + return xinsn; +} + /* * Handle Traps * @@ -842,6 +988,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) target_ulong cause =3D cs->exception_index & RISCV_EXCP_INT_MASK; target_ulong deleg =3D async ? env->mideleg : env->medeleg; target_ulong tval =3D 0; + target_ulong tinst =3D 0; target_ulong htval =3D 0; target_ulong mtval2 =3D 0; =20 @@ -849,20 +996,31 @@ void riscv_cpu_do_interrupt(CPUState *cs) /* set tval to badaddr for traps with address information */ switch (cause) { case RISCV_EXCP_INST_GUEST_PAGE_FAULT: - case RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT: - case RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT: force_hs_execp =3D true; /* fallthrough */ case RISCV_EXCP_INST_ADDR_MIS: case RISCV_EXCP_INST_ACCESS_FAULT: + case RISCV_EXCP_INST_PAGE_FAULT: + tval =3D env->badaddr; + break; + case RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT: + case RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT: + force_hs_execp =3D true; + /* fallthrough */ case RISCV_EXCP_LOAD_ADDR_MIS: case RISCV_EXCP_STORE_AMO_ADDR_MIS: case RISCV_EXCP_LOAD_ACCESS_FAULT: case RISCV_EXCP_STORE_AMO_ACCESS_FAULT: - case RISCV_EXCP_INST_PAGE_FAULT: case RISCV_EXCP_LOAD_PAGE_FAULT: case RISCV_EXCP_STORE_PAGE_FAULT: tval =3D env->badaddr; + if (riscv_feature(env, RISCV_FEATURE_TINST)) { +#if defined(TARGET_RISCV32) + tinst =3D riscv_transformed_insn(env, 32, env->trap_insn); +#elif defined(TARGET_RISCV64) + tinst =3D riscv_transformed_insn(env, 64, env->trap_insn); +#endif + } break; case RISCV_EXCP_VIRT_INSTRUCTION_FAULT: case RISCV_EXCP_ILLEGAL_INST: @@ -955,6 +1113,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) env->sepc =3D env->pc; env->sbadaddr =3D tval; env->htval =3D htval; + env->htinst =3D tinst; env->pc =3D (env->stvec >> 2 << 2) + ((async && (env->stvec & 3) =3D=3D 1) ? cause * 4 : 0); riscv_cpu_set_mode(env, PRV_S); @@ -994,6 +1153,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) env->mepc =3D env->pc; env->mbadaddr =3D tval; env->mtval2 =3D mtval2; + env->mtinst =3D tinst; env->pc =3D (env->mtvec >> 2 << 2) + ((async && (env->mtvec & 3) =3D=3D 1) ? cause * 4 : 0); riscv_cpu_set_mode(env, PRV_M); diff --git a/target/riscv/instmap.h b/target/riscv/instmap.h index 40b6d2b64d..f4ee686c78 100644 --- a/target/riscv/instmap.h +++ b/target/riscv/instmap.h @@ -316,6 +316,12 @@ enum { #define GET_RS2(inst) extract32(inst, 20, 5) #define GET_RD(inst) extract32(inst, 7, 5) #define GET_IMM(inst) sextract64(inst, 20, 12) +#define SET_RS1(inst, val) deposit32(inst, 15, 5, val) +#define SET_RS2(inst, val) deposit32(inst, 20, 5, val) +#define SET_RD(inst, val) deposit32(inst, 7, 5, val) +#define SET_I_IMM(inst, val) deposit32(inst, 20, 12, val) +#define SET_S_IMM(inst, val) \ + deposit32(deposit32(inst, 7, 5, val), 25, 7, (val) >> 5) =20 /* RVC decoding macros */ #define GET_C_IMM(inst) (extract32(inst, 2, 5) \ @@ -346,6 +352,8 @@ enum { | (extract32(inst, 5, 1) << 6)) #define GET_C_LD_IMM(inst) ((extract16(inst, 10, 3) << 3) \ | (extract16(inst, 5, 2) << 6)) +#define GET_C_SW_IMM(inst) GET_C_LW_IMM(inst) +#define GET_C_SD_IMM(inst) GET_C_LD_IMM(inst) #define GET_C_J_IMM(inst) ((extract32(inst, 3, 3) << 1) \ | (extract32(inst, 11, 1) << 4) \ | (extract32(inst, 2, 1) << 5) \ @@ -366,4 +374,37 @@ enum { #define GET_C_RS1S(inst) (8 + extract16(inst, 7, 3)) #define GET_C_RS2S(inst) (8 + extract16(inst, 2, 3)) =20 +#define GET_C_FUNC(inst) extract32(inst, 13, 3) +#define GET_C_OP(inst) extract32(inst, 0, 2) + +enum { + /* RVC Quadrants */ + OPC_RISC_C_OP_QUAD0 =3D 0x0, + OPC_RISC_C_OP_QUAD1 =3D 0x1, + OPC_RISC_C_OP_QUAD2 =3D 0x2 +}; + +enum { + /* RVC Quadrant 0 */ + OPC_RISC_C_FUNC_ADDI4SPN =3D 0x0, + OPC_RISC_C_FUNC_FLD_LQ =3D 0x1, + OPC_RISC_C_FUNC_LW =3D 0x2, + OPC_RISC_C_FUNC_FLW_LD =3D 0x3, + OPC_RISC_C_FUNC_FSD_SQ =3D 0x5, + OPC_RISC_C_FUNC_SW =3D 0x6, + OPC_RISC_C_FUNC_FSW_SD =3D 0x7 +}; + +enum { + /* RVC Quadrant 2 */ + OPC_RISC_C_FUNC_SLLI_SLLI64 =3D 0x0, + OPC_RISC_C_FUNC_FLDSP_LQSP =3D 0x1, + OPC_RISC_C_FUNC_LWSP =3D 0x2, + OPC_RISC_C_FUNC_FLWSP_LDSP =3D 0x3, + OPC_RISC_C_FUNC_JR_MV_EBREAK_JALR_ADD =3D 0x4, + OPC_RISC_C_FUNC_FSDSP_SQSP =3D 0x5, + OPC_RISC_C_FUNC_SWSP =3D 0x6, + OPC_RISC_C_FUNC_FSWSP_SDSP =3D 0x7 +}; + #endif --=20 2.25.1