From patchwork Thu Mar 10 11:26:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 550101 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:6713:0:0:0:0 with SMTP id u19csp913340mag; Thu, 10 Mar 2022 03:48:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgXaZFaIyxGC/XuOtlWCRtXz4R1u3MFqSGdXq6kGJn244ZiUidhiWeB+exI0K3KOz0KgTe X-Received: by 2002:a81:244a:0:b0:2d6:954a:5d0e with SMTP id k71-20020a81244a000000b002d6954a5d0emr3617678ywk.56.1646912936426; Thu, 10 Mar 2022 03:48:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646912936; cv=none; d=google.com; s=arc-20160816; b=U6B7nEWrVe7XCWlMh7rHYBVY9cOhNjTwIZQHLZy/u2RHrpfV1fZsEfgSK8Bcx2kD4J rNZ9XpAZFAhdLbjaOe1h2tp7wkTOjV/O4fnR32xnJDjlnT27rMezgo7p5wz6k4fH8hfe tCwT8L84oQMXm4Vj1lMGGVdxWeD41nEZKCv76J6dKbEpblfUKGI2AELrP5IQSy6cD1hP LQyuKeSiASCdoq1NxhFvTqzFeXVnevX6F7KK5RSBgCnGOV7P6AUdIirUneft+cYhDX8o cNZX0NnQpFO8hmtHGpmNgUbrr9QCyIBMy4gghm1HI6BHwFDhAVua4sQMGMjs9tIgVyu4 yMVg== 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=8buwJrjtMj1NFA6rdKhvKicQJO4j8m6F/Eaj8v2A0XQ=; b=CWjsRRTbmEFqW0aSClTLggTedQxnbGbpyBO8HLac9nF67+4IzuapMQX0D9workGJXp WnBaYWTsLDlnocGtuazhTcVynz+rTBByJivwjT8nIXN/CqkYOh7PQ8AoIRyb7PNhdTpK cm+fYpAf24YIxJWD3hRB9J3uTgs5FIFX4AMI3EVPs6aUwSglNxQ+T2TUqUItJRsNB1bu dUkstEqKvE6luP5NEnVMFshjTdrz5HSd79md8zkStufntdT28QyRXkZqVWw7SwuFShZ4 s1o+cwArNKgBLm4HUdcvEjn3MqzqePd+AsywWbr7a+QyS2p2u7HxT8HhuLR0ILFkrfUN EWFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rpeX2oFd; 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=fail (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 bu15-20020a056902090f00b00623f52a510fsi2706078ybb.684.2022.03.10.03.48.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Mar 2022 03:48:56 -0800 (PST) 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=fail header.i=@linaro.org header.s=google header.b=rpeX2oFd; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSHHr-0000Qx-Sr for patch@linaro.org; Thu, 10 Mar 2022 06:48:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSGxN-0005Mt-9u for qemu-devel@nongnu.org; Thu, 10 Mar 2022 06:27:45 -0500 Received: from [2607:f8b0:4864:20::102a] (port=37402 helo=mail-pj1-x102a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSGxL-0007xG-DO for qemu-devel@nongnu.org; Thu, 10 Mar 2022 06:27:44 -0500 Received: by mail-pj1-x102a.google.com with SMTP id lj8-20020a17090b344800b001bfaa46bca3so4845809pjb.2 for ; Thu, 10 Mar 2022 03:27:43 -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=8buwJrjtMj1NFA6rdKhvKicQJO4j8m6F/Eaj8v2A0XQ=; b=rpeX2oFdmtOBiqvjxZnpGTTd+MUcOTawUQr2eSvq47qEy3yJlu5klzqVEO4eMSd5e1 uLw8Vb7chgDYw720chxwBgBM9r12CqT6a8EHnqx8xpe5YjFdqpQrosM53mpbErKC3V6I /Ol/zZb4dytC4ap7ssx8jRIX9PpFjNHZtWt6LfrChRh+W2KSLuI9zKRPq4gv4xRTqAws DGLhlts9pfB/FrRxJ78aqcI6MqAjceyiV8iVJJRZ+b9Y/PvrkBZUce7Lqs4l6NVOL981 3kwOs4exPQffmvgC1YYpzTWVafTjxcX0G43GrrUhA27rnzWhvmvrV6Batw/l7/kkBP57 24tg== 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=8buwJrjtMj1NFA6rdKhvKicQJO4j8m6F/Eaj8v2A0XQ=; b=guXNtGAmMUg6qI50sEkLx1ewsb9EjRYAN6C2MVR8I8v/aYpPPXZI2PN+iC9tb+Xs5z c3Q6rKIXe9Ba7zoQK+l0EWhZEUZ9JbHzsIEuJbYKY8f9nrg6+ZViJ1orP3jB1Dtg2Qut WIkCKSkuf/onF9g9dl4VJsBZThzq+lAPOsQyz/usJTEDHh9G/x1437CbLCaTSkfDzvw8 PoYsZL4qtloRQp0xBhGdWPo2DDt6q4BgtN4URy4QYz0aIv6sJP/ZmTBKUZDiaguUSkWW BmG0WT0I10aLl/Zgf5b10l0+c5vD/HemB7EHO/ZARtaJDebFUNaNItfVvLYkxHvRo8Z0 VsDA== X-Gm-Message-State: AOAM531ThWEdOsUoFRnyvpYjg6p9oOntWnHVJ0ix5IIxjL4j6z8Sadth E/yyZOWv+p2Vk1mrNW/E3k2ZB9DViuN01Q== X-Received: by 2002:a17:902:cec7:b0:151:bb1b:5c9d with SMTP id d7-20020a170902cec700b00151bb1b5c9dmr4535242plg.41.1646911662081; Thu, 10 Mar 2022 03:27:42 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Mar 2022 03:27:41 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 14/48] target/nios2: Use hw/registerfields.h for CR_EXCEPTION fields Date: Thu, 10 Mar 2022 03:26:51 -0800 Message-Id: <20220310112725.570053-15-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::102a (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use FIELD_DP32 instead of manual shifting and masking. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/nios2/cpu.h | 4 ++++ target/nios2/helper.c | 37 ++++++++++++++++++++++--------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index ecf8cc929f..963cdec161 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -105,6 +105,10 @@ FIELD(CR_STATUS, RSIE, 23, 1) #define CR_CPUID 5 #define CR_CTL6 6 #define CR_EXCEPTION 7 + +FIELD(CR_EXCEPTION, CAUSE, 2, 5) +FIELD(CR_EXCEPTION, ECCFTL, 31, 1) + #define CR_PTEADDR 8 #define CR_PTEADDR_PTBASE_SHIFT 22 #define CR_PTEADDR_PTBASE_MASK (0x3FF << CR_PTEADDR_PTBASE_SHIFT) diff --git a/target/nios2/helper.c b/target/nios2/helper.c index 90f918524e..54458a5447 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -64,8 +64,9 @@ void nios2_cpu_do_interrupt(CPUState *cs) env->ctrl[CR_STATUS] |= CR_STATUS_IH; env->ctrl[CR_STATUS] &= ~(CR_STATUS_PIE | CR_STATUS_U); - env->ctrl[CR_EXCEPTION] &= ~(0x1F << 2); - env->ctrl[CR_EXCEPTION] |= (cs->exception_index & 0x1F) << 2; + env->ctrl[CR_EXCEPTION] = FIELD_DP32(env->ctrl[CR_EXCEPTION], + CR_EXCEPTION, CAUSE, + cs->exception_index); env->regs[R_EA] = env->pc + 4; env->pc = cpu->exception_addr; @@ -83,8 +84,9 @@ void nios2_cpu_do_interrupt(CPUState *cs) env->ctrl[CR_STATUS] |= CR_STATUS_EH; env->ctrl[CR_STATUS] &= ~(CR_STATUS_PIE | CR_STATUS_U); - env->ctrl[CR_EXCEPTION] &= ~(0x1F << 2); - env->ctrl[CR_EXCEPTION] |= (cs->exception_index & 0x1F) << 2; + env->ctrl[CR_EXCEPTION] = FIELD_DP32(env->ctrl[CR_EXCEPTION], + CR_EXCEPTION, CAUSE, + cs->exception_index); env->ctrl[CR_TLBMISC] &= ~CR_TLBMISC_DBL; env->ctrl[CR_TLBMISC] |= CR_TLBMISC_WR; @@ -98,8 +100,9 @@ void nios2_cpu_do_interrupt(CPUState *cs) env->ctrl[CR_STATUS] |= CR_STATUS_EH; env->ctrl[CR_STATUS] &= ~(CR_STATUS_PIE | CR_STATUS_U); - env->ctrl[CR_EXCEPTION] &= ~(0x1F << 2); - env->ctrl[CR_EXCEPTION] |= (cs->exception_index & 0x1F) << 2; + env->ctrl[CR_EXCEPTION] = FIELD_DP32(env->ctrl[CR_EXCEPTION], + CR_EXCEPTION, CAUSE, + cs->exception_index); env->ctrl[CR_TLBMISC] |= CR_TLBMISC_DBL; @@ -116,8 +119,9 @@ void nios2_cpu_do_interrupt(CPUState *cs) env->ctrl[CR_STATUS] |= CR_STATUS_EH; env->ctrl[CR_STATUS] &= ~(CR_STATUS_PIE | CR_STATUS_U); - env->ctrl[CR_EXCEPTION] &= ~(0x1F << 2); - env->ctrl[CR_EXCEPTION] |= (cs->exception_index & 0x1F) << 2; + env->ctrl[CR_EXCEPTION] = FIELD_DP32(env->ctrl[CR_EXCEPTION], + CR_EXCEPTION, CAUSE, + cs->exception_index); if ((env->ctrl[CR_STATUS] & CR_STATUS_EH) == 0) { env->ctrl[CR_TLBMISC] |= CR_TLBMISC_WR; @@ -140,8 +144,9 @@ void nios2_cpu_do_interrupt(CPUState *cs) env->ctrl[CR_STATUS] |= CR_STATUS_EH; env->ctrl[CR_STATUS] &= ~(CR_STATUS_PIE | CR_STATUS_U); - env->ctrl[CR_EXCEPTION] &= ~(0x1F << 2); - env->ctrl[CR_EXCEPTION] |= (cs->exception_index & 0x1F) << 2; + env->ctrl[CR_EXCEPTION] = FIELD_DP32(env->ctrl[CR_EXCEPTION], + CR_EXCEPTION, CAUSE, + cs->exception_index); env->pc = cpu->exception_addr; break; @@ -158,8 +163,9 @@ void nios2_cpu_do_interrupt(CPUState *cs) env->ctrl[CR_STATUS] |= CR_STATUS_EH; env->ctrl[CR_STATUS] &= ~(CR_STATUS_PIE | CR_STATUS_U); - env->ctrl[CR_EXCEPTION] &= ~(0x1F << 2); - env->ctrl[CR_EXCEPTION] |= (cs->exception_index & 0x1F) << 2; + env->ctrl[CR_EXCEPTION] = FIELD_DP32(env->ctrl[CR_EXCEPTION], + CR_EXCEPTION, CAUSE, + cs->exception_index); env->pc = cpu->exception_addr; break; @@ -183,8 +189,9 @@ void nios2_cpu_do_interrupt(CPUState *cs) env->ctrl[CR_STATUS] |= CR_STATUS_EH; env->ctrl[CR_STATUS] &= ~(CR_STATUS_PIE | CR_STATUS_U); - env->ctrl[CR_EXCEPTION] &= ~(0x1F << 2); - env->ctrl[CR_EXCEPTION] |= (cs->exception_index & 0x1F) << 2; + env->ctrl[CR_EXCEPTION] = FIELD_DP32(env->ctrl[CR_EXCEPTION], + CR_EXCEPTION, CAUSE, + cs->exception_index); env->pc = cpu->exception_addr; break; @@ -228,7 +235,7 @@ void nios2_cpu_do_unaligned_access(CPUState *cs, vaddr addr, CPUNios2State *env = &cpu->env; env->ctrl[CR_BADADDR] = addr; - env->ctrl[CR_EXCEPTION] = EXCP_UNALIGN << 2; + env->ctrl[CR_EXCEPTION] = FIELD_DP32(0, CR_EXCEPTION, CAUSE, EXCP_UNALIGN); helper_raise_exception(env, EXCP_UNALIGN); }