Message ID | 20190118145805.6852-25-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 69csp3380273jaa; Fri, 18 Jan 2019 07:24:19 -0800 (PST) X-Google-Smtp-Source: ALg8bN50wK/rqDdJn/+yDqhJXmunDcXu9gj0LWyYWe0BIwR6BYU4CJm1G68eIRdfOw6IwoztpMMN X-Received: by 2002:a5d:4a0c:: with SMTP id m12mr16748818wrq.38.1547825059835; Fri, 18 Jan 2019 07:24:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547825059; cv=none; d=google.com; s=arc-20160816; b=ATfqxKEfzXPWqbqBUlaxIPLZB5jSLUFi4WAbFLeyzMvJu1pSAizsecHM28zz5oMHRB QHnSUuw0W+JdzSeJQG0UjsWGaYhFEYgctqj6PI6KRvKFZleqpmObBsBscQVKF02YQOl6 4rjiDJG6y/dhkBi/KWIGN80e5ep79cQP+scOXP2p4KKosCVosdxAN1uMOUeqifxFH8MM ldKHgdWK9nPLajTm0LrOiP3yjDvE8SECD9yrOFldVY9kmJEpwtCU7n5I6zJdcDCfgQCH tosIslmiIYpXzuIye7p/DDAWlzddZQgXb6LGYzXhitzE2e8vFj+Qf53J3mvClkZB93Fd JUGg== 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=qeVpixFLfnxn+mUTC5XuJFnTpMxObaIQ7iUYBPs+ha4=; b=WrOvjhuwh86sh/jV/PJ2psNmerczbT2c14E7dXzlf9jj1Cd0E1zFGjpOvu8Hzw01Qa /+hGuJ8lRPSOOL/8+OJCkk2sfAAW3HJdFATCwhr2OWGDCsk0oojxxGGQuVwv9e3JIaKm SRV0F1QQ5W8DbLrr29oIFZ2stxfP67w81TG8A6+I7XunLyJHcVMBYDZycJBoXGZ6f5uK wyZWxRo8cGko6mQcDMXktMm1Xo+T2sM0nrLTKNVpyfRrHXIPGpLhhxwm5y+jlCWpMswO cem4jbtefueLumCh4vp2fyqQFiJ6UQAzkuAYdKxiYj7K7wObrDQ9SyH5bSBA9KYuefor rQyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fLkzWWVa; 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 s20si49368347wrf.249.2019.01.18.07.24.19 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 18 Jan 2019 07:24:19 -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=fLkzWWVa; 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]:41360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1gkW0I-0006lI-Oi for patch@linaro.org; Fri, 18 Jan 2019 10:24:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gkVbV-0002mW-In for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gkVbT-0007OI-Cy for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:41 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:40050) 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-0007Jt-1e for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:39 -0500 Received: by mail-wr1-x42c.google.com with SMTP id p4so15417773wrt.7 for <qemu-devel@nongnu.org>; Fri, 18 Jan 2019 06:58:36 -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=qeVpixFLfnxn+mUTC5XuJFnTpMxObaIQ7iUYBPs+ha4=; b=fLkzWWVaUA0mj+gxdRUro4xuHq7PRWDnbpIIDDgUF94oWQaQEshYXd6llshJobpaF4 pWvxVP7sVX53JbNprHKRBp+xkz8jwxVB++ROdZz4ygEhgsLOpZodjtDfouI7VPwxApdY +Vj4pe1AsTWuvxpsVCsa6cX3rGZxfNoK1x45E= 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=qeVpixFLfnxn+mUTC5XuJFnTpMxObaIQ7iUYBPs+ha4=; b=FdeZDg1ESZsoAxQ6qQ5FXrbOqqNQaCu+pXmanl4bPRN0Zi1EfL32lxnqenGlsXLxY7 ktckJwsWqcjDLdzNk6g+Y6dyI9I/mUJpvHfYZ3qNIvjSDnWO9xEDrt8/Ys7GWB8vQamY c81g7f4zH019JAD+lVAMyC5C59l8eALqlptPID/dpDL4nG3vjpSC+LEv+vtB1RtTtFvt CE9Zhz+UuFlP72UMswKJrXcG14jUfZxPLZqdFyzVbicVhMTqXZVC58CWfVuKMfx5LU1W twcZ/+fxHomZREcgDfgqH50yG7rLrV6X8IyRC5x3lw0Nx0m9ztqk3WtapbD8vdTIHB/0 QPwQ== X-Gm-Message-State: AJcUukeYoF8LNysEGBpUchroHh2kNvgh7s1qQiyx3UxNBDiyQwroXL3C jPBiUIHmt3uD4lqmk6B1hy86UgdAIIquIw== X-Received: by 2002:adf:e911:: with SMTP id f17mr17933471wrm.126.1547823515150; Fri, 18 Jan 2019 06:58:35 -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.34 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jan 2019 06:58:34 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Fri, 18 Jan 2019 14:57:40 +0000 Message-Id: <20190118145805.6852-25-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::42c Subject: [Qemu-devel] [PULL 24/49] target/arm: Export aa64_va_parameters to internals.h 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 fdda2c866a3..82cf6856957 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -956,4 +956,21 @@ typedef struct ARMVAParameters { bool using64k : 1; } ARMVAParameters; +#ifdef CONFIG_USER_ONLY +static inline ARMVAParameters aa64_va_parameters(CPUARMState *env, + uint64_t va, + ARMMMUIdx mmu_idx, bool data) +{ + return (ARMVAParameters) { + /* 48-bit address space */ + .tsz = 16, + /* We can't handle tagged addresses properly in user-only mode */ + .tbi = false, + }; +} +#else +ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va, + ARMMMUIdx mmu_idx, bool data); +#endif + #endif diff --git a/target/arm/helper.c b/target/arm/helper.c index 97a24ed5908..0f197d2dd1b 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -9744,8 +9744,8 @@ static uint8_t convert_stage2_attrs(CPUARMState *env, uint8_t s2attrs) return (hiattr << 6) | (hihint << 4) | (loattr << 2) | lohint; } -static ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va, - ARMMMUIdx mmu_idx, bool data) +ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va, + ARMMMUIdx mmu_idx, bool data) { uint64_t tcr = regime_tcr(env, mmu_idx)->raw_tcr; uint32_t el = regime_el(env, mmu_idx);