From nobody Sun Jul 13 08:47:36 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1653339497; cv=none; d=zohomail.com; s=zohoarc; b=C3d6jPPa8+HyKKGlJ/HR/0D7B640OTB18Kkp9dde6PPRWXcTMRhzAHW0zf+0cQKUfdOMrPCBNaoE7dVCNd00SJlO77gB+2f++HQ0/SVOlik/0Cyejxzmu3IVsdpV7Z4sHtp6zwMo/OR7fD3berMcJRbSsHMYDVHbOCq5KbrbJTE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653339497; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FY/9m2bfUciW+9b94QolKYkajfJbMNVAwbOW4VNUDuA=; b=nUg8GxOb3icrn/5rnoIcyFAd8ea3p9PEn/+8zenTgCEoa3he/oUuBtZ9eKvdqj115cpUi0ZuPzj4MG3oq79QoRj0K/D4ravvw+d/uk4lsOvir7vsILFIRbxZK9CofnAE4f6Yh22ab3f82vjlRZmnFQVqPmzIWHF+0blpvunk2q0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653339497323689.7444845255375; Mon, 23 May 2022 13:58:17 -0700 (PDT) Received: from localhost ([::1]:46020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntF84-0003tH-4o for importer2@patchew.org; Mon, 23 May 2022 16:58:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntEy3-0008JS-Bn for qemu-devel@nongnu.org; Mon, 23 May 2022 16:47:55 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]:46903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ntEy0-00051M-Lk for qemu-devel@nongnu.org; Mon, 23 May 2022 16:47:54 -0400 Received: by mail-pj1-x102c.google.com with SMTP id v5-20020a17090a7c0500b001df84fa82f8so356372pjf.5 for ; Mon, 23 May 2022 13:47:52 -0700 (PDT) Received: from stoup.. ([71.212.142.129]) by smtp.gmail.com with ESMTPSA id c16-20020a624e10000000b0050dc7628142sm7721788pfb.28.2022.05.23.13.47.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 May 2022 13:47:50 -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=FY/9m2bfUciW+9b94QolKYkajfJbMNVAwbOW4VNUDuA=; b=q2mOQ/7gXRasaJZ0j5wfFTvfn8D7hgG8IkRZxKB0W51H6pRe6PJoe+GKxIKiS4RKUp xA+V8avPrPZe5GbCM67VklBZU8QjeyZh+3a9mh/hDjZg/DD2WVNr/PWGlzvKd8JIEjJ8 yoQ/J5OvUzH/9FWdSNKNP2hx4oP/E1ss4XQwaeM1czWNRu2GMZm5jiagliJXZLBmxjWL 6UImFu5tumloGriaLmmPWrNW6nFyYvMbdlv6ingPACBsmoBklijhNptG4UWGQJ+cwM1p hmlhN74GNhjvYX97yueGBuvRYEWSIT0yMUpSMaRazFlcyrg26lY67hMWTWycQIFVs5Tg 6/ZQ== 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=FY/9m2bfUciW+9b94QolKYkajfJbMNVAwbOW4VNUDuA=; b=uxR070e0fb8NQTFq5/VqV4uxvBnTZYJQM2jUGs+8goSmMZTJVq0UrDoQ0XmTugXDCa aww17IO45TxaCiYczPymaJjbGx5sVEpiXISPprf4N6FJ1KSLJ6rofrbhn2k1IqBrya8n 80KEnIFq5nr19W1D04yz5fwpbf7z1dYfBNwmhY4rb7U/0My4DnzFsBEg9bnu/VE8os7n t41TDFqEJoAzvTr2UUlneTvayt8oGrFSdGpPXpVPWNmmNoJ7i9H+aOveWXmzZcRjMf1d JH42mj+b1CESelQJUs6KT+ukLJ2cAa+aZLqD3GP918vhoGplas9TAHi6VxVoia1Oob2Z JE1Q== X-Gm-Message-State: AOAM532iJXxOmLE5bztjnplLrIztw9CKPheierJU6JAWcQ5IyWuwZ+pJ CXkcq0RPcW4HyMD6HkMS23ey77unlSNhAg== X-Google-Smtp-Source: ABdhPJxf3DVK4Jx/BNmx12Z+1MnZ8StA0Iy4qHtLKOQGDQXZCHA4q678anGULLVWe+ZFiHwSQ/omlw== X-Received: by 2002:a17:90b:4c4d:b0:1df:a164:7055 with SMTP id np13-20020a17090b4c4d00b001dfa1647055mr849515pjb.180.1653338871021; Mon, 23 May 2022 13:47:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 07/18] target/arm: Hoist arm_current_el in arm_generate_debug_exceptions Date: Mon, 23 May 2022 13:47:31 -0700 Message-Id: <20220523204742.740932-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220523204742.740932-1-richard.henderson@linaro.org> References: <20220523204742.740932-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102c.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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1653339498038100001 Content-Type: text/plain; charset="utf-8" Read this value once in the main function, and pass it around between the subroutines. Signed-off-by: Richard Henderson --- target/arm/debug_helper.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c index 20a0e4261a..2bbf065b3a 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -13,9 +13,8 @@ =20 =20 /* See AArch64.GenerateDebugExceptionsFrom() in ARM ARM pseudocode */ -static bool aa64_generate_debug_exceptions(CPUARMState *env) +static bool aa64_generate_debug_exceptions(CPUARMState *env, int cur_el) { - int cur_el =3D arm_current_el(env); int debug_el; =20 if (cur_el =3D=3D 3) { @@ -43,18 +42,16 @@ static bool aa64_generate_debug_exceptions(CPUARMState = *env) return debug_el > cur_el; } =20 -static bool aa32_generate_debug_exceptions(CPUARMState *env) +static bool aa32_generate_debug_exceptions(CPUARMState *env, int cur_el) { - int el =3D arm_current_el(env); - - if (el =3D=3D 0 && arm_el_is_aa64(env, 1)) { - return aa64_generate_debug_exceptions(env); + if (cur_el =3D=3D 0 && arm_el_is_aa64(env, 1)) { + return aa64_generate_debug_exceptions(env, cur_el); } =20 if (arm_is_secure(env)) { int spd; =20 - if (el =3D=3D 0 && (env->cp15.sder & 1)) { + if (cur_el =3D=3D 0 && (env->cp15.sder & 1)) { /* * SDER.SUIDEN means debug exceptions from Secure EL0 * are always enabled. Otherwise they are controlled by @@ -82,7 +79,7 @@ static bool aa32_generate_debug_exceptions(CPUARMState *e= nv) } } =20 - return el !=3D 2; + return cur_el !=3D 2; } =20 /* @@ -99,10 +96,12 @@ static bool aa32_generate_debug_exceptions(CPUARMState = *env) */ bool arm_generate_debug_exceptions(CPUARMState *env) { + int cur_el =3D arm_current_el(env); + if (env->aarch64) { - return aa64_generate_debug_exceptions(env); + return aa64_generate_debug_exceptions(env, cur_el); } else { - return aa32_generate_debug_exceptions(env); + return aa32_generate_debug_exceptions(env, cur_el); } } =20 --=20 2.34.1