From patchwork Tue Oct 22 13:31:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 177177 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp4890612ill; Tue, 22 Oct 2019 06:48:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqz1yE2a7qVIXhnhZljXC6Hb3ZQC3GNAkk+Zh2NIK5Hi2sakFzzMhSCiqb0QP5cz8jJlvdka X-Received: by 2002:a37:5b46:: with SMTP id p67mr3058044qkb.318.1571752115843; Tue, 22 Oct 2019 06:48:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571752115; cv=none; d=google.com; s=arc-20160816; b=cYmde2jBiTElRvcV5wQnGiGp+7UxuKZYku1dCCnU77Pf6OhiU191oGgaQJIRo192qG M6HYv5YizwJGBuuX/lqcSgZ1mxIu5pLOGZKls3lukJWlQ8VdYp0laqOoatzWJpHtlWey NkVnuzvjbEdgLel3zAm4b/dBbqObSlHXIvS+WsdXqhFhVwrEaxZL/2BEKTEkMw4LRinP cjLMV+Vzo3jmsg+/W8kIjlgW3aFhZXoLHeIEMrzyL1Bh+bREo1KKS0/acn+BONhhjcyB D2pYJjoEgNaeePcFt71GTTwVWv6XeW/2H5rdlj3+hxBIZds9scAg2/UvRx+WwUt7Rl4p tqZA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=qHBbFwWpTe9roVO0og+7rDfMnZMMxLAZ2erc0L9NCXQ=; b=sCbeAlSet5f71BwCRUnX2hyJq1IonXEGHEZ7vW2Tf90nsQQNtigHAsK+tjGVH5pOpq 6YeL7ezHQ2nDaWUlBozPIh0AQqLwmToJx8UkZThgJM5xjA73EAu1OImyqjUQ8HynkPfn 7jXqYeOB9RepATgLfPsLwxxRdl0qhYQQRqcN7IszgBwjSBI4P9jXqwsN27Yei3ZZNpkM /5Lg5UIYQo/AHYEz2yORg7UaPoLD56zj+VnVxf2x03IRbaoj8Q+cAkyaeV9umYg/NRrP 71ce2dbmLfO1jasUDqXF3dLH85GAJc8bva87sRkbDggwBjkoHJnjKVv86aaPmXv9l2IB B6ZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yzPCQ5Yq; 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=pass (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 b24si15192422qkl.27.2019.10.22.06.48.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2019 06:48: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=pass header.i=@linaro.org header.s=google header.b=yzPCQ5Yq; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuWY-0005PN-RG for patch@linaro.org; Tue, 22 Oct 2019 09:48:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36749) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuGj-0002bA-Dg for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMuGi-0001GX-6c for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:13 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:34647) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMuGi-0001GK-0S for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:12 -0400 Received: by mail-wm1-x343.google.com with SMTP id v3so4015437wmh.1 for ; Tue, 22 Oct 2019 06:32:11 -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=qHBbFwWpTe9roVO0og+7rDfMnZMMxLAZ2erc0L9NCXQ=; b=yzPCQ5Yq8nEOBeKJM0TAPSJi+P15qxM5/ZwxiA611iwg+Wn3HitkINS2Q9hfoZZozS LG/vvVSMdHkxnqr0AYugCqzMg17MhQ19KFx5yAvCjzLxQ+13hKcMuhYBLkMEjyu/V+4X Yj+ebfav5zg6GsqYkQ7yPHbGIodxHnf/7WXXMSWHP58DJofFKXNG/+TW8IWRAWojXLE8 ltdK31IrzQ/XH5rjKlvyES3eKQ3tJke74uTqbw1SsQ0X+2hNJt3KxYMBOBLtlMdAn/iu XZHT6CKH/jguv089BTOuhziHTi6zgspxBd8cyg50y8H9acMp4yuMT7JqTns9dfsYJhcl 6fQA== 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=qHBbFwWpTe9roVO0og+7rDfMnZMMxLAZ2erc0L9NCXQ=; b=WT7M1h55USJfI6Suo/UOuma3Z7QbIeYjTfVLDRoQ8oQqCpRAapW5PRilmLF/iRQBJz iacSKyElIZIC08h7TL7bCWUR7d6Zn9NneYFJYiHe0UsopdOcUQs1jlffIzTKUWXENoZX 3zCDtdUlB5eahAQvyLVf3FW7ooKt5j8XVJgp/g5XN1TQ1iDRx0jUVAkUckwjKgpbVM2T 3uSxd/vnu9diUKnBFABULxfd61cqdtGb4VAM11KNP9S/UXY77mgLNubMWsDSGYvkoKpZ +YeseW1sC5KjXvjsqKG8FroZtsbnYFVqt6ZNiHHvvp9Z83r5J1bvbaMo5lSy1qiorVwK 5XzA== X-Gm-Message-State: APjAAAUUSWDcFeZROPVOMhUb8/S1EC7EsI/iWsSEk868ahWT1KvlscD2 Ai+ocmB7WZ5BLCM4QYYdM1O1x+oDmc8= X-Received: by 2002:a7b:c924:: with SMTP id h4mr3206806wml.46.1571751130503; Tue, 22 Oct 2019 06:32:10 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id r2sm20263856wma.1.2019.10.22.06.32.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:32:09 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/41] target/arm: Split out rebuild_hflags_common_32 Date: Tue, 22 Oct 2019 14:31:06 +0100 Message-Id: <20191022133134.14487-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191022133134.14487-1-peter.maydell@linaro.org> References: <20191022133134.14487-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Create a function to compute the values of the TBFLAG_A32 bits that will be cached, and are used by all profiles. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson Message-id: 20191018174431.1784-4-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index 69da04786e8..f05d0424745 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11070,6 +11070,15 @@ static uint32_t rebuild_hflags_common(CPUARMState *env, int fp_el, return flags; } +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)); + flags = FIELD_DP32(flags, TBFLAG_A32, NS, !access_secure_reg(env)); + + return rebuild_hflags_common(env, fp_el, mmu_idx, flags); +} + static uint32_t rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, ARMMMUIdx mmu_idx) { @@ -11141,7 +11150,7 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, ARMMMUIdx mmu_idx = arm_mmu_idx(env); int current_el = arm_current_el(env); int fp_el = fp_exception_el(env, current_el); - uint32_t flags = 0; + uint32_t flags; if (is_a64(env)) { *pc = env->pc; @@ -11151,12 +11160,11 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, } } else { *pc = env->regs[15]; + flags = rebuild_hflags_common_32(env, fp_el, mmu_idx, 0); flags = FIELD_DP32(flags, TBFLAG_A32, THUMB, env->thumb); flags = FIELD_DP32(flags, TBFLAG_A32, VECLEN, env->vfp.vec_len); flags = FIELD_DP32(flags, TBFLAG_A32, VECSTRIDE, env->vfp.vec_stride); flags = FIELD_DP32(flags, TBFLAG_A32, CONDEXEC, env->condexec_bits); - flags = FIELD_DP32(flags, TBFLAG_A32, SCTLR_B, arm_sctlr_b(env)); - flags = FIELD_DP32(flags, TBFLAG_A32, NS, !access_secure_reg(env)); if (env->vfp.xregs[ARM_VFP_FPEXC] & (1 << 30) || arm_el_is_aa64(env, 1) || arm_feature(env, ARM_FEATURE_M)) { flags = FIELD_DP32(flags, TBFLAG_A32, VFPEN, 1); @@ -11166,8 +11174,6 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, flags = FIELD_DP32(flags, TBFLAG_A32, XSCALE_CPAR, env->cp15.c15_cpar); } - - flags = rebuild_hflags_common(env, fp_el, mmu_idx, flags); } /* The SS_ACTIVE and PSTATE_SS bits correspond to the state machine