From nobody Wed Apr 24 03:01:42 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