From patchwork Tue Apr 26 18:18:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 566107 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6886:0:0:0:0 with SMTP id m6csp3865431map; Tue, 26 Apr 2022 12:07:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyuIS59m72p6P1+cUy4hFtf5uQE+Jq5kYbB3Ayay8sKtoG+Bk+sM6LrfyqnCNNlxbJ1X7Hy X-Received: by 2002:a0d:d2c2:0:b0:2f7:dbc6:b900 with SMTP id u185-20020a0dd2c2000000b002f7dbc6b900mr12546845ywd.147.1651000046958; Tue, 26 Apr 2022 12:07:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651000046; cv=none; d=google.com; s=arc-20160816; b=JhwEiRFUwLnNIWG06p6tGcFRCVVDsQj/dgcd16IOpxiEBPh9tcOx2WqukxGKqc4Fc9 rYYflPQPU8Yix+yNe3fZcxzq6aJ7mDl6K30rNDN7Js71Tr/KdF7nsSdKZcIc9mw+ySqU U+UAkLuykKfLwZOW/pXUFRab0HKmZ9c8DAWS/cIAJAilmRQXkhk9SrzYCKF6sGsICBxx INfeamFI3EWXbYbrvCv1QctNezVI99hpgEjPM6GAIz1Tt9MchpsHxynAFEL1wMIpeqU5 v2a4ksY5VS7EEyO3vAfF3rz9zsbUjyVTtfan0hmrGRZY7leccPXDZKR64ABo7I2kNxea fl8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ysJZrdf3qEL6SmyFziC5eyUqxmIxqoso+UNr/N0Gtr8=; b=YgXfYkFh8yDg/mXWzukkPK4VUEAMKQCsF2w3x3Ev+KjKKEP8+A6PnXjIN7BmlBvkAk xhK8BbwYHkwpz3wK8UNGCuM7d2wy5Fvhjmh6kopPRJiKXHJp9S9x4zh1AfUg582uEp2f PETpfKzrv5IhWdGapVCM9B3IGk8P+iGBv/W0VNCEBiMNxoF/HM9urMnh2JxzGla1Sq84 Fx+iiGrht9QEts6V5x4IA3hAiccvYo+0+cT9R8mHS0IcA1Jlt0r9o5SkH0O1Re+QhOOt xP/va9DI6E1ZmjIyjwFD+hwLid0BcRVmtB6tWsBAD4QQxPHuHSj6//m4bdbUoLXC3zQj Ieug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bnfNjY32; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x2-20020a814a02000000b002ec35658153si14303774ywa.490.2022.04.26.12.07.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Apr 2022 12:07:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bnfNjY32; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njQX0-0003Nl-DN for patch@linaro.org; Tue, 26 Apr 2022 15:07:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njPmp-0002so-L3 for qemu-devel@nongnu.org; Tue, 26 Apr 2022 14:19:43 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:39674) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njPmo-0004Sy-3V for qemu-devel@nongnu.org; Tue, 26 Apr 2022 14:19:43 -0400 Received: by mail-pg1-x536.google.com with SMTP id i62so4557121pgd.6 for ; Tue, 26 Apr 2022 11:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ysJZrdf3qEL6SmyFziC5eyUqxmIxqoso+UNr/N0Gtr8=; b=bnfNjY32un9c12FVUl6geh2rs5BDwjv7jU7Iaix8oF8lMVvO6MbzuRmgaFnp/Ij2l7 tH7ra7bsOLGcdfNhJkXW+KqkTDo5NLQ2hZBkpEOtp/bT5slJll02ZQSFal8uTwIuilS+ VPjCuBhiF0+9Qf35MNDadXXSt4/m/t0IJXHd5oa8Tjw8egvJFV3+/hiqzCffmPs88r0v uWq4EzzIbkg0TaziEamX0Muq1gvylx/aLZosDKx44/zeuC0BFQa2ysJ8/WOjICYxUGhj Pngdkys40RY7lKmH30dTbRwDC9vy33yHAshPQzsp5/5LySv90eiyR91trufliyNRran1 Nhgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ysJZrdf3qEL6SmyFziC5eyUqxmIxqoso+UNr/N0Gtr8=; b=2j5AC+E447SxMNcvTbvLM7jom6cwKTaDA2gGdkSWYGYLE1ClrmHGUv2OfnVUAR5dV5 KYYL5LQQf1vOPtjg2eKdBA8BpTtgqUpMVAYKxccGqgkRYrPT4ijHma3qfx2Eq9LhgzYI XEl+Splo36D2GDLni649V7P4mllAR9HgoBiyq/jOCyI99sMb1PqXz2FOUbI6AtaMWmQ2 0M4sYT6I6ivzekBAjDX9bfDnVheA90EWhjRSActuUaAj1Y7yGQyt0bGfmb9ibEH59QcZ zxsdjLO3nlULMZG6OBZHafBb4OHg58b9jsdcDcUClP0zsx1RT0GrwMNAL+fhAiBiCazQ 7fhg== X-Gm-Message-State: AOAM5326Ko7MkG3muNThg8IT3547ZcKb3s76qNIkZyTVvFODUmJt3d25 c2VcVK8GWYWGcKBod2rVHqsV90+q62BziA== X-Received: by 2002:a62:fb0e:0:b0:505:fd9e:9218 with SMTP id x14-20020a62fb0e000000b00505fd9e9218mr26300262pfm.78.1650997180873; Tue, 26 Apr 2022 11:19:40 -0700 (PDT) Received: from stoup.. (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id j7-20020a056a00130700b004b9f7cd94a4sm16482827pfu.56.2022.04.26.11.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Apr 2022 11:19:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 35/68] target/nios2: Cleanup set of CR_EXCEPTION for do_interrupt Date: Tue, 26 Apr 2022 11:18:34 -0700 Message-Id: <20220426181907.103691-36-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220426181907.103691-1-richard.henderson@linaro.org> References: <20220426181907.103691-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The register is entirely read-only for software, and we do not implement ECC, so we need not deposit the cause into an existing value; just create a new value from scratch. Furthermore, exception.CAUSE is not written for break exceptions. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-Id: <20220421151735.31996-36-richard.henderson@linaro.org> --- target/nios2/helper.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/nios2/helper.c b/target/nios2/helper.c index 25a89724d0..3d9869453b 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -54,9 +54,10 @@ static void do_exception(Nios2CPU *cpu, uint32_t exception_addr, bool is_break) new_status &= ~(CR_STATUS_PIE | CR_STATUS_U); env->ctrl[CR_STATUS] = new_status; - env->ctrl[CR_EXCEPTION] = FIELD_DP32(env->ctrl[CR_EXCEPTION], - CR_EXCEPTION, CAUSE, - cs->exception_index); + if (!is_break) { + env->ctrl[CR_EXCEPTION] = FIELD_DP32(0, CR_EXCEPTION, CAUSE, + cs->exception_index); + } env->pc = exception_addr; }