From patchwork Tue Oct 24 16:35:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 1854551 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=Fj5x+Q9C; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SFHlD1jsTz202k for ; Wed, 25 Oct 2023 03:36:56 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qvKNa-0002F2-LL; Tue, 24 Oct 2023 12:35:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qvKNK-00023W-9k for qemu-devel@nongnu.org; Tue, 24 Oct 2023 12:35:27 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qvKND-0004Nm-Pz for qemu-devel@nongnu.org; Tue, 24 Oct 2023 12:35:25 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40850b244beso37068765e9.2 for ; Tue, 24 Oct 2023 09:35:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698165318; x=1698770118; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=G/+qcdpgBnjuo8dOvriQuYuuJGQAP8cL8Iq5TnOvFD8=; b=Fj5x+Q9CE7aAi9+MxOlruJUes6rUve6HY/0qCt2Ck9n/OeidHuK7sd5sp7jM6BxFQl ZLCFpKBkiChm4YHXYyEFuOiS8EFvZxlcS/fJwFqHt7w0VgBY6PUBY2H0k9CgGp05k65n qmQYfCl2IXZO22CXQaM3NvKRF36AM0sOHWIxyEYKhKxORw7msPWbR/jrOq7DRk5uXzlr 8IS9HwtMmAkQn77qYxfr/s2X6haUwMQARCspvoX2NFlMt0UTHlJjqJU1AblH7ezy2dbW 3+TU/aCujxve4yl/5HQ2FJnPV2s7qzDE1HCyxRVG1DfbjPvTvHPXZ6uuWToyXc6A5kJL VgTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698165318; x=1698770118; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G/+qcdpgBnjuo8dOvriQuYuuJGQAP8cL8Iq5TnOvFD8=; b=lC5xoc/QLHaZBwelwxXrJnnKWVIeJCb1bNtvMfKW9Euq1o4v2Rqdk6o0YK2MR5TfGJ RC7uwkIyYH2W5JtEMC4ohliueftdbMP1w8eSdlojUb8vkd25inmQJzg3Bvh/eX+fcNqi dHk5pn1SlDee50oRqLLDaFasKquaakOeaBEJj5qxnyBqgkbLpklnOumVDokdDMCxgt3P X8/Q33qi2VMtT3gD0AnZw2rAqXPx4tk9i3KvBXRx0Y/0ZJPIKrM/kfVL/oa6SpPNFbBu tmoN+/k+jWW07ckGzqzz4QSaUAc4gNHAhtE5V7b30/PK059vNonrrxwGQxCzyH9rTZvZ +efQ== X-Gm-Message-State: AOJu0YxCU6YTbwRVgpEdvEdDjhpJz0q4D5kt67qmB79RDXdufWESKHFb ACGNim3p0XxfV1aEc56YNI9z0w== X-Google-Smtp-Source: AGHT+IF+c3U2rYymheZKxZlPDmdzuvg3itjEE7Da3LcAbBVNHejO6M87LoKFz/Q9Dk83H3F3SpupPA== X-Received: by 2002:a05:600c:5488:b0:402:f5c4:2e5a with SMTP id iv8-20020a05600c548800b00402f5c42e5amr10928515wmb.37.1698165317710; Tue, 24 Oct 2023 09:35:17 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id p12-20020a05600c418c00b0040773c69fc0sm16860101wmh.11.2023.10.24.09.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 09:35:16 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 6/6] target/arm: Move ID_AA64DFR* feature tests together Date: Tue, 24 Oct 2023 17:35:10 +0100 Message-Id: <20231024163510.2972081-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231024163510.2972081-1-peter.maydell@linaro.org> References: <20231024163510.2972081-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Move all the ID_AA64DFR* feature test functions together. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/cpu-features.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h index 0ed05b8b19e..66212cd7ecc 100644 --- a/target/arm/cpu-features.h +++ b/target/arm/cpu-features.h @@ -857,6 +857,11 @@ static inline bool isar_feature_aa64_debugv8p2(const ARMISARegisters *id) return FIELD_EX64(id->id_aa64dfr0, ID_AA64DFR0, DEBUGVER) >= 8; } +static inline bool isar_feature_aa64_doublelock(const ARMISARegisters *id) +{ + return FIELD_SEX64(id->id_aa64dfr0, ID_AA64DFR0, DOUBLELOCK) >= 0; +} + static inline bool isar_feature_aa64_sve2(const ARMISARegisters *id) { return FIELD_EX64(id->id_aa64zfr0, ID_AA64ZFR0, SVEVER) != 0; @@ -922,11 +927,6 @@ static inline bool isar_feature_aa64_sme_fa64(const ARMISARegisters *id) return FIELD_EX64(id->id_aa64smfr0, ID_AA64SMFR0, FA64); } -static inline bool isar_feature_aa64_doublelock(const ARMISARegisters *id) -{ - return FIELD_SEX64(id->id_aa64dfr0, ID_AA64DFR0, DOUBLELOCK) >= 0; -} - /* * Feature tests for "does this exist in either 32-bit or 64-bit?" */