From nobody Wed Nov 5 02:32:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532559961561764.8288228204069; Wed, 25 Jul 2018 16:06:01 -0700 (PDT) Received: from localhost ([::1]:56615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiSr2-0003ix-Bv for importer@patchew.org; Wed, 25 Jul 2018 19:06:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiSpB-0002E0-15 for qemu-devel@nongnu.org; Wed, 25 Jul 2018 19:04:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fiSp8-00048V-1Z for qemu-devel@nongnu.org; Wed, 25 Jul 2018 19:04:05 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:26204) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fiSp7-000476-Jo for qemu-devel@nongnu.org; Wed, 25 Jul 2018 19:04:01 -0400 Received: from mail-bn3nam01lp0180.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([216.32.180.180]) by ob1.hgst.iphmx.com with ESMTP; 26 Jul 2018 07:04:00 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.21; Wed, 25 Jul 2018 23:03:57 +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=1532559842; x=1564095842; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=onlbA9ZeB0kUReKsaHfFziIudf0dkv/Jy9YdPmSjvhA=; b=OA/1vVpaKIQ15rhyhnA9m6enOGJLSMn4V2ghYs9QMVI0WMBe1Qd5HYty 6IvktAuE8CuFgkddUhS80SJI07JHpWdDHjjeKGBLXF67iODJZLKXF+mue DxqbSuAg8j9XLmz2F3HOlP5CrTpWaOPke/2fSbE4SpcWX+bcHyu/ExDfe wl6WZVqPoRL26oowkfubgb9wMY6G0c9OfEwbFclx3d6omLT9UcXcUQqzn aUtzoWy8S32VGt9sibYnRhj4VcI1AMW7SgBhN5GCojp0fuuo6/akzqpVS YPf8lt80Dx2iEh2K5c+K6GsAoXUj+Cakk9MdFb5jdkKWQMGeiOHcL5bfC Q==; X-IronPort-AV: E=Sophos;i="5.51,402,1526313600"; d="scan'208";a="85808006" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Hk87khBzmIUahcF/xCN0qPS4V8ysPEQdbqUjKAX7hVQ=; b=LIOHqMS4e+QZHFl+efWAkb0zJCwQgu6FmTtJHRjAWJAi0EZXUpS/liFToFa9J9N6qS0CR4taPq08GCvBsSOyC9YJar5s8Y9ggBazemqgFMP5DSbWP7OT+5+5LEH8h63/WtByiiJy5Ncip9GVOSdStsWhYpaAaCITwf5Bql1uB20= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Wed, 25 Jul 2018 16:03:48 -0700 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: BYAPR02CA0042.namprd02.prod.outlook.com (2603:10b6:a03:54::19) To MWHPR04MB0401.namprd04.prod.outlook.com (2603:10b6:300:70::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 480efaa6-bff8-4afc-387c-08d5f282e6e4 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600073)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0401; X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 3:HUPtorfzzJ11TTPxXf6s5eM9xGtEXvjuup0PgONHYrXu8gFUYHcelAYu1ao/+QHFK1J3Ukvp7uRPgwIn7SQxOlm7CpoxIP8I9I3JNXawOuVQJqqek/VtgugOQXKhApUafBvoxyf0QTjO3GjKJQjx1crwC04WEU7YgdjkzSc2nEP0YpBlW7BqsdcUOfkbKxlAcwlverHCJhmT0V9sbcSRvncgjEqY59p1tCG5xpnwQFkCXaOY1/8AoiPmKTvu/GpB; 25:o+sEyP7Q1gb/iPILOI8CJBYkDupItSGsBTz5F+qAOMuUPlP3O9UkoponXhwJCwqWzq+QnK8JrkvAB4TX3/azMZf4hNGAqhXMPfWEipsWqOlx0xBxptrvdxsG2mma59cECAS1Bxun40n5NuL07/hXzxRVsFmBOz89R1L+0mCq5a6DP4AzSGqArHCjHR+/RYo4bRVC607D6fP+rs34DKnFUlPvFYqWlisGBVgeZWVGOfaqtXoD/RPgd26Re7B5NtfvEJjwvqzQlQUGLF1H1+/4dli4GTsvkpYVa/kpGSdIV6++lGt24cFEIVbJyGBm4ibUMHj6clwzleTPhrr1Ivkuiw==; 31:cZdvPHRHmi/6DYOzCDFbjhkH/BXxhEqVioaK0bxTJhaqVAooGyQ5zgMSCYbvqk0R+Uu99nNY2sqp3PnQ2jLHaUGw7g4YOUsGtY9LxMVoZv/ERdsMkaS4KWtL5H69yBhc0fSeewBq2Rl6GJVwZCpOrrKkSO1WeEugRuy+IrkZoRyw5BSoYQpK2G470fBGdIbitQe7FAzR08qIzkdwQKJyRki8AdBQFDOGLC9eV+PRTXE= X-MS-TrafficTypeDiagnostic: MWHPR04MB0401: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 20:DpGuUNqym2itOdgwZlJIkO2XxFCp7NQdVHqhRyN2V6hirrhC2/Gbyo7iPNgVsbE4UUTc1ErQ8p/i9i8y9ajVLTwpe2egqVDHgbzLunsisNWYDIVKTIsmpZHzv8duBpxGBqYvH6D4i3XWYreE/8bxIYlTxqZ87NNeauXyrO+mDAYoxJk6iGLebJZlp+f+srMbPzOI6N/QZaKobOAQ13Bmhz1x5qH7HEgkE3oN8S8wI5S8tX1F7ifriPjb2b0uuFPwZL3vvdmSPORYk8bm1leHPwGfPY290/cR2LLfxHB4qoq6cSdVfadYoWxScIRDpYELwzLaQDf+5BNYJhEVnYRIkzAmbzqxcExrhbIJvsdWuPfG3oPiTa3zHh8VO2/8ZH9bicivbwDpNSPgnty+WuGduQGEGdX86jLqkA1dwSSMSejjFTxd4m7kuB6P+RnMI8yyajifPM1FvNwX155ViLR2aH4x2unfpTd6bsMbFVLouE0I961RAmoJbRuY57BLYO1J; 4:4w1ebk5krzo0oLsVIQvOnpJRdWz8HDrdvDzpbS/1eYXRouZW8d4dUhpfmn0Dj+w/034ng1vj+uL+Lz2zcApf1zMNfeFiqpfVx0bbJ7LxiU2L3+RX7kP23aMCfSFNF/sCBHEAgctVUAT3+iehH8kKigvIBuTSlorKrLsYtnFWtLcEG9qsdVDLoOl39yuQNW3ZRygSYmy0MZ0u9VMpZRLlAOhjDZJDN6xbWNvu+EpKJ/GVXk8TIH+UL1M17RR2PNRduP8fZ54pPhy0vUuxOKbdqQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:MWHPR04MB0401; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0401; X-Forefront-PRVS: 0744CFB5E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39860400002)(366004)(136003)(376002)(396003)(346002)(189003)(199004)(81166006)(6486002)(39060400002)(305945005)(68736007)(6512007)(53936002)(50466002)(50226002)(7736002)(16586007)(316002)(48376002)(44832011)(105586002)(106356001)(86362001)(6506007)(66066001)(11346002)(2906002)(25786009)(47776003)(446003)(16526019)(5660300001)(8936002)(36756003)(118296001)(97736004)(3846002)(476003)(2616005)(6116002)(486006)(956004)(6666003)(52116002)(51416003)(8676002)(72206003)(186003)(14444005)(76176011)(386003)(81156014)(478600001)(26005)(4326008); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0401; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR04MB0401; 23:hGnazwRaa/qQndR15Ttcp0MQet9BWrQYGnDzKagTI?= =?us-ascii?Q?mYl/WpPs4w4qZWX3ZSbPBS1qJNSOh3RAtsoSjNRVPuugs5dN2IYO/iql35RA?= =?us-ascii?Q?WV9EGDm8OcqaUPnxUj2Rgroci6UMLcpY1/B5lnoiW/XjioBHWotuC95t/TrV?= =?us-ascii?Q?UjskLO+Mlbub8KfKpN1GOmj3Wi1HN8iq9gi5QRODS7Dgx/yZ4A5+PSWURXZh?= =?us-ascii?Q?DREoDkfO4/7s5YKnTi38Hx+vOnn1Vf6QBm2QtBwACikWneNlbY641akew+Ha?= =?us-ascii?Q?5zgZFf5GFv62eLb+7J5riH6o/3dqciJohpwUS93Px+GqzosSD2RQ0dOKtwKw?= =?us-ascii?Q?8L0G64uwTb0FbE7xMjFimZNxXPOt22/1lhfoAIb6ns/SCVg2xvk0v1vVnSpp?= =?us-ascii?Q?dzYunwSMz2ClnLksMJBT+r7exS5IePfNth81OI85ybs21EhWkyiABarxUda6?= =?us-ascii?Q?3VeWEY/+Wh7BRyWxtSPQ+6cxMZsCSTTnL5jNGTZpd8ljanf5PXTTa5JKTEw6?= =?us-ascii?Q?2SAqUh0BwCMA+nm3qq17hq5e4Cvh78YpsMmbk6LUL6cIOc9A4WnqhXDOhAoM?= =?us-ascii?Q?9zL9taKJbGduaPd7CvxO3A665774vk3jnVKle1NSpB2+A+qElTlGCUmW+Bkq?= =?us-ascii?Q?b/Eqt1cCNq7Xdd04GFGQtU+mfo2HMnu5SSuN2D4eOs8VPPQUx8bpxFIEFURb?= =?us-ascii?Q?wJLpXs6a9gNBKoAWeBNPnig4F7tnRJZwiMb6RSElLWPF4mj8F2Cuno6/C1rM?= =?us-ascii?Q?uByCuN4H9vXvWWLkAAizu8H90FH1dut/0/guNBMpi33lNZrSoIFpDC/ZzMRe?= =?us-ascii?Q?DuiD9n2Fmg7nXGmyqJxZ/RPRVoKOkDwlsWEzZy9/YEMOdeAFJfrXO5mAHnKL?= =?us-ascii?Q?YvON6c4DHqaLC8OuNjxcNZN9AzVnfrvGmjszm2q+Yjwmnt7CA/Gf9+vDh61Q?= =?us-ascii?Q?URbbmqWbXBP7fZddBXnPcc3Rfw4OGVgMwOlJigKALXmfl2whQ0VlXp9DsZnH?= =?us-ascii?Q?qvA/z59Q8034YdXEraDmAiUu9C4/8iZvRYyk5T3u5BwWsrKuHuvJHzftFpWE?= =?us-ascii?Q?SAL1bIto9BAZPNl0ybXA8eIgKH4tQ9oP5UGNLVrduQZ9ZB4aFlOz2uUXye5O?= =?us-ascii?Q?L3ayyttNrhH0IPEkImYyJ/MEMuBN0qTcahhO8lbgzA6tz3VrsmtGs2/+QJPS?= =?us-ascii?Q?DGOjxJQRkfVz2mVmz1f326CCjemu5cfE6kXkFgJ4X2QnyNajNyD3sHv6VqVc?= =?us-ascii?Q?w0nZX/DoXXH/X3e9Zo=3D?= X-Microsoft-Antispam-Message-Info: /XaOPkDQd90/Qu0fk3/zr9RNosZQySpgxD8lLOIWoNywDe2XA0biZU3orpYASA7ZV7FPznORT18/9VkJmPEcmwvxY++zaSm4nnv5pmxxGS590r7sLEFaqQ3ddGXhZirDEdqo4lSDOSMM+VfS09jpSKNGkAgUwnsy1IpW6I9j08GZg+VYsOV9Iei5YB/eH97voUdz70PnR+ySDYArehoPbZ7m84XqcAKp8R3ciieAQOyZycXJErreUdBqNX9YetW1qhqJKOrOb0aoOwfIUSuuW7jxLhWi55d5vPtzxtNmWXfTKrRv3hpuRSxmkKazgJAJyIymv3TmO2IzCVSPRlRxfgrLBDSgwSeAjdPRPqvn6us= X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 6:0zz7cIFK33k6qVSNcmNCffnnkQUxaoGUK5fv3nQRIn8ZbjnS2LsjLQq3oRc1HA4ah9J54T+U55NauG2jFJOS04r4tv1R5kLPq+k+tFM3Td92VeDZIRXNpp8Wgu4eAf/tY1mo3syqc1mOmIpsaYSEjm4dzKGvt/Wbhns6wQc0xxQVsvUBPQJF/zBjJb0LidlbgQA+a+eEH5QUnNsPgwij0IyWx7RxvWcXV5lBDBGNIlP+TWXxRcEnCCZ+/pn5fFc4YZFY4PIBDeg/CIM9XaJ1ORqVOgrakPf7F56zZE8Km6c2uHSKnyuecLkxnP1YwTSdi/NwGxEbLgOrI7K0SohN8Kg9EpJKJTpsr6awyBC08dZPcm297lV/NlauZ8ut/XBIY3tyaXotW8Ykz8/vi5hIEphs3FV8W6H72RfjTbH3mxM/HKUTqs2FtRUD5Z9xfpMqwz1p4mVpoIXR/XKNOxpsRA==; 5:NU/2uonXE5C7qwAQF2TWYLluBMuCJZyhFbdzV8vDyjs067w/bct4DzVUnr8LX33QswMJGPZmcn7cO3rODDIHRVtZcmzIbp8Vtk4PYOgDTZgOh6IrBmSG1kTZcjpLwN6NBq4Os70K74Z+c6sgZhuN81AwSdfS6KZofL0Lo4kgisw=; 7:q09QjwfIDbhV5TBt/oH0Yl0ALzPjyWdrYSRraicq5V4JhTC1CQCNJSF13Rsxy5S16kComDyV1Sb/wsVIwKWusXKmN162uciKmgNiK6lntBJKyR0ztduFo2bspNXpqmKuQ4mVQwu0uKqkgELU+OTiwo6Ss3l4PStKF7MfKczrdlPlegIfQ5Sa3RWdM0ziJukB+v0EKUZkc7USDiuSp6Vcdm9QOqVIBWfIf6R8O8w3CVVkQaVNrCqLLWwgrA9FF3Bz SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0401; 20:U/oqWcxa4wRUwXhnjwq3XVsneYv6kJycrZtzprgw3J1LpZ9wpfydBW1MacBSi7MJp6FyoEC+5UzAtzG5Le+mcv5U+oI7krroDRuZ+dI69Bs+RzZIEQVGcU02OM2cfVi2n9CMSyYb2+dl/lCHli2vTUg8YReod3xzz04CQfAKRcg= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2018 23:03:57.4558 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 480efaa6-bff8-4afc-387c-08d5f282e6e4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0401 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PATCH v1 1/4] target/riscv: Rename mbadaddr and sbadaddr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update to the latest spec (v1.10.0) and rename mbadaddr and sbadaddr to mtval and stval. Signed-off-by: Alistair Francis --- target/riscv/cpu.h | 3 +-- target/riscv/cpu_bits.h | 4 ++-- target/riscv/helper.c | 8 ++++---- target/riscv/op_helper.c | 16 ++++++++-------- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 34abc383e3..0243f73129 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -138,8 +138,6 @@ struct CPURISCVState { =20 target_ulong sptbr; /* until: priv-1.9.1 */ target_ulong satp; /* since: priv-1.10.0 */ - target_ulong sbadaddr; - target_ulong mbadaddr; target_ulong medeleg; =20 target_ulong stvec; @@ -150,6 +148,7 @@ struct CPURISCVState { target_ulong mepc; target_ulong mcause; target_ulong mtval; /* since: priv-1.10.0 */ + target_ulong stval; /* since: priv-1.10.0 */ =20 target_ulong scounteren; target_ulong mcounteren; diff --git a/target/riscv/cpu_bits.h b/target/riscv/cpu_bits.h index 64aa097181..135202c359 100644 --- a/target/riscv/cpu_bits.h +++ b/target/riscv/cpu_bits.h @@ -68,7 +68,7 @@ #define CSR_SSCRATCH 0x140 #define CSR_SEPC 0x141 #define CSR_SCAUSE 0x142 -#define CSR_SBADADDR 0x143 +#define CSR_STVAL 0x143 #define CSR_SIP 0x144 #define CSR_SPTBR 0x180 #define CSR_SATP 0x180 @@ -82,7 +82,7 @@ #define CSR_MSCRATCH 0x340 #define CSR_MEPC 0x341 #define CSR_MCAUSE 0x342 -#define CSR_MBADADDR 0x343 +#define CSR_MTVAL 0x343 #define CSR_MIP 0x344 #define CSR_PMPCFG0 0x3a0 #define CSR_PMPCFG1 0x3a1 diff --git a/target/riscv/helper.c b/target/riscv/helper.c index 29e1a603dc..b4a3f80872 100644 --- a/target/riscv/helper.c +++ b/target/riscv/helper.c @@ -465,11 +465,11 @@ void riscv_cpu_do_interrupt(CPUState *cs) qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld ": badaddr 0x" TARGET_FMT_lx, env->mhartid, env->badad= dr); } - env->sbadaddr =3D env->badaddr; + env->stval =3D env->badaddr; } else { /* otherwise we must clear sbadaddr/stval * todo: support populating stval on illegal instructions */ - env->sbadaddr =3D 0; + env->stval =3D 0; } =20 target_ulong s =3D env->mstatus; @@ -490,11 +490,11 @@ void riscv_cpu_do_interrupt(CPUState *cs) qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld ": badaddr 0x" TARGET_FMT_lx, env->mhartid, env->badad= dr); } - env->mbadaddr =3D env->badaddr; + env->mtval =3D env->badaddr; } else { /* otherwise we must clear mbadaddr/mtval * todo: support populating mtval on illegal instructions */ - env->mbadaddr =3D 0; + env->mtval =3D 0; } =20 target_ulong s =3D env->mstatus; diff --git a/target/riscv/op_helper.c b/target/riscv/op_helper.c index aec7558e1b..d2ec078765 100644 --- a/target/riscv/op_helper.c +++ b/target/riscv/op_helper.c @@ -310,8 +310,8 @@ void csr_write_helper(CPURISCVState *env, target_ulong = val_to_write, case CSR_SCAUSE: env->scause =3D val_to_write; break; - case CSR_SBADADDR: - env->sbadaddr =3D val_to_write; + case CSR_STVAL: + env->stval =3D val_to_write; break; case CSR_MEPC: env->mepc =3D val_to_write; @@ -338,8 +338,8 @@ void csr_write_helper(CPURISCVState *env, target_ulong = val_to_write, case CSR_MCAUSE: env->mcause =3D val_to_write; break; - case CSR_MBADADDR: - env->mbadaddr =3D val_to_write; + case CSR_MTVAL: + env->mtval =3D val_to_write; break; case CSR_MISA: /* misa is WARL so unsupported writes are ignored */ @@ -515,8 +515,8 @@ target_ulong csr_read_helper(CPURISCVState *env, target= _ulong csrno) return env->mie & env->mideleg; case CSR_SEPC: return env->sepc; - case CSR_SBADADDR: - return env->sbadaddr; + case CSR_STVAL: + return env->stval; case CSR_STVEC: return env->stvec; case CSR_SCOUNTEREN: @@ -554,8 +554,8 @@ target_ulong csr_read_helper(CPURISCVState *env, target= _ulong csrno) return env->mscratch; case CSR_MCAUSE: return env->mcause; - case CSR_MBADADDR: - return env->mbadaddr; + case CSR_MTVAL: + return env->mtval; case CSR_MISA: return env->misa; case CSR_MARCHID: --=20 2.17.1 From nobody Wed Nov 5 02:32:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532559981215895.8678420529849; Wed, 25 Jul 2018 16:06:21 -0700 (PDT) Received: from localhost ([::1]:56616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiSrG-0003w7-Ua for importer@patchew.org; Wed, 25 Jul 2018 19:06:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiSpM-0002KX-Ma for qemu-devel@nongnu.org; Wed, 25 Jul 2018 19:04:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fiSpJ-0004V0-Mw for qemu-devel@nongnu.org; Wed, 25 Jul 2018 19:04:16 -0400 Received: from esa5.hgst.iphmx.com ([216.71.153.144]:11468) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fiSpJ-0004TS-8r for qemu-devel@nongnu.org; Wed, 25 Jul 2018 19:04:13 -0400 Received: from mail-sn1nam01lp0116.outbound.protection.outlook.com (HELO NAM01-SN1-obe.outbound.protection.outlook.com) ([207.46.163.116]) by ob1.hgst.iphmx.com with ESMTP; 26 Jul 2018 07:04:12 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.16; Wed, 25 Jul 2018 23:04:09 +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=1532559854; x=1564095854; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=dh0KBTpzjaRw14T0uZd+bwzLd4fEH2A/JuRp7aUEqCo=; b=iXxf29yDJwAnRyEwVcI9UzODmF9YW2tbppT4yIzsFzf1e1SQxFMIZhDE hl1hYkK6141wIU1Bovf6mdV7f0BYeyJyNfAJvIeA4zUx+yc+SPSKW5Dn5 zxLjhK607uJ+EXAvypXca/F/kF9xCZv4/Fp50S2ZJTyVAq39wrdA6S6qB qrZc2r5NpkiS4MCm3xBsXYFRyzg4srrdCATzSCbhU6aE0iD1/5Eka83bU zyQIFLomRigHMVIn2jHEkcsUR+v9r86IvMvSKPfXdTfHd0eh8X8qpPUya ud3p/CMP2DoQ11RqH0jmCsPMMEtu852VWWp5JQZ0U+KvZ7+3c9akdf7jb Q==; X-IronPort-AV: E=Sophos;i="5.51,402,1526313600"; d="scan'208";a="85808025" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8PzHPdZurnei9oNy90nE+1ZUA3cg5XIUnXQh/JyZtgU=; b=azMQntCSZntDBx6ZPYFwLLTLRr65E+S8Kt+tjxVisSpS99bwBYPDAuRHOwn6LNF0z3vkztHbl0cUPGG1+3NMsY7yKrImxwfPU6+esc4WKmUbP4LLVldQeCBral8oSPYerChpYBkoqFBPiMgXQxjW6b3tut+A9WSAAoAjpOwJlyI= From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Wed, 25 Jul 2018 16:04:00 -0700 Message-Id: <1df1097f91c1d8e1817200ac1feefb5407ccb842.1532559484.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR04CA0002.namprd04.prod.outlook.com (2603:10b6:102:1::12) To BN6PR04MB0386.namprd04.prod.outlook.com (2603:10b6:404:91::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 128dc4c9-edf5-4f23-d02e-08d5f282ee5f X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600073)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:BN6PR04MB0386; X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 3:rOhswfCAziN/UkDeC+1ujEFNKpw7lG9yJnMrDpDV+JcCfWKwPd7TmY7SBqnlFy2UlNlutf4vrJsz2sP52wfZuMlS38LrTF/ZlQXj/6+AK411r4C7IgGHbX0asDSFb3OTacDpG/fpnzCKLxjncPOmdXQ4HPuvefu9COPLd7BagulLxtMlZvU3BlEJ33HjwmmN2o1zRcN1lde3jbm1NME+2U0Q3Mbyyt1o6n1DWbx/kWjKEcXYciAOLRfAl4eSvzN4; 25:3Bm2pdgjRXMX9XtC8O9ecsT+C1x3zUCG0faxkIZK2NlwZDzbyqTVy11EzBPb5p/mYF1ncNDUM6HAthWfV6eVj0D3bnWdVweG3kj7xygsW+xJvUFDza3AFU2cJ53typFp5wpsnGOwJMsgFkyi++OtXfjRLSOh2eTLa8dl6eTGbWDCmW1WpYFlhaUatZ4UJYvvuM4HOU+Cmc0Q1L3MXuh14JipemVY+zZu3e2vbSDWJOuOxspgqT3jsBxlzPOx4as6k6LL1DSrD5VwLQsDqoEyImstFLptVpkYxFKEl7OcAHZYDEM1lqV6ftphAfczuUXZ9PACFQP+POljNkc2ogkczA==; 31:AzMtxJjjXhVesQGcp/z33X4XYZvoSkMUJxQDhaHR7wIdzkL+B+rwzirQ4RUQg6hPGN9npEIyp/+g3/7BswwRcl4ELJCEH1bR2uGq8BUHrKNclqja1BN+Po3eVX/0e4OFVMLSxqEifNM2eYGfeYyao7+yeHOLL0pzHWCiNk5MjX8T2F98vIWx112Y+O/qIdXgkn3kfTDc8JausqzGe7ItF4LTR+AlQvUNCD3rkq3webE= X-MS-TrafficTypeDiagnostic: BN6PR04MB0386: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:SkNsRTt6kHgjqegP49HAylAwP7GSiNhLhFhdFliNlHCQQDCx6ToyIvk2B/OLpIkQvZDA/MBtmsqqop4w+5a7CpaHZUTu0H7NOOGQszLiM7+z8WgyKpfbgCt9D9/0xYLoBMg5H6aH4B52d9hByaMoL2GyuHLELUH4YRhfN86cwLly5Za4bQT8bWnoMe/oehX2VgPysoVN4p2ysixhnYJq/7f2V5T1ojAqzukaO8gUI12P66Qa2I5/WaILP/a5LUVM16TVXfJV0ncQ02KgsOgs+vErXVbzVJsqNqRkdS7qfFd6V6KBIH2FTPyHiD+pf+p3OaQOs1v4LV3KTa+LOCiEZo3cZDGxiaZUzCVSiiDTr6FFok8qRKoW86NiQjcJtG/iuVfRE+GEqdkJRLW368z+LepcVOHVCei/3MEx4CKrKSdqr85CccPUjyyADjTyUrqGQfj1NHSx2N2ZJukhlwHJMBOUhQRzAxI9ydr3NZqLLssxkdiOhyktg1fzNTxR7jyv; 4:DsAmf0SDJSIjAsRSOHjl8Oc1j5vjw/L3JGqhHOl+wGgPYDRmQ1CRCmKCGLfJ/FUiuTQeZkmvvmsSN5iQyZ9NB/gTcRb61oyKMqVN227YiIMpWTIr+dWfNq12v4ESF4aw0szdEY96qDnxNnhq2S7n0niWFSiMa1zYEHYH74FQc+EDSrgg0G4uiAJBZ+ml3vlrFV4+kXok9vsmLSlMDM/c1zgqXukmoTvWcl+EgR/5qSCsOKwzOyHV9fC76LIhxi8bkKMiKUOjN4fFDkgICwgbSQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:BN6PR04MB0386; BCL:0; PCL:0; RULEID:; SRVR:BN6PR04MB0386; X-Forefront-PRVS: 0744CFB5E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39860400002)(366004)(346002)(376002)(396003)(199004)(189003)(106356001)(5660300001)(47776003)(6486002)(105586002)(16586007)(316002)(50226002)(66066001)(6666003)(86362001)(50466002)(48376002)(36756003)(478600001)(25786009)(11346002)(6512007)(68736007)(72206003)(446003)(4326008)(52116002)(7736002)(2906002)(44832011)(956004)(476003)(118296001)(2616005)(305945005)(53936002)(81166006)(81156014)(39060400002)(6506007)(486006)(76176011)(186003)(8936002)(16526019)(51416003)(386003)(6116002)(3846002)(8676002)(97736004)(26005); DIR:OUT; SFP:1102; SCL:1; SRVR:BN6PR04MB0386; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR04MB0386; 23:v+iU4j4eXF0V4YS7I9ZDerTZTTKY0U1cCIgKhplPu?= =?us-ascii?Q?R6YV3fGwhbYpKkVqPUh22lXUoghMsf3gjD+VAwPAom/vFktptZHFLhs6rury?= =?us-ascii?Q?29Zwb8AjQjHMB35i9o6N2mGXLO72o5bHoTp9hYytEvvoPZJuoO/ryOOEjLQl?= =?us-ascii?Q?DZQlNoxSTRcpzyxtQFzwIpCD7Mf6Vs9iphPbC4zQm7z3tXMCx7jcaOLmngLW?= =?us-ascii?Q?IE1l0pyuNYh/+mGClDbXiXCau+w1JfGX7a1jrMOQG4W6OhiPQZGbDwdcfJuB?= =?us-ascii?Q?YqEsXrK5GBErTWZZ+ba/Ig18YQZr8aU3UXS9ptXq6cr4pc641qql2Sert3wu?= =?us-ascii?Q?XT4WiHytITE2lhPhK8uhPIMkIWmH3VqCMiFLkZzKi7NAXT1u9fiyKdTM4T3n?= =?us-ascii?Q?J4+4v54BJpzA8Zp1l5xlb3O/6e7+CJ0dKlfdqOIQaDGb6zpJFx0ZXywlYr7a?= =?us-ascii?Q?6U5gp7VL4Undl2WoZN3t08vUY9a/XcNt1p01KWqOAJ+WnItkX/ZHZyTTEIt7?= =?us-ascii?Q?Tf30yuCpEt3Kd+qAyDzIRDaKZUO/4fG+9M1OCKOvBy+t0ykcuvSNYpVMVErY?= =?us-ascii?Q?NIbyEEAnM100DfVJM+jvomEwbqFGmxGRDpX0yRkM5tEHue0B9Cuil+GXChs+?= =?us-ascii?Q?o5gnDwPsxlAdVp55aZ2a8aoiHjQeX4LeI6uY2znDboFjhoIKyarQejuk2wgK?= =?us-ascii?Q?vFmcHHlCq0E1haSAaEZb75VIWg/2BYOzkn9sCkzMekzys3OvJzN2dfSh/PrU?= =?us-ascii?Q?0Eaifyb7i8VQ//blT+mG44TyAgUW6+UJsIZXjafb0AjvZrpNl+kfJNxsCV7G?= =?us-ascii?Q?a6qqBCybp7OxuHENZ4KJ+At+v2hyiwRi8jIgBKVkfNmBtb1t1zOI+1WIJKbv?= =?us-ascii?Q?Kw7N9El4DZ9EzGqpNGoVmPL/Wq7VdxtHo6P3U/fURkZ9skbhNSukzJbcIEFp?= =?us-ascii?Q?FoynvA5eleRsQ2R6/7dfV7YIyMJ1KYzCJX1HwACrBvcY74thbJAhJGeWr1F1?= =?us-ascii?Q?uUHVkSm8i/jEcE+l36xSbzV1jQIL8xZZdjuYFYkzBmg9driAEPYOKQKSLcuQ?= =?us-ascii?Q?HKFNjyQaUExLz6dvTmRM0fZN1BM7Z1ibhHrKNrv38aBV+YEGRt2dxPWNSjwg?= =?us-ascii?Q?lQf8YYvUTSu/XgQPIMBpfTFkBf9O2y6YUswAPh/ijLYDEzttBaA0E2Oy4CQz?= =?us-ascii?Q?x++3+dJBLuz/EiGrkz93kRF3EsskbzYhpovGDSnquig0x/GP8kRET1ysHKmu?= =?us-ascii?Q?MmlGfTTpeF0ZAnwVWc=3D?= X-Microsoft-Antispam-Message-Info: LN77Q9H4+KgAPYYw5wTnvKye+uHlerfAFcHwYv0z0uppa/s1z9ej6gXDuzcCG7KvkauMAL2eQAcqS5zm3qGazKnzw4W9EiE4BpGX+VLtvw7nV+jQlcKK5UwFyZK35sScyyBhXj+JfV25ED7Q0hhVHe8OJ19a4qcvv1VzYx4aywAPZkfYuiYQwCKwa+h74iVA2VUE+ahpWHkPEh8nHsgL9ezvo8PDvnbjzL42+tyTv5X2ZDArWZV70M5MsRJURA4VMqZ131NvnBJZw1jSMRfLpx5iZEMDv42bqzCKKSCS2aXlC1DagineqSX+M0HszpdMUY5T43VZKcPrn6wWmOw8UdThzblbFVlRjjcOzGVurj0= X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 6:4Lki7b7ON8Etj8VgnluTOhR+xgBEICQtgY+pNzLAsyQxd9IMEOjiK8N0VGRff9a1FDSXET9/4V/0qRmWiJ/+LmttXD7AEQ09kXQk8CYyFextTvvzDrO3SMRaKx15Qij5xsamGCw8WLzSeTg03bEan48n7BbMN8IUbxRWC77c8Q66HCTUzRwTngIJyKQ/4I3+ll2cT2eSQD6W4ky/bnOxDmc++ulnJKVFIdSisx129PYAxcWvYIEIBHQSVrm0bF45L/ARm7cMhvcjZOQR0689NegmDhI+OApvG+vux/LfAe56AiZDaMDAie0boGXSRP7wzgKTf2abny0HWSAHy9snpWGP2AJBcYIFPL7l8Y0Us+60wtro6BGJe3dQ4trVyeLzq05Y/Ls+k0SY86Vkk4ETktRHrJxaAy5iwdE2aNLNfuPuO52ylrfaEV2E3s98jIadNWuft/F1Spo5iZb9QcV2YQ==; 5:O+4rqaca+2Y6eBriJEBC3fAAGbiqyaArYYVQyJT8yAn74Kbqs1iG6ZwMOKYwC0N+Zzpcp5IGNaf8FvWSH1FafQEBwVKNIFy2ZbxXn0pwlPN3wKVzZHLNIm2+wa5TMrK74gNtqZjlJYAWfgrLGtV8R5BTe+n9TxDd+R1bemphv40=; 7:wJo9Zi+pAeoTJ9RVJQT98vsPHdSUo+pX6faOx68+I+ZdpJEZCGPwSnWwkcMUQ1rx5PfXvTj/Dg6NiSZfXpMeZy/cQyQGnCDh1iMrLi5XHSGsKHVdEDFAZx0XfUOt9MVBhp6HKp9D9BW7ShKOfqzc1fHGFjUwLO74n6MShXAGPzhy32ZlIXcSjqnYhChs31notXPwmViYPsyB8SXRy/21+ZBSRmX+Wpx9bgVtemc/j4xfYgFD3Ov+IGnOagWXjlQK SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR04MB0386; 20:q6G5y45l8KRcZKOgUK26o0hj2G1DKLiMBykaigG2JbUU8ALbfl9H7zt4Svn6K0YfUSYNcHb4/oBYM64tTfdChvxXmFVIOYGwOttV3rO4CAn8HzMBF42qi/qi3HJqj+PKdhYVBvAL4bKK8jSaqVsR2gc83WgcRzxuJqjP8/kjOrk= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2018 23:04:09.5938 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 128dc4c9-edf5-4f23-d02e-08d5f282ee5f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR04MB0386 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.153.144 Subject: [Qemu-devel] [PATCH v1 2/4] target/riscv: Implement the mtval illegal instruction X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The mtval register can optionally contain the faulting instruction on an illegal instruction exception. This patch adds support for setting the mtval register based on the CPU feature. Signed-off-by: Alistair Francis --- target/riscv/cpu.h | 4 +++- target/riscv/helper.c | 13 +++++++++++-- target/riscv/translate.c | 12 ++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 0243f73129..1bc46aa952 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -85,7 +85,8 @@ is currently no bit in misa to indicate whether an MMU exists or not so a cpu features bitfield is required */ enum { - RISCV_FEATURE_MMU + RISCV_FEATURE_MMU, + RISCV_FEATURE_MTVAL_INST }; =20 #define USER_VERSION_2_02_0 0x00020200 @@ -113,6 +114,7 @@ struct CPURISCVState { target_ulong frm; =20 target_ulong badaddr; + target_ulong bins; =20 target_ulong user_ver; target_ulong priv_ver; diff --git a/target/riscv/helper.c b/target/riscv/helper.c index b4a3f80872..bd78bcff28 100644 --- a/target/riscv/helper.c +++ b/target/riscv/helper.c @@ -491,9 +491,18 @@ void riscv_cpu_do_interrupt(CPUState *cs) ": badaddr 0x" TARGET_FMT_lx, env->mhartid, env->badad= dr); } env->mtval =3D env->badaddr; + } else if (cs->exception_index & RISCV_EXCP_ILLEGAL_INST) { + if (riscv_feature(env, RISCV_FEATURE_MTVAL_INST)) { + /* The mtval register can optionally also be used to + * return the faulting instruction bits on an illegal + * instruction exception. + */ + env->mtval =3D env->bins; + } else { + env->mtval =3D 0; + } } else { - /* otherwise we must clear mbadaddr/mtval - * todo: support populating mtval on illegal instructions */ + /* Otherwise we must clear mbadaddr/mtval */ env->mtval =3D 0; } =20 diff --git a/target/riscv/translate.c b/target/riscv/translate.c index 0b6be74f2d..1fe8b9c982 100644 --- a/target/riscv/translate.c +++ b/target/riscv/translate.c @@ -102,6 +102,15 @@ static void gen_exception_debug(void) =20 static void gen_exception_illegal(DisasContext *ctx) { +#if defined(TARGET_RISCV64) + TCGv_i64 helper_tmp =3D tcg_const_i64(ctx->opcode); + tcg_gen_st_tl(helper_tmp, cpu_env, offsetof(CPURISCVState, bins)); + tcg_temp_free_i64(helper_tmp); +#else + TCGv_i32 helper_tmp =3D tcg_const_i32(ctx->opcode); + tcg_gen_st_tl(helper_tmp, cpu_env, offsetof(CPURISCVState, bins)); + tcg_temp_free_i32(helper_tmp); +#endif generate_exception(ctx, RISCV_EXCP_ILLEGAL_INST); } =20 @@ -1287,6 +1296,9 @@ static void gen_system(CPURISCVState *env, DisasConte= xt *ctx, uint32_t opc, tcg_gen_movi_tl(rs1_pass, rs1); tcg_gen_movi_tl(csr_store, csr); /* copy into temp reg to feed to help= er */ =20 + /* Store the opcode code incase we need it for mtval/stval. */ + env->bins =3D ctx->opcode; + #ifndef CONFIG_USER_ONLY /* Extract funct7 value and check whether it matches SFENCE.VMA */ if ((opc =3D=3D OPC_RISC_ECALL) && ((csr >> 5) =3D=3D 9)) { --=20 2.17.1 From nobody Wed Nov 5 02:32:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532560084026711.5546492043877; Wed, 25 Jul 2018 16:08:04 -0700 (PDT) Received: from localhost ([::1]:56626 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiSt0-0005Gb-Rg for importer@patchew.org; Wed, 25 Jul 2018 19:08:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiSpZ-0002TX-Um for qemu-devel@nongnu.org; Wed, 25 Jul 2018 19:04:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fiSpW-0004cL-V4 for qemu-devel@nongnu.org; Wed, 25 Jul 2018 19:04:29 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:37281) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fiSpW-0004bv-Hg for qemu-devel@nongnu.org; Wed, 25 Jul 2018 19:04:26 -0400 Received: from mail-bl2nam02lp0084.outbound.protection.outlook.com (HELO NAM02-BL2-obe.outbound.protection.outlook.com) ([207.46.163.84]) by ob1.hgst.iphmx.com with ESMTP; 26 Jul 2018 07:04:24 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by MWHPR04MB0399.namprd04.prod.outlook.com (2603:10b6:300:70::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.20; Wed, 25 Jul 2018 23:04:22 +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=1532559866; x=1564095866; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=hUU12yogHH0Qm59D7Fkndm01FIpqbuByQ29kMNsQ8t4=; b=ZRt9QIn2J4+xpFq/GgyuVbNLY8SnlGhDiyIiWVszBBYoPsok0qJFH6ma KFsU51dSB4R5AizqAcEj+zCtieknnYDEdjUKxK6/9nfLA915zp4pocE+s tYOdagMIHsbJFn9eOg9GbivzrV2Ef6nAsG4JtwhBDAnNgp0kRn8CMvKmL SQbcrWgTRFyug9+3I/Lvw6xJLevLwWmlc/Q2PTisUQzJ+Z83ET6fHcn9q K3h80Ml5WnNCRQPOUrjqsAVi1klwLalDpPugilHCnCiYC4C1QiRXiID4e DuxdyD611rVoDyieUTxK8cBhJ2McanrNIafShAGQPFRF5YtqijY+k5b5X w==; X-IronPort-AV: E=Sophos;i="5.51,402,1526313600"; d="scan'208";a="188676510" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LD+pylikBAaTyMY3OFrHA8gEQ9/DMmfpWINl5CsDwKY=; b=awTQCNGCyXKxFf6JLrxgdifFoULWhyTujqHi5MhgLgrOBqcE+Xjd+8ppNP7DwWL9IkoACUZt+n3KJJQXdIoIDiYKIZeTqaexl/Ngnh271Q17X4FzSUiQZdzHitwjyVmAGAHyRJkrvFbeWFKYA4Gp0crrDhcw9nCqMcHcR6nU1/o= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Wed, 25 Jul 2018 16:04:13 -0700 Message-Id: <557e98d2a46b8bccd0379e9a538fd617c07e06e6.1532559484.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR04CA0065.namprd04.prod.outlook.com (2603:10b6:102:1::33) To MWHPR04MB0399.namprd04.prod.outlook.com (2603:10b6:300:70::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b80e2f25-d75f-4108-a39b-08d5f282f5df X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600073)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0399; X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0399; 3:0FTMeiJ3Sx9Fp5FszDLBjV/RAJMyyiThI/Kx4d1Ef/G4gZBbVLaQpuYiVPPxiIa82sgfMYtCzs+u17P0037wkZxbtsSDAB3hTwIUmCu1ssKJFHYIyPD+2vLzuo15+ewpfR6sT4OfgH3SmP4jBiK8UM3FtmWcINfqZLCMTdUhIWAM2MBWsx/ULmfV2e7qEzXGjhHe4bo4mACVYG3MhfnWzbO4vO04VVMRwLF8bwOyRLT1IcV9fkKTfdVtAtkxsDsD; 25:BUqZ/G6blvVmrUHvpbsGTX813NklfzFUMywNByJMBi9P2ccl2W0uhgcR8lZ4dNTe+2dziKUFBni+bacQC6Qp85wRZ6sOYcncMz4+JLxtL6VM3ryhspqB5+dC6tgWs/Tjam8L1xTNn/VhVJ1YopBjfUO99W8PMo+h+ZvmRTvuLEstgUybbqr5YGzF54aEtXzg6rUW6KB72VgQpqwCM9mvFkH5Lj+Di6PMz7SDx2pQoc816CPyq0tZzJo9NBWh/V60k7Ow/UUhGMA2IyD38obywoZmSVmdrUY7VciZpqS00JECsQlUFXJrnYg2alF+LJKn9Cb+XD2Zz0G+roLYdzWLdw==; 31:sKzwbiN2PV4qPfPlV3SDllqjyjr0Eadz6Ne6sM6GxlDYnRarirO2gSXGvD4pQP7aDPzNGfylRhdxmuGV1oZRO7zkC3bdt6GE8ixi1Z0JhMZ2x9CMHKeKI+5hwWPms+LinnCJspvZdSG0Nln1xJCIlZuZPe1DgwKn3ApoqUhdaWTzjM3U3TlDl8++SF+6UUoEgJJdV1YZlwvLW/VD/0wi/AM4N/gpnHVIXt9PYnOqJdw= X-MS-TrafficTypeDiagnostic: MWHPR04MB0399: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0399; 20:uf+jQHFi16IVgGQlv/T9PLaY4rEIlabi+qbS6Pqm0YIgxcxpTbO2Np5bZjAlxao9P1vnjlIkhWLzDs7Zit2ur/vP53YOyjmFFmaQaXq4FHA2H0cqQTVFCPFh+cxWd5wHn2HtUwrirdp4aY78kuTHf/WPemp1lJqD0Zg8LChQlDxLH5xXhWl2d6W8u4Vlk6+My4EQfQ57jx5NKKgNh+n4KOIDhN/OlErNDR6glwI+EmtkITvxOIJx6MaLIbhWODXgWFJQOgbzqmvsLtYoJCvRldVk1LeA3MT656pr9u3qLM3qqHz+8VXXEyv+K0Yo3RUkHazAWa2aqIrahM38y1J0x4cmSQNAtoRR8ziRjCEnQpHv4gipcVc1uGIp1vib2uqrZwTtYsLlQMgkLi34fIm7ZKzsANYS0qDCttAxevKolarFnCs/yH5YJ8MmK3dLwIYyp6BQxZhCER1yvZ8Q58+Bq+Yp6hmNGc+/q0FFQQ9hdzineAZ87b5XsoL59MLTmE2D; 4:lMMIiiBOF1xB/RBex5/Qqm1MOUVW+OKdAXBOBrBu4b8qhNIBt8nqRNZ6JTQzaZB7PBg9Q8lKEOhFWmPmp8iWaMXl7y33n6s4a2WTzmdoCto7z/LTQYD9smMJneJypqFkVwDlgSD8+nq2XbvfwBhx6HAw0ycQ4isbcCSpNUDo4R85EvYu/qmDMoGQslKtUj8+9yPAwiwQF6R//vd/DB05q82BmNf1C6MQ7/rr+7wyCSiQjoqxv9hnWpFSlRcnHVXU9EpPz6fBVKoIZzSlcCNCuw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:MWHPR04MB0399; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0399; X-Forefront-PRVS: 0744CFB5E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(366004)(39860400002)(346002)(396003)(136003)(189003)(199004)(478600001)(316002)(2616005)(16586007)(476003)(72206003)(44832011)(186003)(6506007)(86362001)(76176011)(386003)(81166006)(50226002)(51416003)(956004)(52116002)(16526019)(68736007)(39060400002)(4326008)(26005)(50466002)(81156014)(8676002)(48376002)(6116002)(6666003)(25786009)(53936002)(47776003)(11346002)(446003)(36756003)(105586002)(6512007)(486006)(66066001)(118296001)(97736004)(106356001)(7736002)(3846002)(8936002)(305945005)(2906002)(5660300001)(6486002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0399; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR04MB0399; 23:SrkW8y8K326cikyYD1Yd9hwJq1ROa2I6WVso0TWKd?= =?us-ascii?Q?XrVmQtzISCsaSEKh5dyZuNtwJChCjWsI4JEzdVkk3qA4s4kx1HCnfhgCAtcN?= =?us-ascii?Q?3aHZgiUkPwppJsETFgCB7eAUuXV761Y1+W5FzkDLHPcgUGU8s8BOPCAnzIJV?= =?us-ascii?Q?isCsaHHId37EnwIVmbIwqV/tQ6vwvFPFGfZyUQWV6DZsYdQgiG/9pxbsoepW?= =?us-ascii?Q?WYvKE+boLcAlreaKniiB9h1zjWu4Hcjmw9P4vDIHBY0YaoroA2uAMm20IvKd?= =?us-ascii?Q?S/LIzkHRhPtq2HGIicx1IRvhSapUzgyjbD7GnUuSzoYZS6WvkLvsWE0U/XDg?= =?us-ascii?Q?3EerKPPa0lqK0a8PBP1qJPWOLnerSgO2ekzXUou/IpQqEz9Ga4PidN9WeJYG?= =?us-ascii?Q?8c8zoexfuF4NSsWuusni05b8fF+6ZmhqHijz0shIckTaf/9jfsLoZxGouHHQ?= =?us-ascii?Q?pTu6cODiyT+EaQT0QUhCWdGksyCUWRONvlXzzpOrh1fpfpIi87/1UD3EFU72?= =?us-ascii?Q?AYhIT3jegRT7NZ3t54D9U2NFutH/+8CL5+qtpE25RmcER8CYzipqRlqKbJsg?= =?us-ascii?Q?GyNjcxgIF2Y8XfgdrM3nWmD5hqeChZIAuH+Pv7NhnGm6vXdejGWkzRn/7ZU0?= =?us-ascii?Q?bq4eYziomd+c69bIsdKuFkwvUd1R0BkuAHBTBaWiLOGp0QbhoBsOHUU7L//1?= =?us-ascii?Q?67XRHUleh6D8BCi5eJjz8vzq1zNBwn27SgJTTbkX0lgOBMX1y9ZD6/ip+q+9?= =?us-ascii?Q?b0SYq4+AxNZ5bAM/MdpSa1gx7JoWvp92vIvLcO4BCz1+fUL3IbCo85/3i4xF?= =?us-ascii?Q?Duvy/dTsu97+1vZmKw5njm9vax1GWougZxcWfQoL4w7uHxF6GpWGPmY6W7Rr?= =?us-ascii?Q?tz87dVsi/xezFO3eaohv/NcHsok9FAa12t3L7Q3I3xe+Ejf1QxNMbOPG/tMP?= =?us-ascii?Q?rkXVfNFwSqDQyuyo4uTx0Tl9y/f4rC3PkuBj5Hq+dh1ZORCK89QkbbY8aYcU?= =?us-ascii?Q?LEB7UHtc1uoC1AAYR0Hc1XyH2tpb3y6CmqM1hg8Wnl1ltM81OtfQav2INw4L?= =?us-ascii?Q?T/bccJJFYdHt3XKmWSiyc7obXQWogJImPD0wp+RdyQgdXEapHAM275+Nou6B?= =?us-ascii?Q?+g8H9yfEwZL3oL3FILLlmaFhzw/CUC+E+5WzJW7IwI4KXAPsPSA0hvsdoLOd?= =?us-ascii?Q?ABZQ1LKSziZRotBugwKM1MVo8eSPpr6AL/de8wQQLVxPwGhT121FsFjaN83Q?= =?us-ascii?Q?4JCv7kQfGr8lDBX3iA=3D?= X-Microsoft-Antispam-Message-Info: MXkZ96acOh6P7zckzcJasbIJU3FPPk77Ih0JnxgzhS0/ZTCWbp2VG+zXoer1c34Ai0m91D4b0jOhRv/K4FKRZ6+5AZrZchXPIPKHc4KIvMjSagX9npfwtOy5bgkhoJ4KiDOjFgtUdWo4BgUgO3GuFzK4PtPyD+9vElK9Zq23OTq40cflTRFl6RrOE3s56dIxxvvvFdeXmcQ1PQYsLt1kIIH6KNTJrgeag20jXeQbos6s48bLJ4W780ooZGaZJzvWWcqFm/n+MMKbBy8YNnI0P/77oP9/IkODGJeLbkTZr5xQeo9L7stllvNVXGZ5Fm4QnZUYjfdKpJUlwz8Vl2i5D49M/SmrdMUDyhbXWc6eFzc= X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0399; 6:AVz5s0epVeH8Njjs6T4Cieb1ZymlTp490YlPkrIOcVI5rpw8VMShdNZP0fhjCeAGoY2knRJOrlwSqviA2wDvggHgq1yuxOy9KJZXSmSwQyw+RLqlpBVEfUJ2pHFQll7m/ebtjjSkR3u+WinT6rIdoNf7UcEop9bQOVmC10S3Hmc3fs1h9UxauqV0/8kVvigWmHp3aTFH4pgy1jNJOkZ/sV+BoKTmtpMKzcSVeXUxS5hwAEFPqE43GSsH8BUvO0bl1lALTexSTfy769HA5h/gIWh2sKUpOmQKUDyrkgCZjHaXfl5/bq1wkc0i/xdr9mBrwxfUbHOjb9JZR1baxLHPhDZJ1hmL3FO3iC3JEQaXt7yKUDgp/GJOtUwhWVlnL/bhqqSq9+MRd0LnVkMQAmU4vrH+COm4o11yBJh8pKkHzUeLxfutYoYmHjN9Fke4HcB2y/9c7IBC0g7Uw7/nh0ARCw==; 5:SrV+lUFGkkGk8cgNratwUm8OEavthg3KUImAa6M8ogRaq5U8OUtkDAvlK9GokyAbOr4FiMP7ouN5yqzu7t2/c+yII7UmKp27Z3yA2rSNKjDRW5vnOce/0mBVYzzWrgOawtQuUY6Or7hvU9FAbL0DziIh+AkdX5S8CrAnYBCeNGc=; 7:r37a2Ll8zDaHY+V2CrDbAgjmaXt4qMOCiyO7yBbOra95ZsY9pstaDiYr+Z7kHvMqhCZ4qxJFWPyvqbG1ru5oG21iojNRM6+CCUazCtnJRzK4OYigb3MuuJpurDau2zT+P+u7ATOiq9tYgnnx7ZkbMo0ajGTjheqLYVd4pLxFrVnyS5kSL768TvrfxzeO2sgopi6Aa4e/WV5O3fPzB4+ggKGysAdCU0rkPv2Qrst7KPpR3D9DBIp10RumywP8AybH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0399; 20:tXN6YIbnTophlt8U6VnkhLtr+TSkB9so5/Z1WafLhjAGDCnqqOciBG32v27dxdo3cDGMP5MJnmDJhGVX9LB8zjClqCj5tYXamBLncfKItf5x4RWSVxf2W3jpXMAnfLD7daongEvofUHBDLLgKribw1eLN3Ut5brpm2zCtfeyOWw= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2018 23:04:22.6006 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b80e2f25-d75f-4108-a39b-08d5f282f5df X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0399 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 68.232.141.245 Subject: [Qemu-devel] [PATCH v1 3/4] target/riscv: Implement the stval illegal instruction X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The stval register can optionally contain the faulting instruction on an illegal instruction exception. This patch adds support for setting the stval register based on the CPU feature. Signed-off-by: Alistair Francis --- target/riscv/cpu.h | 3 ++- target/riscv/helper.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 1bc46aa952..b797850816 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -86,7 +86,8 @@ so a cpu features bitfield is required */ enum { RISCV_FEATURE_MMU, - RISCV_FEATURE_MTVAL_INST + RISCV_FEATURE_MTVAL_INST, + RISCV_FEATURE_STVAL_INST }; =20 #define USER_VERSION_2_02_0 0x00020200 diff --git a/target/riscv/helper.c b/target/riscv/helper.c index bd78bcff28..924a49d06f 100644 --- a/target/riscv/helper.c +++ b/target/riscv/helper.c @@ -466,9 +466,18 @@ void riscv_cpu_do_interrupt(CPUState *cs) ": badaddr 0x" TARGET_FMT_lx, env->mhartid, env->badad= dr); } env->stval =3D env->badaddr; + } else if (cs->exception_index & RISCV_EXCP_ILLEGAL_INST) { + if (riscv_feature(env, RISCV_FEATURE_STVAL_INST)) { + /* The stval register can optionally also be used to + * return the faulting instruction bits on an illegal + * instruction exception. + */ + env->stval =3D env->bins; + } else { + env->stval =3D 0; + } } else { - /* otherwise we must clear sbadaddr/stval - * todo: support populating stval on illegal instructions */ + /* Otherwise we must clear mbadaddr/stval */ env->stval =3D 0; } =20 --=20 2.17.1 From nobody Wed Nov 5 02:32:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail header.i=@wdc.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1532560094448205.0913499872222; Wed, 25 Jul 2018 16:08:14 -0700 (PDT) Received: from localhost ([::1]:56628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiStA-0005Mr-OD for importer@patchew.org; Wed, 25 Jul 2018 19:08:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56737) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fiSpk-0002gJ-Ta for qemu-devel@nongnu.org; Wed, 25 Jul 2018 19:04:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fiSph-0004hG-TP for qemu-devel@nongnu.org; Wed, 25 Jul 2018 19:04:40 -0400 Received: from esa6.hgst.iphmx.com ([216.71.154.45]:53221) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1fiSph-0004g4-Gn for qemu-devel@nongnu.org; Wed, 25 Jul 2018 19:04:37 -0400 Received: from mail-sn1nam02lp0022.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([216.32.180.22]) by ob1.hgst.iphmx.com with ESMTP; 26 Jul 2018 07:04:36 +0800 Received: from risc6-mainframe.int.fusionio.com (199.255.44.171) by MWHPR04MB0399.namprd04.prod.outlook.com (2603:10b6:300:70::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.973.20; Wed, 25 Jul 2018 23:04: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=1532559877; x=1564095877; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=WS1H4TKFvZxFT1sYO4bs+0OYugOB9GRdOtCp2qhyPSc=; b=PWkT9yAkyjdc2dFADiK6HZMcjLZZC0g4CmxFuHrdjhQs4ETYkdJIGxSs TyeSvCSBskElGvKyP8ec3Rj1NJORlNaUDjTbvpT51zCsSYqkU9pPm7cHc S9sYxEY7IZN6KZwSFdu8eCOgsZ1mEDq7ZXGa0fn2i3/X1lYzVSttixpA4 Os6srdwFq3wN5GDtyakU72tx2Ofea0GoUxrxkYZ37ioj70/NS6tF1Mx0y 84Qd0/3TlYPyaCa2u0B805VVCy0CukBnVbaDY2PQ0gROx0gcepxtXEqYQ iv0s5YHXPAgbdCxuYf6vBdzjOvcT6AYkr2oeJQKK2QCyPZ+7Fv2mKqgfX g==; X-IronPort-AV: E=Sophos;i="5.51,402,1526313600"; d="scan'208";a="86404640" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YwQL8xM21YqIil1nnlA0qhwAyn6FNuz03c1Nx3Tv3vw=; b=Vzfuvqa1V/CrraqdxiBpyqA95Gj7zNHZmtcSxfotW1qzTk0dFBTIcIj2HPQdOI6iV5Xo/IJLY+qu6tuzmSyz9APafQaIlw2bBOkzbxd7aDQRZodyE6LwjYxV1tWOxACscFRNIr5vREzsk2a5TgkHJIT+9lKdhzrKRjz+6z0Peik= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; From: Alistair Francis To: qemu-devel@nongnu.org, mjc@sifive.com Date: Wed, 25 Jul 2018 16:04:25 -0700 Message-Id: <7fc5c46c407bccc9089d7f705bdc8caaea2b67b0.1532559484.git.alistair.francis@wdc.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [199.255.44.171] X-ClientProxiedBy: CO2PR04CA0057.namprd04.prod.outlook.com (2603:10b6:102:1::25) To MWHPR04MB0399.namprd04.prod.outlook.com (2603:10b6:300:70::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 41059474-b9a2-47eb-0456-08d5f282fcf3 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600073)(711020)(4618075)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(2017052603328)(7153060)(7193020); SRVR:MWHPR04MB0399; X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0399; 3:mjTPO1A7njku7GmSsOLw3F+VsH7gm6lKcQK2Se1+VdJugpwdbLPBeG582+UgwKlTudC3OYRRIL+rjCn/AGkxUq3qVD1s9nMvEYHKGzf0reKJVdkGvQvcAowwCxzvueUTkuiT4CF5zpXYhRXLskkmEPMpqGCVeXcYR38lhPcuo0IA27ZF+6adn9dMrx5xCbLfpSCgzOKNOtYDrfVO3KdFYtwafXruhNRJnYLEj6+ho7SJUQsQC22vA+Oemf5Vyty+; 25:h0QK5sNMkG+9R2d+n247ptzaMhWnaJbbP+7aQNCT5+VZB1toPgJWLW9+f3fvuwDLOMdJOlld7E1D4vA70EWyFrbjcA91uRTcKib6viZZB0CxdUFTW8xypIYE9DKS4YwptJZ6V9iopKLU8g5/INOJHSN6lnOKmpOxKKR6zKHWPTg+EeQN/smQd6qN3MRguVtoaVJ/LY3rwdaE4GQ0EjVZL91GzK+MuVzGUqI2pXPoMt6KoczLQ0rX8qxK4IDVUo+b1pWpIJJH9x/Y/lIWrjuxxhimrStG+kkSwen07Rg1YDT6XRZSDwPqVWUE7o+6fJtiUzLacObeK+0LYoYc1ojeeA==; 31:/kf//ESqazjQUNJzf7asIZ5mzasiuR6QL+ZULfhYNz3iEbG1FqPH5FqkM67u5FtRZ84YIRe9qICAgaDNzsDPSYLEl7/NRR9XfdY69lYtOx+3CnhnOuQLQ+TDsTEd20zZgY4lgdXA4BSOJUpI1L80SN28EzxuRDhEuPjyZ426tIMB8lqiYLZgZf3ed7agffIGtm/NyFZRTkuKZwIDfG68ip1NY+xNC7ODKR7kEw9udUI= X-MS-TrafficTypeDiagnostic: MWHPR04MB0399: WDCIPOUTBOUND: EOP-TRUE X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0399; 20:LrfAm0tKCeHY7dfH8P41M16exViJoh6wmp6zHBPEa1VHG7xP1/mXbH0Rn4zQ/ZR64F21jwHD9PaKm7xAL/NY2uakskxENGIlkINC1nUAshmUaRZqs42fDyk6Xlmmdnl6fnCTKwzAReChX+sOLBZK/cLsVoDs0X5mRJBPnGAsexYhd8M4Vyn3BQzODYFpe3NgzCteCPmLdq7D2DsWdo1f29Q9VvRyo6/TvYkKevGJEDE3sp73mFksIuMONUs6C/8s/oOT7G+DcU4gt5Y/z4OD1CreFuAS+dwMIam1WLiiRIFw0hXHprZ5j73iTtP9frN4XH+rTmlhjtALIyuLy7/bkMqRWtzFsMw7iyiq0ff6DzgeSU4NUoKsJsHMbP8hHW523XQN2fCqiyoW1dPh0S9acKp1jUfZ6LhH73U3kSLRSFNr9ycqTdxdSi1Jk1q4x/EBotxM0gI+O/XgIlGaJf5VvlsA4dnggFLltvEERVw8Wncfra8UzRxhMUBF3IEzAGcy; 4:Xo49bsY78gUWN7duR+6G96xNdl7K11/nPVcBm4Kr/0engSmShFMniZ8JRj+WmF2aioEI0QLVqJn306lf9pzLJAA8N7PANVZoRQFfC52cpOVEagPr9Qq2U6Jki7fbwezGJ2zDexnlyqBeTpmIApQmY2swYzoxwrNlZ77ZGAmV2PbRLbSv8fjMNxE/a+AxOgR8jKvau4KoDVrXlF1av7p6Qzt4dDIf2WlDcAtvAVqYyo+YAGBPcZarBsj47fA+KatJM9HGYJNA2kfvI2wyKi+G0A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:MWHPR04MB0399; BCL:0; PCL:0; RULEID:; SRVR:MWHPR04MB0399; X-Forefront-PRVS: 0744CFB5E8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(366004)(39860400002)(346002)(396003)(136003)(189003)(199004)(478600001)(316002)(2616005)(16586007)(476003)(72206003)(44832011)(186003)(6506007)(86362001)(76176011)(386003)(81166006)(50226002)(51416003)(956004)(52116002)(16526019)(68736007)(39060400002)(4326008)(26005)(50466002)(81156014)(8676002)(48376002)(6116002)(6666003)(25786009)(53936002)(47776003)(11346002)(446003)(36756003)(105586002)(6512007)(486006)(66066001)(118296001)(97736004)(106356001)(7736002)(3846002)(8936002)(305945005)(2906002)(5660300001)(6486002); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR04MB0399; H:risc6-mainframe.int.fusionio.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR04MB0399; 23:exyBzTkHF0Zm1EAf96GikHBMrEamoauAmLYhjZd55?= =?us-ascii?Q?j46/WhNFJ7LZ2VbjCp9PkCEs4zXmEdRvp1u99xJg7ojyUpTF0Z+8k8pNW6ux?= =?us-ascii?Q?/+jQiDmjfSTDDr6I858uShTEHNxzxoBm9mmCEK6R6k0+zEUBCcTSHQ+E7yCi?= =?us-ascii?Q?UsOdBj2267toi/qPTHs5x38gd8b9ln0SxGCotiqig3rPOVlZAqZX95vHYI51?= =?us-ascii?Q?+ptQST1YVTrbWmvc/oBVNEjAHh8kKd5vsRU7yBAhp4XEqD2SjtCsEy6bVW4h?= =?us-ascii?Q?mUw3FB4LhJVvLCn1XlkjThSMKw/hRthQfY4uRrRYT5CmUXUEeGnAVk3oMoTE?= =?us-ascii?Q?qu+nIaCHRKCglR3wTfFwhtLp4vCvvdsXBxIHQ3385gkTcX4QPjQQem9Q9s64?= =?us-ascii?Q?fmkhtYYtFJ/jB1D7F83BES2p0NBkwRFJt0ToHl2FL/3dE0ZGJGye54MDANjE?= =?us-ascii?Q?JH7rkRjTrLyJcBaNR0XFBMHWgHw8PQfCRTAlzZdFn7dGjamRV+iY00GR/uCL?= =?us-ascii?Q?HnnUpPd+Smv2dNsiEU4IqKBF4yglYx9miCi2xGJL0fPXTkZ+/cUnnM5AGL4P?= =?us-ascii?Q?XuGHZEkVAJReZLtw+PDP0Wg5d/fdz8fRg7XuNAnQsSbQfmx1533+rM4JpBvm?= =?us-ascii?Q?HBPWi8OseC7mER2EtF588cDy+0RW99Ds+zm6R4PyAbky5fNH02LL/STUU7AL?= =?us-ascii?Q?pYsusIIFG+U+RfEue8rvJXMGP/DU4KJUJErlhVDWTj1Xvj93OXqfk3QZwuCc?= =?us-ascii?Q?6/MTYxVitsjikMHzAMiIHsAuz86Hf9tuar0i/zGh0V/WJnfWbtwERJM/onir?= =?us-ascii?Q?UF97Yi06nD6woF1LKpq2DHMlL/6n55+We6jyygvNpaMS5ymvVxulWvzmTnKb?= =?us-ascii?Q?9V2MwQo2UHnCAR6r1b+2jcHVTZtRBYX0AuHfFK3zYp+zBLJnzIJ8UkpGfdfX?= =?us-ascii?Q?3v0E4Rln++Nk/S3Vl+PtYPNTD9CpTwTX1Lxzr6WxiiHjWOQkvcf5fVbIrXXy?= =?us-ascii?Q?jLsQW8RWaGyOEAB40DssM/UbUbAvYQ2NGHD2py+NyGujJ8jRM+xz2x2f3pdz?= =?us-ascii?Q?IzgXMfzMxfuZ/gkAUS0ArAGhxGo/AyVyEsqG1rw9MCbcb58SE/nuBmiJ4BGj?= =?us-ascii?Q?eQh7NOnzDX6UDMDku1d26KIQcYZcxzy5kv5GDMnTsKG4WnNff5VGLGKcycBA?= =?us-ascii?Q?/hhzjO7jAeo1PhGB82Vpvj7x4pgJF7XSeb8h0wlQWL51OSZseFJiBBCttsZs?= =?us-ascii?Q?xXQJiGIj83KA1IVpW8=3D?= X-Microsoft-Antispam-Message-Info: Y/FYGAhcN/A8t2yfQ62rYMXircyEiMDFCkLcT2ofGMplz5aG+HU9saQbsQPnMs2xbsMCAnW09dTf4Gp5Pg9LTO/iaRMkBC/2OCQfD/x6xAvIcwgTQSQ8XXpPIx4PyvUkOpNBUgiVpcVP2fSgmfZbgqw3c5dTnEoAuqk4kUWd8mQCC4PNEz6/KhdsbJtn+yFT1tHJXrM+YdEEYpn98xbR9BYWGblhPizEk93ButFNr96rU2B+6XDBKAax0e+hv5a+Uu40pAgXryXYZSHXchMZDhc3eZawd9A9xcnNwy11klJfCk4ZYDH1PVADurTA0T0jFm84a92f1Ap+pxX19L+dovuM0okQ9N2a3k1qQiepkj0= X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0399; 6:D32edyzPA/XI72QvdsJQ7kN5l9u+7aN8sH5eEWoTgs43cQkWAkAJLauPHxTUTrBnZnG9vIyIWwzXG4srJKt/LPB81rjabvW82UgD0lEnZECiFcHKK0467rlMMLXe1AWq/aQCYv/ZV3mMYP5hGAJUCwM7s9+mVV502Io502fRSs6nADU3yKqA1MQArv14lo+MUNOd8iZRquwjJt7+tDEfYTlFKMMYPU8TESETWhoyqpnrOXuj1JTZgmDkWsSfv76fhfuIYkW9Ju63ATqb3c27BCqNBrxogFfFOmB3kBBI5uNaOPPvPAqzz/hYLaBnYUK6xYjfXTFcF7lP+uHTOH9ce0R+JJEmPsq/D8QFmfOS3Mk3fP31fID9iReyLscHtqLQ7W0KGcs6njZE2PG+Y43VWPdOlzMy4tDMpBdgKGh7KDpaPlFZqFbUlesIIlbJq2PrNQEBj/qsNIpwBlGBfeSiMw==; 5:LragbH4BP/QkV91sXrvTvjdlMtylWhbw8T1IqTb0ISOHlQS/yyzmAJ10vr0vki5gWVcL5+ZVCnTInO9HWMqmWH1yKqvuramV8GolGRRKaetcZxEd1jalydLicwF2SEaDE3YaAhuF3IiGVkn8L+jEXuDnj3KHBag+gd/4ABTFmy4=; 7:nhJPEsNxB0PGXy3F6xSDFoudGlOu6fdKfu6aSThgtrTnDmx2vU4iyvcnblDJB98yAAicJdHO62DMCxuoosT+9Ul2+71BHhxd+C2celbyyDaNGQtFBHuZzrosVMZ1oc3Pgfv9v9d4tj3v0RmmuviSPzuxerKWQaLQmUUZ+FbsHB29St/nXBHYZi/I/aNdWpBTXrYmbhHdu0aCZaHZHqC+A4O5nK4vL0neVm5NWF76BVMAHeMtPzSGI/gfAiu8Jvwq SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR04MB0399; 20:yozS6/fZgS/j2PPdCzVq2n0r+3ZLS4gaItTo6U+OC0YXOUTATpJS0g8cnu0dLAk3c2sEI238vmAaYkn64lnjksCj8wm+Cubn9q+QmjEEm2IBROP5oDXfFAw7uept15VP3tM9SZ2LEtsRxDduwA+h0Jmy6eg8y/fHOguAOBIeQmk= X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2018 23:04:34.4685 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 41059474-b9a2-47eb-0456-08d5f282fcf3 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR04MB0399 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 216.71.154.45 Subject: [Qemu-devel] [PATCH v1 4/4] target/riscv: set mtval and stval support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, alistair.francis@wdc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Alistair Francis --- target/riscv/cpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index d630e8fd6c..b33950a2d4 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -133,6 +133,8 @@ static void rv32gcsu_priv1_10_0_cpu_init(Object *obj) set_versions(env, USER_VERSION_2_02_0, PRIV_VERSION_1_10_0); set_resetvec(env, DEFAULT_RSTVEC); set_feature(env, RISCV_FEATURE_MMU); + set_feature(env, RISCV_FEATURE_MTVAL_INST); + set_feature(env, RISCV_FEATURE_STVAL_INST); } =20 static void rv32imacu_nommu_cpu_init(Object *obj) @@ -161,6 +163,8 @@ static void rv64gcsu_priv1_10_0_cpu_init(Object *obj) set_versions(env, USER_VERSION_2_02_0, PRIV_VERSION_1_10_0); set_resetvec(env, DEFAULT_RSTVEC); set_feature(env, RISCV_FEATURE_MMU); + set_feature(env, RISCV_FEATURE_MTVAL_INST); + set_feature(env, RISCV_FEATURE_STVAL_INST); } =20 static void rv64imacu_nommu_cpu_init(Object *obj) --=20 2.17.1