From patchwork Tue Oct 22 13:31:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 177178 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp4893923ill; Tue, 22 Oct 2019 06:51:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqy3JSBA31TXk9Tn3EhJE5Iy2CjB/nbljTkOLi7zhfQSvJz29TEu6w44+0/2gsKX3TRYKYuF X-Received: by 2002:a17:906:32cc:: with SMTP id k12mr17146218ejk.196.1571752283016; Tue, 22 Oct 2019 06:51:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571752283; cv=none; d=google.com; s=arc-20160816; b=U1rdMMa/eKGYK/4/ESzJauM3WICMBGV4Pq3BTw612KCIKLNNu2KzhuwLPh0/yH+SSC qyypQ5vat/4Ak7BN371zj8bEeOe442BviZ+dsz+Q1A5X3nPixWlXCS5yDbIzZyPvzbar dKCIv04Q4VVGQdAjhvVzrMxt1f0ix4VgXpPxLjkjTCl8SOSyWI+fFvZwpkmddddRvGnn JnFg57OfIBHl0d7O3M70DxVFM75a/GBedun1LKtfREy8jW/UgnqtBfOWuzgsfGJIySJH cTDSdrSItLgbO49dJBQq69poB+yeKssRs0fzpyU1XazyJd+nMX8NPTdtdP5Bj4zW+9Lt DKrg== 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=BWBhqaHT6GxtdOFufe6tBUWH35ddd8XEs+xAm5zDJYo=; b=k5pmO0Ln0EBvf7dxrl7wPuNRMKLo4NlDKKgkgGb0S782EP/S/WBlXrLpWu21Dyiso2 iAuA8bwM7CatE8691iutDR0//c9hLaUORKM/Pz8TL4OBDsx1PtoBR/8BhMws2XBYV0TZ Retd3HqaAoAoZgo/EDgT+UNiF7BKdG7AgwdxWpeUu7/WnZJolRO9178JhnF7wdNs+a4r OWQxxUnpVB5Jr7eqtDBcRMunWx/ahpeF/zZS5xP9MwbouQpFY4ZnluW8TdGnpH1t7Lzg YOeWTWtKKIBrQdZW2HAg/02Y6Xjyon6H0zzXEeNQbTKmMmdcl/tGHjVb3Dudyjcz1Jo/ v6WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ChjA06Mj; 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 b18si4860451edc.390.2019.10.22.06.51.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2019 06:51:22 -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=ChjA06Mj; 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]:57724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuZF-0007aU-1E for patch@linaro.org; Tue, 22 Oct 2019 09:51:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36850) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iMuGt-0002nI-UP for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iMuGs-0001LE-Mb for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:23 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:41525) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iMuGs-0001KB-GO for qemu-devel@nongnu.org; Tue, 22 Oct 2019 09:32:22 -0400 Received: by mail-wr1-x442.google.com with SMTP id p4so18098506wrm.8 for ; Tue, 22 Oct 2019 06:32:22 -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=BWBhqaHT6GxtdOFufe6tBUWH35ddd8XEs+xAm5zDJYo=; b=ChjA06Mjs77Lz1pNn0SauLjs1aNQ4JlOWfXdPWOxYMxPaC3f1hG4QBSQwiSv89s6Ns PmA9rhairAiLrO6KATD/8MwYWwDOvowWnIOuusVfzEDMar3mHOP9aEhkFQb5kKASpGhR qXYrblqelxnL5ecg+MiojmmoOpoYulafafUOqM92/X5K2HXoOH9odlkcsvYYiV5SIWeA kz7RsP0PqMUSyUiZIOP5pXJU5yrmWGZFZY9yyYOKWRjR715h9kPlKz4SujpjRd0nTG4/ iSPVLwRB4O0yruGRz01qDzeY1yQtnpDTXCnN5SKxN1qrWKaLPEMzszRIIMDyqc5yNYAF VPoA== 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=BWBhqaHT6GxtdOFufe6tBUWH35ddd8XEs+xAm5zDJYo=; b=khthkiMPS+hIQrgazLjeHCvY3eueO6kHzqGDTL1DQ8uBOMTkBdC2ezg7k3kgr+hzfs J+THjL0bmVd9Ifs7si539i5A/9Ti9R4Gg0JKmjozJ9z64AKRenOVbI+P7ooQZdn8Y3Dm Zahpjb5z03jKSeHbBr+nlKQ0cadgk6Fyqvgo3A9xCSrxlCDn4qMd2vGy14A67ETdirRj 4MbnH5ZJ2B9oBb3oX+ktlbrshEzqyWum1x60ryvSm7KBd70GrqO+iUTrHDy3ObFkaOkN ZgnQzrl8uijURkK4YZxdcmcW5Kes2IciDQgv17n31DVEwfoPQIwqkVDLger9yaqEzUMb 0X8w== X-Gm-Message-State: APjAAAUayxIDPIC9MeIQefS/JlHmLPjpcArjqpiKijhlkc9H6xkK1e84 azq4jn5Tnj7iO2wGtwn4gEkFIpF3yG8= X-Received: by 2002:adf:e9c7:: with SMTP id l7mr3573891wrn.57.1571751141024; Tue, 22 Oct 2019 06:32:21 -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.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:32:19 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 18/41] target/arm: Split out rebuild_hflags_aprofile Date: Tue, 22 Oct 2019 14:31:11 +0100 Message-Id: <20191022133134.14487-19-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::442 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_ANY bits that will be cached, and are used by A-profile. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson Message-id: 20191018174431.1784-9-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index d1cd54cc931..ddd21edfcf1 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11106,18 +11106,28 @@ static uint32_t rebuild_hflags_m32(CPUARMState *env, int fp_el, return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); } +static uint32_t rebuild_hflags_aprofile(CPUARMState *env) +{ + int flags = 0; + + flags = FIELD_DP32(flags, TBFLAG_ANY, DEBUG_TARGET_EL, + arm_debug_target_el(env)); + return flags; +} + static uint32_t rebuild_hflags_a32(CPUARMState *env, int fp_el, ARMMMUIdx mmu_idx) { - return rebuild_hflags_common_32(env, fp_el, mmu_idx, 0); + uint32_t flags = rebuild_hflags_aprofile(env); + return rebuild_hflags_common_32(env, fp_el, mmu_idx, flags); } static uint32_t rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, ARMMMUIdx mmu_idx) { + uint32_t flags = rebuild_hflags_aprofile(env); ARMMMUIdx stage1 = stage_1_mmu_idx(mmu_idx); ARMVAParameters p0 = aa64_va_parameters_both(env, 0, stage1); - uint32_t flags = 0; uint64_t sctlr; int tbii, tbid; @@ -11262,12 +11272,6 @@ void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, } } - if (!arm_feature(env, ARM_FEATURE_M)) { - int target_el = arm_debug_target_el(env); - - flags = FIELD_DP32(flags, TBFLAG_ANY, DEBUG_TARGET_EL, target_el); - } - *pflags = flags; *cs_base = 0; }