From nobody Mon Apr 7 16:41:19 2025 Delivered-To: importer@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+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1654769364; cv=none; d=zohomail.com; s=zohoarc; b=mj/luwfEMVLNrd6LT3tP9YVirqZWp3moUZuK3pRN+XWenwK4ZzXMwoGDJjfJay1kRSfk0ZdH1B53RjeScYFuQn0mTvUSwPQA1ILsv7wg3nRSh6bXidO2Oehs/sFX+IxEzlfXtObiI07UmQXmMnsSTYOyGrg6wdHkVJXCQZnqdmw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654769364; h=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=JfidimcrBCl7Udx4o3Zs0c4uqkOTceip308AFLIscT0=; b=hXw+wxy3TNTXiFgY4vHLDt5eft1qZriLZKJ7IUhbQDISQa7Vm+8yWbVH6TmOc1zn66gT47BryulhRuUc6EpT02VmDXl26yqpoG1a+5J7Pfd7GOC/ORb4axs/eLxuZD38iPRrQDNGsHAZE6E5KwW/ok4Dc7HwGBnL4eLok7sDUxU= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1654769364478736.5837923511054; Thu, 9 Jun 2022 03:09:24 -0700 (PDT) Received: from localhost ([::1]:55902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzF6Q-0003sd-Vt for importer@patchew.org; Thu, 09 Jun 2022 06:09:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39714) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzE7Q-0001ZD-Fe for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:06:22 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:46819) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nzE7O-0005xd-3T for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:06:19 -0400 Received: by mail-wr1-x435.google.com with SMTP id u8so27137707wrm.13 for ; Thu, 09 Jun 2022 02:06:17 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id c13-20020adffb0d000000b002183cf9cd69sm11349796wrr.15.2022.06.09.02.06.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 02:06:16 -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=JfidimcrBCl7Udx4o3Zs0c4uqkOTceip308AFLIscT0=; b=iORuARJVwwG7cRteZ+Qo+xAm0B1S0qTOkFSIP6hNa+Q/+4XQD1BqHnlgTY6I1Hqn5V NvFBRrtYowDAoCPbjMFu83+vb/URbr42RhRLADK7OuFcMEGrpraphyUonXtKkuW/vOO+ TueQaJJ/ZUtzCgHeNFofW0s7bacFbhfJjulrVRMM2yr34E9dVkvAhISr5CKe7pWPkyiJ spyIgYgh0TSGs+6MWLcSqXQk8KyRNCFUqnoUupUfsmTWG/qajhCGMdCJt+YBGZLb4ORe YUE1sJcLIvC8oL/ou/RfwpmACDszrX3g+sAuq2Tkm972tYWebBCGv52k7r1dDTj716bL 4fGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JfidimcrBCl7Udx4o3Zs0c4uqkOTceip308AFLIscT0=; b=bIf14kmcdpLXwpbqRMnjLMNOFymLt18QJ86AtxqUtmefys/u4L6nM4sV+RbIbDxgwH IK4mycYjBwht8Bjr0d9pS8EZ5UjK8zivDXvrFfSyP+Y0meCxVwiJ/dDgijomWQ95Dif4 K/88Kdnb+RZQ9E1zJMV6oPKh5JsqFxKSMSNmzOnPf/9P7WQmY+jFV833f+yZ7uBqRLRe ED2yS/Nuhv5e9grX8Hguu0WAEZdLvd14p+bIrIbVD4eogSbfNhy0yKP3qSTt92sReYEp ZDnGhIDjoSMIleECNP53ptLIyOKBahmwhAiRTu/zARrKAIi+YTU/G7r5eP0geSe1x5Nz CenQ== X-Gm-Message-State: AOAM533kTccI2d9uUzlmfjy5EHB6RJMmAxPaT+HIE5LJTLPnJo2cgWk7 jvwMvZUl2kAvG2elO+5DYhIPUbkNVurKaA== X-Google-Smtp-Source: ABdhPJxAPsi2WdTm2vuR2Y/R5HoxJTQVzLgHXwzFy62yU4Q72BrmOkUX+MnHjsZ1khtuMPAqJtCnlA== X-Received: by 2002:a5d:6dd1:0:b0:210:7a1:cda0 with SMTP id d17-20020a5d6dd1000000b0021007a1cda0mr37329039wrz.570.1654765576678; Thu, 09 Jun 2022 02:06:16 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 33/55] target/arm: Move arm_cpu_get_phys_page_attrs_debug to ptw.c Date: Thu, 9 Jun 2022 10:05:15 +0100 Message-Id: <20220609090537.1971756-34-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220609090537.1971756-1-peter.maydell@linaro.org> References: <20220609090537.1971756-1-peter.maydell@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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x435.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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1654769366071100001 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Signed-off-by: Richard Henderson Message-id: 20220604040607.269301-27-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/helper.c | 26 -------------------------- target/arm/ptw.c | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 69b1c060c1f..fe1e426f883 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10606,32 +10606,6 @@ ARMVAParameters aa64_va_parameters(CPUARMState *en= v, uint64_t va, }; } =20 -#ifndef CONFIG_USER_ONLY -hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, - MemTxAttrs *attrs) -{ - ARMCPU *cpu =3D ARM_CPU(cs); - CPUARMState *env =3D &cpu->env; - hwaddr phys_addr; - target_ulong page_size; - int prot; - bool ret; - ARMMMUFaultInfo fi =3D {}; - ARMMMUIdx mmu_idx =3D arm_mmu_idx(env); - ARMCacheAttrs cacheattrs =3D {}; - - *attrs =3D (MemTxAttrs) {}; - - ret =3D get_phys_addr(env, addr, MMU_DATA_LOAD, mmu_idx, &phys_addr, - attrs, &prot, &page_size, &fi, &cacheattrs); - - if (ret) { - return -1; - } - return phys_addr; -} -#endif - /* Note that signed overflow is undefined in C. The following routines are careful to use unsigned types where modulo arithmetic is required. Failure to do so _will_ break on newer gcc. */ diff --git a/target/arm/ptw.c b/target/arm/ptw.c index ec60afd9bff..e9f6870d0a6 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -2491,3 +2491,27 @@ bool get_phys_addr(CPUARMState *env, target_ulong ad= dress, phys_ptr, prot, page_size, fi); } } + +hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, + MemTxAttrs *attrs) +{ + ARMCPU *cpu =3D ARM_CPU(cs); + CPUARMState *env =3D &cpu->env; + hwaddr phys_addr; + target_ulong page_size; + int prot; + bool ret; + ARMMMUFaultInfo fi =3D {}; + ARMMMUIdx mmu_idx =3D arm_mmu_idx(env); + ARMCacheAttrs cacheattrs =3D {}; + + *attrs =3D (MemTxAttrs) {}; + + ret =3D get_phys_addr(env, addr, MMU_DATA_LOAD, mmu_idx, &phys_addr, + attrs, &prot, &page_size, &fi, &cacheattrs); + + if (ret) { + return -1; + } + return phys_addr; +} --=20 2.25.1