From patchwork Thu Mar 10 11:27:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1603845 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=E+FqzeML; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KDp015qkJz9sGl for ; Thu, 10 Mar 2022 23:14:25 +1100 (AEDT) Received: from localhost ([::1]:46490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSHgV-0000JC-Pd for incoming@patchwork.ozlabs.org; Thu, 10 Mar 2022 07:14:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSGxY-0005sT-Tu for qemu-devel@nongnu.org; Thu, 10 Mar 2022 06:27:56 -0500 Received: from [2607:f8b0:4864:20::62d] (port=35569 helo=mail-pl1-x62d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSGxX-0007ze-8v for qemu-devel@nongnu.org; Thu, 10 Mar 2022 06:27:56 -0500 Received: by mail-pl1-x62d.google.com with SMTP id n15so4609254plh.2 for ; Thu, 10 Mar 2022 03:27:54 -0800 (PST) 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=kC6IYNjsGbxQ1O1vqjxYEFxpw4YN+TjfQjKfECaeneY=; b=E+FqzeMLYkMsGZA46EH5rxCmD2SIxJ64cuBJoFwAqf5xmz6H73ANYIFCxyKAJ7SgH0 DDYkf6nzX/ODRTrt2MbcnmWSoMTtgKi9zcjIxqvH4zbblq9mhdG3ew7f9e8jk+QpQzqN H7bW7ls/UK3ZSUmH/lwEUkNawNe6G9rig9yc8xgx9Lb2M7sKxwg4xgv+hhA3IR1p1S6o GiF/YFqrBtJGqJZPUQl5N8pNBy+9ZZAkecj7TtSA597c19Q/anPdRTq96RZvk48D4/+u aUe5iu2lFzs8OyPW7QIuHurt/TEYeyRJxA3a13k8MmouQnSYFLJOjYV15d/nREFN0SW5 M6lw== 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=kC6IYNjsGbxQ1O1vqjxYEFxpw4YN+TjfQjKfECaeneY=; b=JGK3t2DPuqXNyGGdI7d1CKVMs+MCZalaq+Qdg+wbMI5BWI8Nl/WMCGvJb/u2+kT9Er vrVrfm1q0P3RdBBmkrfSnFHPQp82Dg/6sucULgDo5Fxg2vIQSIfRq/AIoii4qJS/tmnD 8XbdesU4KCUnzFR7rO/zxBoR8z6CQBfMB1/BshBw1H178RKs/1ggo9+7BhuMbVb6SVy+ kCURpOjfSA2bB9anc3hPYv7qFNArc9uFU3uhvxcBrWh6MNOhqUV2RerM4HOYaIovRSm1 9NLL/C2h7LhY5294CjNTbPELnZ4zzaGsX4xC5yBg9deffxLOtly+jTdU923I+eJcq8wu a62A== X-Gm-Message-State: AOAM532UlDsFq+fsyA5SCH6nOdgfNDs7axFngbOMe8guX69WEatMLDLe qYsLrygxOoP4vScobSO2kqlD4k6dZBXkQA== X-Google-Smtp-Source: ABdhPJxfjs54To/dsxqoPwUcez210IR7RKzYrtvdry31OcnQ9zY4h/Zzg3hD/pniFVqXOknDODrF4g== X-Received: by 2002:a17:902:720a:b0:151:d7d7:6ac0 with SMTP id ba10-20020a170902720a00b00151d7d76ac0mr4410040plb.128.1646911673955; Thu, 10 Mar 2022 03:27:53 -0800 (PST) Received: from localhost.localdomain (174-21-142-130.tukw.qwest.net. [174.21.142.130]) by smtp.gmail.com with ESMTPSA id js15-20020a17090b148f00b001bfc8614b93sm3114977pjb.1.2022.03.10.03.27.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Mar 2022 03:27:53 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 24/48] target/nios2: Cleanup set of CR_EXCEPTION for do_interrupt Date: Thu, 10 Mar 2022 03:27:01 -0800 Message-Id: <20220310112725.570053-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220310112725.570053-1-richard.henderson@linaro.org> References: <20220310112725.570053-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62d (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: marex@denx.de, peter.maydell@linaro.org, amir.gonnen@neuroblade.ai Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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. Signed-off-by: Richard Henderson --- 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 0392c0ea84..afbafd1fdc 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -74,9 +74,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; }