From nobody Wed Nov 5 05:26:59 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