From patchwork Sat May 5 23:35:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Clark X-Patchwork-Id: 10382471 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4715960236 for ; Sat, 5 May 2018 23:41:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A37D28C3F for ; Sat, 5 May 2018 23:41:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CE0C28F5B; Sat, 5 May 2018 23:41:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C8AF628C3F for ; Sat, 5 May 2018 23:41:20 +0000 (UTC) Received: from localhost ([::1]:40284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF6nn-0007Nn-Rr for patchwork-qemu-devel@patchwork.kernel.org; Sat, 05 May 2018 19:41:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fF6kG-0004Ji-RW for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fF6kF-0003w3-FY for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:40 -0400 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:42444) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fF6kF-0003vp-9X for qemu-devel@nongnu.org; Sat, 05 May 2018 19:37:39 -0400 Received: by mail-pf0-x242.google.com with SMTP id p14so8709721pfh.9 for ; Sat, 05 May 2018 16:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6on1lJF8B1OcPUw/PwklAPiWkVR7XQhUNtC8ocAc4vg=; b=m8dkSdtypkFUW4FzXU/ZgzvqbL9IjEoM5Gf9fesHGNWfU/FB2UXohAh83GVGqQf+NQ TzTXLCs9JGrMS0OxU84MyAFggTFWYj82ct2zWksMtQ06DYHCMMluPewr+FmGd98zC+5J vBky+dyUfj20W2Y5I5Xa0VtQ0ssmP/MPq4JlwdJx8/2fQeacp5L+pP8DlG2fDtScOlIS ksOJT9KbQxz1Z+Zd/FajYIEuGr1I6EskL7NRs9L+W/hrm8YuvRkc6dFTr5RKTeYLFegh Q/LFy/f5BavEWmRc68fwC5xq2oPCVwWEqCpdwLu9SzZC/EVSELfg///0XibTVY4A1bj2 ABZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6on1lJF8B1OcPUw/PwklAPiWkVR7XQhUNtC8ocAc4vg=; b=qVG1FG57JubOfaaEbP6HIGsIhRJnTzazO2p8DVaMGrftT82JmAg5y9KSQ2bw7gM4wR G/XawMsFlKWB38W6r7qLG/WC7QlqOVV71L+/yyL9/P0hJari9CSPxf2AMD4icja5es2N gXDUfrGZYuMnykVxpumRtRKWxuRg31euBhV5XGVMuWoQWi6RQJRFwJuBt8D120yYwKe5 QiGJcPYfSUMMJanott18pGraWjUCt817vorw1fNUMbC0LHtbY3FgdRSQ91UrJMElomkN 5XnoSTzQXR8rzwtF7H+Y8vL/RQ+3i6o8HZp/HLicCWGclYc3uGRe2G83/RqzMoHpNsoK 9Uew== X-Gm-Message-State: ALQs6tB3ftx/P/u4eXQ61O+cuqXXUYDc77CnK/GBp1WwYkKXXd8rVY4E lhJgwZctF7KFsXc2L9tgh9lT2EKcsrE= X-Google-Smtp-Source: AB8JxZqzNwqAxwa7UZ4tqNz9d2IE4xXJZeh27x3cKw1kF9bRLDyEtdAO6sYHu+ekBQ+acg53eb5Wxg== X-Received: by 2002:a63:aa01:: with SMTP id e1-v6mr26221572pgf.331.1525563458374; Sat, 05 May 2018 16:37:38 -0700 (PDT) Received: from localhost.localdomain (122-58-167-38-fibre.bb.spark.co.nz. [122.58.167.38]) by smtp.gmail.com with ESMTPSA id x8sm47297094pfa.173.2018.05.05.16.37.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 May 2018 16:37:37 -0700 (PDT) From: Michael Clark To: qemu-devel@nongnu.org Date: Sun, 6 May 2018 11:35:19 +1200 Message-Id: <1525563325-62963-15-git-send-email-mjc@sifive.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1525563325-62963-1-git-send-email-mjc@sifive.com> References: <1525563325-62963-1-git-send-email-mjc@sifive.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PULL 14/20] RISC-V: Clear mtval/stval on exceptions without info 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: Sagar Karandikar , Bastian Koppelmann , Palmer Dabbelt , Michael Clark , Alistair Francis , patches@groups.riscv.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP mtval/stval must be set on all exceptions but zero is a legal value if there is no exception specific info. Placing the instruction bytes for illegal instruction exceptions in mtval/stval is an optional feature and is currently not supported by QEMU RISC-V. Cc: Sagar Karandikar Cc: Bastian Koppelmann Cc: Palmer Dabbelt Cc: Alistair Francis Signed-off-by: Michael Clark Reviewed-by: Alistair Francis --- target/riscv/helper.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/target/riscv/helper.c b/target/riscv/helper.c index 02cbcea2b731..95889f23b94d 100644 --- a/target/riscv/helper.c +++ b/target/riscv/helper.c @@ -466,6 +466,10 @@ void riscv_cpu_do_interrupt(CPUState *cs) ": badaddr 0x" TARGET_FMT_lx, env->mhartid, env->badaddr); } env->sbadaddr = env->badaddr; + } else { + /* otherwise we must clear sbadaddr/stval + * todo: support populating stval on illegal instructions */ + env->sbadaddr = 0; } target_ulong s = env->mstatus; @@ -487,6 +491,10 @@ void riscv_cpu_do_interrupt(CPUState *cs) ": badaddr 0x" TARGET_FMT_lx, env->mhartid, env->badaddr); } env->mbadaddr = env->badaddr; + } else { + /* otherwise we must clear mbadaddr/mtval + * todo: support populating mtval on illegal instructions */ + env->mbadaddr = 0; } target_ulong s = env->mstatus;