From nobody Thu Dec 18 22:21:37 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1571752178; cv=none; d=zoho.com; s=zohoarc; b=hBPb1pF3kDFj8m1DDxsSGEszDQW5uPAmHsVwX+rhmEO5Q+sJBQfbayn7vwMAM1zBm1g3+z3vNT+9kXBrQecF8ly+dvLe9xmcuN9qhifc8aUPXbYK2XClhiZ2A6a28oQvu3dOtN6xlQ0BKPdRq3UVrw/IXPVqAjEWR2Ym/o0armE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571752178; h=Content-Type:Content-Transfer-Encoding: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=BWBhqaHT6GxtdOFufe6tBUWH35ddd8XEs+xAm5zDJYo=; b=UV1JDwenM2PD7mYZn985/2hjPN7yL51biyS7eCksAfnFXyXr9oG+Jk219k7BMy4p5NkVkJSmNg5XCgarFEVHxaOsSkHO5kB5b1vOS1TPK2pVEGltfUP025P59UXuTB7+iUucV5jpQLYnTVoZsQRbEcN16+5Jui6MmRi/ZOc6oHs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1571752178442994.2735120228327; Tue, 22 Oct 2019 06:49:38 -0700 (PDT) Received: from localhost ([::1]:57696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuXW-0005ao-GN for importer@patchew.org; Tue, 22 Oct 2019 09:49:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36850) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuGt-0002nI-UP for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMuGs-0001LE-Mb for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:23 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:41525) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMuGs-0001KB-GO for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:22 -0400 Received: by mail-wr1-x442.google.com with SMTP id p4so18098506wrm.8 for ; Tue, 22 Oct 2019 06:32:22 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r2sm20263856wma.1.2019.10.22.06.32.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:32:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=BWBhqaHT6GxtdOFufe6tBUWH35ddd8XEs+xAm5zDJYo=; b=ChjA06Mjs77Lz1pNn0SauLjs1aNQ4JlOWfXdPWOxYMxPaC3f1hG4QBSQwiSv89s6Ns PmA9rhairAiLrO6KATD/8MwYWwDOvowWnIOuusVfzEDMar3mHOP9aEhkFQb5kKASpGhR qXYrblqelxnL5ecg+MiojmmoOpoYulafafUOqM92/X5K2HXoOH9odlkcsvYYiV5SIWeA kz7RsP0PqMUSyUiZIOP5pXJU5yrmWGZFZY9yyYOKWRjR715h9kPlKz4SujpjRd0nTG4/ iSPVLwRB4O0yruGRz01qDzeY1yQtnpDTXCnN5SKxN1qrWKaLPEMzszRIIMDyqc5yNYAF VPoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BWBhqaHT6GxtdOFufe6tBUWH35ddd8XEs+xAm5zDJYo=; b=khthkiMPS+hIQrgazLjeHCvY3eueO6kHzqGDTL1DQ8uBOMTkBdC2ezg7k3kgr+hzfs J+THjL0bmVd9Ifs7si539i5A/9Ti9R4Gg0JKmjozJ9z64AKRenOVbI+P7ooQZdn8Y3Dm Zahpjb5z03jKSeHbBr+nlKQ0cadgk6Fyqvgo3A9xCSrxlCDn4qMd2vGy14A67ETdirRj 4MbnH5ZJ2B9oBb3oX+ktlbrshEzqyWum1x60ryvSm7KBd70GrqO+iUTrHDy3ObFkaOkN ZgnQzrl8uijURkK4YZxdcmcW5Kes2IciDQgv17n31DVEwfoPQIwqkVDLger9yaqEzUMb 0X8w== X-Gm-Message-State: APjAAAUayxIDPIC9MeIQefS/JlHmLPjpcArjqpiKijhlkc9H6xkK1e84 azq4jn5Tnj7iO2wGtwn4gEkFIpF3yG8= X-Google-Smtp-Source: APXvYqzkREi5mBGFv1E8nESnaqAyu8EIpiN2Qo4/RK6TRUJOhMcuCx+F3f0xL1knMlklyenrX2fK6A== X-Received: by 2002:adf:e9c7:: with SMTP id l7mr3573891wrn.57.1571751141024; Tue, 22 Oct 2019 06:32:21 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 18/41] target/arm: Split out rebuild_hflags_aprofile Date: Tue, 22 Oct 2019 14:31:11 +0100 Message-Id: <20191022133134.14487-19-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191022133134.14487-1-peter.maydell@linaro.org> References: <20191022133134.14487-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Richard Henderson Create a function to compute the values of the TBFLAG_ANY bits that will be cached, and are used by A-profile. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson Message-id: 20191018174431.1784-9-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index d1cd54cc931..ddd21edfcf1 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11106,18 +11106,28 @@ static uint32_t rebuild_hflags_m32(CPUARMState *e= nv, int fp_el, return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); } =20 +static uint32_t rebuild_hflags_aprofile(CPUARMState *env) +{ + int flags =3D 0; + + flags =3D FIELD_DP32(flags, TBFLAG_ANY, DEBUG_TARGET_EL, + arm_debug_target_el(env)); + return flags; +} + static uint32_t rebuild_hflags_a32(CPUARMState *env, int fp_el, ARMMMUIdx mmu_idx) { - return rebuild_hflags_common_32(env, fp_el, mmu_idx, 0); + uint32_t flags =3D rebuild_hflags_aprofile(env); + return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); } =20 static uint32_t rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, ARMMMUIdx mmu_idx) { + uint32_t flags =3D rebuild_hflags_aprofile(env); ARMMMUIdx stage1 =3D stage_1_mmu_idx(mmu_idx); ARMVAParameters p0 =3D aa64_va_parameters_both(env, 0, stage1); - uint32_t flags =3D 0; uint64_t sctlr; int tbii, tbid; =20 @@ -11262,12 +11272,6 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target= _ulong *pc, } } =20 - if (!arm_feature(env, ARM_FEATURE_M)) { - int target_el =3D arm_debug_target_el(env); - - flags =3D FIELD_DP32(flags, TBFLAG_ANY, DEBUG_TARGET_EL, target_el= ); - } - *pflags =3D flags; *cs_base =3D 0; } --=20 2.20.1