From patchwork Fri Oct 11 15:55:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 175988 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp943721ill; Fri, 11 Oct 2019 08:59:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqxuP0lSrqfmKHG7L+pjuo/QjqirbVfj70AkZ3zv2T8zCE5+8z13JCJJSUqOjmSiWVu15/NX X-Received: by 2002:ae9:c302:: with SMTP id n2mr15710599qkg.69.1570809575305; Fri, 11 Oct 2019 08:59:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570809575; cv=none; d=google.com; s=arc-20160816; b=Kh6ZFWi5L4S4IXfkyAQrY5BONcvBalsYQCphSM0elzGHnW9jKUm0tLhmQEn1Nh8a5B iLL3ZRKUdqvjPCZXDMcKuJCK9ef9AwOAS7ZK3OUtaAw198hgzBPiWp7LEefzw44OAeFJ NadFJjt9KfL3OGGI8eN9yUyP5WJ9aPy8AZNyclIKfsWakP+YrfEZV8B3n+NlJHeW9WMV 9fkA2Mk9cIw3LIwtbJyUoKvKrevxjwBLb/mOAEE0+vuAYdnVdG5SAFZfrxj6um4UR9OY i+FZq9JcPC4U2NK77eGxMkJZ/kzgykQfEG6SksEvdpduv2tvIHqIoFnhdGYYCyQ2qLvX /dpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=X98g4BsONciVZ3hWGnQlafESmVIuzpNrlu/v750SDKY=; b=zTxtURMAN4AtYWbskp/nltumh9qxPZUOlWSQCBoUk8JACb6XRzxYywrMzucBygkYwJ pl44MfKUT6PYStrvabZWmJFOejvsjC3xKtuPinQrucvZXtfxGpmJmXrg0BPjZBJiY/Gl xyI3YpG7cANb0nLxQBSNDwP2Ueu6OuuiwYGIxMkMjHKGDC4FgMhGkOjL9afxA0AuUyDR iuaR0pj5JtyoFmBFhIB4qkNcJJu1dzhFfwzaz9DoOF1Peo/y3DQCK9j6ATIMYvBAnUuu qLOHiEF6qz0qTlQggVTZVNcf3myLRGUr0PnnYzc1VVoZJQ6MLSEMh5ijhbO5Y+YQ469W myew== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wS7Ogpgp; 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: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e8si9609850qtk.87.2019.10.11.08.59.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Oct 2019 08:59:35 -0700 (PDT) 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=wS7Ogpgp; 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 ([::1]:52838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxKI-0006K1-7F for patch@linaro.org; Fri, 11 Oct 2019 11:59:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33597) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIxGm-0002HP-0Q for qemu-devel@nongnu.org; Fri, 11 Oct 2019 11:55:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIxGj-0007aV-Lz for qemu-devel@nongnu.org; Fri, 11 Oct 2019 11:55:55 -0400 Received: from mail-yw1-xc41.google.com ([2607:f8b0:4864:20::c41]:36708) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iIxGj-0007a2-IN for qemu-devel@nongnu.org; Fri, 11 Oct 2019 11:55:53 -0400 Received: by mail-yw1-xc41.google.com with SMTP id x64so3651619ywg.3 for ; Fri, 11 Oct 2019 08:55:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=X98g4BsONciVZ3hWGnQlafESmVIuzpNrlu/v750SDKY=; b=wS7Ogpgplyc/4NSq2H5jSIQ8GdEEb1rDD02/9GzuYtvMVQeSdl4pXR3/jGAPWVU1gR ghg/yN6wHmcIi2M22DUUZ0vRxmWFoJyw8hi3wRMnJLqedGOHyj6Jfc1mfPaOIv7PtPR1 Eg49nnnObo7euxACvyhZYNMZnuvwu1JCTlwIY1d+yrypdV68xxhW8EmgK/VcQn4ukz6B rig6enWoDt6W4u01vShVXT7srNViCxlw7x1YM1SMx/fv+jorW9GHeAM4+ZBsOjOjASIo xRFwTkl4JaXq6lXOofB51gOn8OBl+DNCRvw5d6aktgbmAG9i47TnrnOnmI+VGe/7HqV6 MIHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=X98g4BsONciVZ3hWGnQlafESmVIuzpNrlu/v750SDKY=; b=lvfppu+ALNeLcij5jeEYdAxcqapU7eRWcizir4zlzgpwKP1+5D1mPnH/rgbz5eYnyS F8CwO7veeGRGivn+I/4yqgcSD4W92kA+Pm/MRcbGaC5TTEQnKFP5ou0WZkvVf7GRo0ra PIP5YItVdm0nTEAt0t2/CbEa2P2irhbFDcoaTX2mCv0Xud1if7KM5Yzs53/BzP88P3hU c7AynZdcMP3Ue4BHDq4Hww7lOOZYV1z5IlPnWTD9CLAQP+gPGSQXlw5IKyT/PZF102PF +rAD4nT2at/8e6FDYSmvVJQk91mcgvWRpbWLMzS93543ICVWCNKkHmzSkP6aGSTMkpzo EO9w== X-Gm-Message-State: APjAAAX4D0Vnpx5wO8ubnf9NlqtM8thqTA1w4LqGdyT6jvkC+CyNxltE nqT3o0FEu31rgMF9XbS6y1xqWmprfmE= X-Received: by 2002:a81:8282:: with SMTP id s124mr2993235ywf.498.1570809352608; Fri, 11 Oct 2019 08:55:52 -0700 (PDT) Received: from cloudburst.gateway.pace.com (67.216.151.25.pool.hargray.net. [67.216.151.25]) by smtp.gmail.com with ESMTPSA id d17sm2473139ywb.95.2019.10.11.08.55.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2019 08:55:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v6 04/20] target/arm: Split arm_cpu_data_is_big_endian Date: Fri, 11 Oct 2019 11:55:30 -0400 Message-Id: <20191011155546.14342-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011155546.14342-1-richard.henderson@linaro.org> References: <20191011155546.14342-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c41 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: , Cc: laurent.desnogues@gmail.com, peter.maydell@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Set TBFLAG_ANY.BE_DATA in rebuild_hflags_common_32 and rebuild_hflags_a64 instead of rebuild_hflags_common, where we do not need to re-test is_a64() nor re-compute the various inputs. Signed-off-by: Richard Henderson --- target/arm/cpu.h | 49 +++++++++++++++++++++++++++------------------ target/arm/helper.c | 16 +++++++++++---- 2 files changed, 42 insertions(+), 23 deletions(-) -- 2.17.1 Reviewed-by: Alex Bennée diff --git a/target/arm/cpu.h b/target/arm/cpu.h index ad79a6153b..4d961474ce 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3108,33 +3108,44 @@ static inline uint64_t arm_sctlr(CPUARMState *env, int el) } } +static inline bool arm_cpu_data_is_big_endian_a32(CPUARMState *env, + bool sctlr_b) +{ +#ifdef CONFIG_USER_ONLY + /* + * In system mode, BE32 is modelled in line with the + * architecture (as word-invariant big-endianness), where loads + * and stores are done little endian but from addresses which + * are adjusted by XORing with the appropriate constant. So the + * endianness to use for the raw data access is not affected by + * SCTLR.B. + * In user mode, however, we model BE32 as byte-invariant + * big-endianness (because user-only code cannot tell the + * difference), and so we need to use a data access endianness + * that depends on SCTLR.B. + */ + if (sctlr_b) { + return true; + } +#endif + /* In 32bit endianness is determined by looking at CPSR's E bit */ + return env->uncached_cpsr & CPSR_E; +} + +static inline bool arm_cpu_data_is_big_endian_a64(int el, uint64_t sctlr) +{ + return sctlr & (el ? SCTLR_EE : SCTLR_E0E); +} /* Return true if the processor is in big-endian mode. */ static inline bool arm_cpu_data_is_big_endian(CPUARMState *env) { - /* In 32bit endianness is determined by looking at CPSR's E bit */ if (!is_a64(env)) { - return -#ifdef CONFIG_USER_ONLY - /* In system mode, BE32 is modelled in line with the - * architecture (as word-invariant big-endianness), where loads - * and stores are done little endian but from addresses which - * are adjusted by XORing with the appropriate constant. So the - * endianness to use for the raw data access is not affected by - * SCTLR.B. - * In user mode, however, we model BE32 as byte-invariant - * big-endianness (because user-only code cannot tell the - * difference), and so we need to use a data access endianness - * that depends on SCTLR.B. - */ - arm_sctlr_b(env) || -#endif - ((env->uncached_cpsr & CPSR_E) ? 1 : 0); + return arm_cpu_data_is_big_endian_a32(env, arm_sctlr_b(env)); } else { int cur_el = arm_current_el(env); uint64_t sctlr = arm_sctlr(env, cur_el); - - return (sctlr & (cur_el ? SCTLR_EE : SCTLR_E0E)) != 0; + return arm_cpu_data_is_big_endian_a64(cur_el, sctlr); } } diff --git a/target/arm/helper.c b/target/arm/helper.c index f05d042474..4c65476d93 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11061,9 +11061,6 @@ static uint32_t rebuild_hflags_common(CPUARMState *env, int fp_el, flags = FIELD_DP32(flags, TBFLAG_ANY, MMUIDX, arm_to_core_mmu_idx(mmu_idx)); - if (arm_cpu_data_is_big_endian(env)) { - flags = FIELD_DP32(flags, TBFLAG_ANY, BE_DATA, 1); - } if (arm_singlestep_active(env)) { flags = FIELD_DP32(flags, TBFLAG_ANY, SS_ACTIVE, 1); } @@ -11073,7 +11070,14 @@ static uint32_t rebuild_hflags_common(CPUARMState *env, int fp_el, static uint32_t rebuild_hflags_common_32(CPUARMState *env, int fp_el, ARMMMUIdx mmu_idx, uint32_t flags) { - flags = FIELD_DP32(flags, TBFLAG_A32, SCTLR_B, arm_sctlr_b(env)); + bool sctlr_b = arm_sctlr_b(env); + + if (sctlr_b) { + flags = FIELD_DP32(flags, TBFLAG_A32, SCTLR_B, 1); + } + if (arm_cpu_data_is_big_endian_a32(env, sctlr_b)) { + flags = FIELD_DP32(flags, TBFLAG_ANY, BE_DATA, 1); + } flags = FIELD_DP32(flags, TBFLAG_A32, NS, !access_secure_reg(env)); return rebuild_hflags_common(env, fp_el, mmu_idx, flags); @@ -11122,6 +11126,10 @@ static uint32_t rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, sctlr = arm_sctlr(env, el); + if (arm_cpu_data_is_big_endian_a64(el, sctlr)) { + flags = FIELD_DP32(flags, TBFLAG_ANY, BE_DATA, 1); + } + if (cpu_isar_feature(aa64_pauth, env_archcpu(env))) { /* * In order to save space in flags, we record only whether