From nobody Fri Dec 19 17:07:52 2025 Delivered-To: importer@patchew.org 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+importer=patchew.org@nongnu.org; helo=lists.gnu.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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583427410; cv=none; d=zohomail.com; s=zohoarc; b=bVCv6WawrAls2tT3oWdKy/SaN2utr+V+9BqNOsAQRJQRA1Dt2b4EAFq4fjAi6jxh9SsX44ZNlbhbf/N3ZvKFHvbLizrIX/EWu9QljY7W+STB0OnhbI0oAgWM7rgGRM48L3uSXFHM2n9Xcqky+UpOre+KzAlBLTOszPopIpxH/iM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583427410; 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=U58jT/n1eZn27Pw9G4/tDQIY/9rC1vRzTCSEllyVD4I=; b=FGyvZJ8gwa3OKUpsKxg6LResHmlI6gU5otVBIKiI2XvxTzeSvtiKDiaEZYAUj2YkM3IAYhs9oSY5cqc8O2wJEBZsGorCjSpPm/fY90+Xgf46RsZAfISmpbncYSqdb7amethZhr46wkZA+cYIKGjTCe4MeuAB12+zcfBAN4M/gdE= 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+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 15834274104201004.0223207961201; Thu, 5 Mar 2020 08:56:50 -0800 (PST) Received: from localhost ([::1]:53132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9tnk-0004J0-BF for importer@patchew.org; Thu, 05 Mar 2020 11:56:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59554) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9tPQ-0003tu-VF for qemu-devel@nongnu.org; Thu, 05 Mar 2020 11:31:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9tPP-0002s0-SP for qemu-devel@nongnu.org; Thu, 05 Mar 2020 11:31:40 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:53125) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9tPP-0002qz-L8 for qemu-devel@nongnu.org; Thu, 05 Mar 2020 11:31:39 -0500 Received: by mail-wm1-x32c.google.com with SMTP id p9so7066096wmc.2 for ; Thu, 05 Mar 2020 08:31:39 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w22sm10310729wmk.34.2020.03.05.08.31.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2020 08:31:37 -0800 (PST) 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=U58jT/n1eZn27Pw9G4/tDQIY/9rC1vRzTCSEllyVD4I=; b=FKyqsgySfbvki/zlVE5S98pY7I86551Og/0V174lCWlffnxmkQgzAzvhBmi72+SDg8 QuwYvvF3dsZ64XcMK5awnawtNTr4wB9BBuQN8UnuQBsLpLuFH5BeEZ23JqxkQwvHfdr+ gsA3tVf1A5QzmXv/WdDoLTILZsa4vCxjpchr1r13uiV9uUrY745X8iOWgjJ0yXrHCUkj KaIVYasiXgLzgkojNktLK7BR/UW6Q9uXnNXGBghMa/ZCEVZJmT4OVjmdXUMrZ/TQLT33 ZXOCLIzLflQhYiuBzCIKbioNr/I7GH9ylO1RxfOlH0sTTOrLqfp60F7HXAKxZOhzOsFN CcIw== 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=U58jT/n1eZn27Pw9G4/tDQIY/9rC1vRzTCSEllyVD4I=; b=Cq5kNonBonsUnmUYlDIw/5X8wic335yMT5uFcsHZMseajCLGtkS6X0gRocqhHT3TXE pqpNjIJynCrD6WSLg7GekwhB+/6hlkkYjp3GJWVIM4B1OVA7eu54qncGy0KUsDRCRwS1 SMX0TOcPbSJSg+TTfud+u5Q49bukNrzT7fWJbl2O/MysVIiSWZck3M2Mpq01hNiOE6/3 AJ3qSZXM1bPHAeEl1vnm4LztOpHgTExIhO6kGdZhEV+1aI2yRy9t72J+uyQgLW81cewU 4hRMEdtRDxyUP18nd4qMhQmhDmMjet1q7VvryFGYIYud8lBkEDm+CF5VMuqXaULJdRtk WoNw== X-Gm-Message-State: ANhLgQ02BlP44kKSD85p7vku62BEFAlSv70KcIZCFQTM9TkMHp0C7yGW 4Qx1pVcluDNFlNKlI0TQXQy07ah1pHSshA== X-Google-Smtp-Source: ADFU+vtgN33qfdLE9eRkGiLNpcxhHsWMuQA0+V4o8VjdYO3buzNuSql0IJ2hN8qf5QmZZ5TN4cGBlw== X-Received: by 2002:a1c:4b0d:: with SMTP id y13mr10711393wma.4.1583425898368; Thu, 05 Mar 2020 08:31:38 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 33/37] target/arm: Introduce core_to_aa64_mmu_idx Date: Thu, 5 Mar 2020 16:30:56 +0000 Message-Id: <20200305163100.22912-34-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200305163100.22912-1-peter.maydell@linaro.org> References: <20200305163100.22912-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::32c 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 If by context we know that we're in AArch64 mode, we need not test for M-profile when reconstructing the full ARMMMUIdx. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell Message-id: 20200302175829.2183-4-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/internals.h | 6 ++++++ target/arm/translate-a64.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index 9f96a2359f3..e633aff36ef 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -783,6 +783,12 @@ static inline ARMMMUIdx core_to_arm_mmu_idx(CPUARMStat= e *env, int mmu_idx) } } =20 +static inline ARMMMUIdx core_to_aa64_mmu_idx(int mmu_idx) +{ + /* AArch64 is always a-profile. */ + return mmu_idx | ARM_MMU_IDX_A; +} + int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx); =20 /* diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 579180af0a9..c910a49b4e0 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -14300,7 +14300,7 @@ static void aarch64_tr_init_disas_context(DisasCont= extBase *dcbase, dc->condexec_mask =3D 0; dc->condexec_cond =3D 0; core_mmu_idx =3D FIELD_EX32(tb_flags, TBFLAG_ANY, MMUIDX); - dc->mmu_idx =3D core_to_arm_mmu_idx(env, core_mmu_idx); + dc->mmu_idx =3D core_to_aa64_mmu_idx(core_mmu_idx); dc->tbii =3D FIELD_EX32(tb_flags, TBFLAG_A64, TBII); dc->tbid =3D FIELD_EX32(tb_flags, TBFLAG_A64, TBID); dc->current_el =3D arm_mmu_idx_to_el(dc->mmu_idx); --=20 2.20.1