From patchwork Mon Apr 19 20:22:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 12212667 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E540C433ED for ; Mon, 19 Apr 2021 20:32:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 09F9B61057 for ; Mon, 19 Apr 2021 20:32:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 09F9B61057 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYaZk-00084R-Rw for qemu-devel@archiver.kernel.org; Mon, 19 Apr 2021 16:32:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYaQT-00078y-34 for qemu-devel@nongnu.org; Mon, 19 Apr 2021 16:23:21 -0400 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]:39718) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYaQR-0002Vc-8Y for qemu-devel@nongnu.org; Mon, 19 Apr 2021 16:23:20 -0400 Received: by mail-qt1-x82a.google.com with SMTP id 18so13706091qtz.6 for ; Mon, 19 Apr 2021 13:23:18 -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 :mime-version:content-transfer-encoding; bh=87tkM79RXw2jAAFt1MoYIFV/bLOV6oXFWJrSZPGm2LM=; b=edXaEMdnEfrQiDIGGFkCDj6B/uOHLXyjh3cn+94Puev9fJjPnsexowWGeHTX98T1jz 6/L+jVl3BRQFKmN2azuG+hs3sRYWfjQiTW2SQUWyd/bdWp7zjhKUvSEtVwudfZXyRHMJ /qjg2udccDL054YRjoMUI3O/Gaf38Y/l7IsiVih6wUyy631Umx4Ku28Ptx9wGsbb93Mj U0Ban8frjBkf8Qz9L2V1xGwJCuv5qaj0tkL3EM432L4OWr9bwmLtPKWycYcRnDuME0t0 mNdEMnaege+GWO1BWWffhliY3bfghY9K2w0nVlCdfy2kS7V+r5GxnuhchexFkbfJ98nu fsOA== 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:mime-version:content-transfer-encoding; bh=87tkM79RXw2jAAFt1MoYIFV/bLOV6oXFWJrSZPGm2LM=; b=I0pTT30i/5z4i1oLls8iVRRd6+9wLfiBHpiE7SGmDAaWfT1WhVc+XvUBruLQu4CoXt Gd8ndQX/ajdgW5zaX/ubsX+BlHGXV3ZRnazmGghfzMUr0wKTWPxvajsOWnwn/tsgEcDe UUlS+BZ/+ldZZxLYTflZWULbEmJ0Nv4VmB5HZ/LGquBsQekyCdNuPnyVNHsRFwnCgOkz 1umLb/lYnmtZGlq7WAoIz3Etty0geG8kXVT+/t9sGYR5kgH/NP+HIFO6GP+9iNtvYjjH aFHL1MBbhViUklNMl3/9DmNRwO0JvT70LLkLyNW5TNXXDJzNKy0iWnqFyiQ72PmpSanj e/gA== X-Gm-Message-State: AOAM5301FEq1OvZRVBRfBFgz0p8g84O7nS/j/dofOMliPz3CmzNWggn7 neXxVV1qglTAbUwiEx0fGGR2DfEO7nqVkcHZ X-Google-Smtp-Source: ABdhPJy/83fuubaP3AuLLwvnUEv7jwfsoauGAdxA08N/yWTjWypZTXqwTir0wSBL009lBpTG83XJag== X-Received: by 2002:a05:622a:148f:: with SMTP id t15mr13760684qtx.191.1618863798329; Mon, 19 Apr 2021 13:23:18 -0700 (PDT) Received: from localhost.localdomain ([2607:fb90:80c7:aba4:3594:91a:8889:c77a]) by smtp.gmail.com with ESMTPSA id c23sm10007835qtm.46.2021.04.19.13.23.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 13:23:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 09/31] target/arm: Move TBFLAG_ANY bits to the bottom Date: Mon, 19 Apr 2021 13:22:35 -0700 Message-Id: <20210419202257.161730-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210419202257.161730-1-richard.henderson@linaro.org> References: <20210419202257.161730-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::82a; envelope-from=richard.henderson@linaro.org; helo=mail-qt1-x82a.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=unavailable autolearn_force=no X-Spam_action: no action 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: Peter Maydell , qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Now that other bits have been moved out of tb->flags, there's no point in filling from the top. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/cpu.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 15104e1440..5e0131be1a 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3405,15 +3405,15 @@ typedef ARMCPU ArchCPU; * * Unless otherwise noted, these bits are cached in env->hflags. */ -FIELD(TBFLAG_ANY, AARCH64_STATE, 31, 1) -FIELD(TBFLAG_ANY, SS_ACTIVE, 30, 1) -FIELD(TBFLAG_ANY, PSTATE__SS, 29, 1) /* Not cached. */ -FIELD(TBFLAG_ANY, BE_DATA, 28, 1) -FIELD(TBFLAG_ANY, MMUIDX, 24, 4) +FIELD(TBFLAG_ANY, AARCH64_STATE, 0, 1) +FIELD(TBFLAG_ANY, SS_ACTIVE, 1, 1) +FIELD(TBFLAG_ANY, PSTATE__SS, 2, 1) /* Not cached. */ +FIELD(TBFLAG_ANY, BE_DATA, 3, 1) +FIELD(TBFLAG_ANY, MMUIDX, 4, 4) /* Target EL if we take a floating-point-disabled exception */ -FIELD(TBFLAG_ANY, FPEXC_EL, 22, 2) +FIELD(TBFLAG_ANY, FPEXC_EL, 8, 2) /* For A-profile only, target EL for debug exceptions. */ -FIELD(TBFLAG_ANY, DEBUG_TARGET_EL, 20, 2) +FIELD(TBFLAG_ANY, DEBUG_TARGET_EL, 10, 2) /* * Bit usage when in AArch32 state, both A- and M-profile.