Message ID | 20190118145805.6852-22-peter.maydell@linaro.org |
---|---|
State | Not Applicable |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3365238jaa; Fri, 18 Jan 2019 07:10:59 -0800 (PST) X-Google-Smtp-Source: ALg8bN7RkB0hRXx+/+167TTj8+qHIBHDIfrDxecUeZiFvxOn/UmT79O2DZ2t2NoQrt4ivL9w8e+I X-Received: by 2002:adf:ba05:: with SMTP id o5mr16325170wrg.325.1547824259921; Fri, 18 Jan 2019 07:10:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547824259; cv=none; d=google.com; s=arc-20160816; b=CozPSgzI7uFKBfBWJAwWkOMGcnkoUG9zCb/HPHnaDbkAxqKoqzwfI9Kr/9uEqbPl6T WkqT3EO0iPrKcPCAS0ms+NdQ+jMMmS0/aTIvVITUs49dLvA5k+AzYq/h1uY24+Ye0k9U 7ggrEuja1UB5jR9OXaLkLo3eH7YYXnnDFk0FF3xL+OgohZeWiVm+acufv6e+bgowykxg iVqN0Ks7DfGxWpJTHh3bGb/UYPK4WNTQybralqdt9sdLufvCbeKwYHsyzeDQJHoPOo/U ILCubsVf6NcPH9QYVxsJ61QzvyaXGMVBg/KlyXbwd3KDCA3Yj68R8RWdcuFoVSTBDZrl oFbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=5byBY7AtDXInloMLN2x88m1lbpKzf1t22kgvSjUxq4s=; b=x4bGT68i0M0mqnikPO7JH9mSQ5tvGRsucsam/YYF/yxBQIV3awPiQHbXZH004O4Js8 v0w9kfzTwH0pJm5pk33eJLd/v2HWY8vRh79VJtYhtJatxah5+PVP3gt/j+efhXKTfVZy KAp146Em/KJ2IHGQsqeMpO4CskK7OAeMFcTIMqudpwHlmt5jflylS/yUr2vf0/mr/Mh/ TjR4OewE80OdxagoJrzg3zuclJqoDVfTMXOnr2uP7IoBuibOak3Vc/k7GPPJWRLzA5vc dpX7iAfkfPcjxh614NwxId8FATHZ28vOsc4hKA30yEhheOcKsaZH4ZQtd8cztIVbOnh2 HodA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WMhW2oZE; 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b139si28067428wmb.191.2019.01.18.07.10.59 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 18 Jan 2019 07:10:59 -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=WMhW2oZE; 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 ([127.0.0.1]:41142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1gkVnO-0003eR-P2 for patch@linaro.org; Fri, 18 Jan 2019 10:10:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gkVbT-0002lB-SP for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gkVbS-0007Mg-K6 for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:39 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:33770) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gkVbS-0007Ht-B2 for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:38 -0500 Received: by mail-wr1-x42a.google.com with SMTP id c14so15473041wrr.0 for <qemu-devel@nongnu.org>; Fri, 18 Jan 2019 06:58:32 -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=5byBY7AtDXInloMLN2x88m1lbpKzf1t22kgvSjUxq4s=; b=WMhW2oZEFFoLnY6ahKi8kK4ZDel/iZGM+vIkfqsb6IAlAC7Wa3NEMSjT4S5v+p6cCC rPr9CgbAPBOAZnng9WI3CQjopGOEDJuCf2gvFFD5Dch/fG+0hgEWelIUYBXLS9+SQjRh ZiZ4WFKH02oPWHCroJCfsDb9x5sZbodJRgAJc= 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=5byBY7AtDXInloMLN2x88m1lbpKzf1t22kgvSjUxq4s=; b=ayIgXOZ4z/21D9EXCuc4RHdal9y2+FAb3++A61WB3o2ARFCvzRIWXcP+uuUc6TdfDE tRGfRvjjOyb92rOXoVmuFv30rASLLwdMIzcs0WFosgmAD7sdlzENxtsANxBFwEbuEHje kfdBGgmFtwNjkyrlO4Ja/ZJRFtcjDtMwrQ9sbro5jAg7z/bbUZATll5z5AJHEh127gy5 tjV8FHMIeJyREsYPd2RN+FZYWkBcQRj6lguhPLTdPpYxJlSiDNm6bkRLf6o8eYvgSdQE M6/XRs+T0H86VxJzeRQ0mdG87Ny6fhDN//C9126VKec8hRNT+yDaIrJXaAzzDNYDw+gW 9Yhw== X-Gm-Message-State: AJcUukdh8h/8pSyTgcK2ZRCVscN7XhjdY9ULOv0+/xPjfIQUWS81A3qv HncizXB1y51GOqbuIp0B3Qivrx/zxZMhVQ== X-Received: by 2002:a5d:4d11:: with SMTP id z17mr16037891wrt.209.1547823511509; Fri, 18 Jan 2019 06:58:31 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e27sm92094561wra.67.2019.01.18.06.58.30 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jan 2019 06:58:30 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Fri, 18 Jan 2019 14:57:37 +0000 Message-Id: <20190118145805.6852-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118145805.6852-1-peter.maydell@linaro.org> References: <20190118145805.6852-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PULL 21/49] target/arm: Introduce arm_stage1_mmu_idx X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/target/arm/internals.h b/target/arm/internals.h index 89f3b122a49..248fdf7a3c0 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -927,4 +927,19 @@ void arm_cpu_update_vfiq(ARMCPU *cpu); */ ARMMMUIdx arm_mmu_idx(CPUARMState *env); +/** + * arm_stage1_mmu_idx: + * @env: The cpu environment + * + * Return the ARMMMUIdx for the stage1 traversal for the current regime. + */ +#ifdef CONFIG_USER_ONLY +static inline ARMMMUIdx arm_stage1_mmu_idx(CPUARMState *env) +{ + return ARMMMUIdx_S1NSE0; +} +#else +ARMMMUIdx arm_stage1_mmu_idx(CPUARMState *env); +#endif + #endif diff --git a/target/arm/helper.c b/target/arm/helper.c index 36d1832e322..35bbc7f1091 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -12998,6 +12998,13 @@ int cpu_mmu_index(CPUARMState *env, bool ifetch) return arm_to_core_mmu_idx(arm_mmu_idx(env)); } +#ifndef CONFIG_USER_ONLY +ARMMMUIdx arm_stage1_mmu_idx(CPUARMState *env) +{ + return stage_1_mmu_idx(arm_mmu_idx(env)); +} +#endif + void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, target_ulong *cs_base, uint32_t *pflags) {