From patchwork Mon Jan 11 19:00:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 360525 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp3131043jai; Mon, 11 Jan 2021 11:07:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+szGnx5bfvYFyaq7MtALps/LCclO2z67rNW/887Mi6cMyeVG1Oy32lvOikNTlyKLsWScU X-Received: by 2002:a25:9887:: with SMTP id l7mr1779591ybo.319.1610392030188; Mon, 11 Jan 2021 11:07:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1610392030; cv=none; d=google.com; s=arc-20160816; b=e8L3owATnUdSSfGB3Roi67o6REf9D7myy8JW0yHamIoAMATVpAksymtkcakA/hu18k 5FQXzIdMoKFW5A8TkjkQ/L2vo/VX9Svw9SYkkIRzgPv0bG6MtqKflrOVfLPDgfrSa7oX lZy/39HAQ/+yIIZ1CaMimQlB2fQfCHCC+v1yLksmrarG0cX0RNRJgYeINmtRqfPj61o8 GQ8moWnV+2qydiJKFrh7m9Ikqrx98EXWMv8pIEg8CmIlxhNLzwhqdXa8x7HMJIED7wuL ZwRu9tZNqMdCaWGpTTwUJ0kE3ZqlmcvUBV3ZKsNgu8DJjzUd9g8zhyLj01k409DW6Nr9 aFig== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=t7cb1wo+zig4w5wRyfLayVY9BN4eEXg6/tPvYTE+r/M=; b=F3Js50tnHk+vkm60+T1y67YDbF07lfEVIu15awFS7KIUdDziNtY6gU1GGY5ZxBvFDl uq3LDf+vbAqZuG3HdJN4hHeSi9yOE6NBoxJEn+Z6FRKiG2I3lN0Fey73X+6W/4OuH1jC QAx/C3N6J35wqYLh243z8f283oWar1JcelP463Y78ODsVQ8qHqfFXKYj9/6z9NIk5rHn IYZvHObb5of7ERIrnHyERTwlaNJwY5V3gLNV0C+NXpB7D0JWMzRhT2devXTBorOxdrl4 08LxlJArObE3BvOSh6j7BtZoaeG92Koer6aLOq9RjyvwZJfly9oCh8L9hxogC2zoEw+q 0dpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=nXwMW4Q9; 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 k13si583789ybm.220.2021.01.11.11.07.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Jan 2021 11:07:10 -0800 (PST) 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=nXwMW4Q9; 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]:59488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kz2Wz-0002pY-II for patch@linaro.org; Mon, 11 Jan 2021 14:07:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kz2RZ-0005z6-Ox for qemu-devel@nongnu.org; Mon, 11 Jan 2021 14:01:33 -0500 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:33101) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kz2RY-0006QQ-1h for qemu-devel@nongnu.org; Mon, 11 Jan 2021 14:01:33 -0500 Received: by mail-pf1-x42d.google.com with SMTP id h186so517400pfe.0 for ; Mon, 11 Jan 2021 11:01:31 -0800 (PST) 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=t7cb1wo+zig4w5wRyfLayVY9BN4eEXg6/tPvYTE+r/M=; b=nXwMW4Q9gwcedvGzBG/JeCMSXLQGMumCuHav6OoSOTfElFgD6ewT5f1YHRN25Fp06M PgwurTbe7eQ/8aTCQxmu8IEB0poaF1rC4fULY4Ye3CYufZBTmOQHe0LkEnAx7CAeVmUh 6UkzPMFZGGq2USV74v77Pe7idqzBCWiuFbohsZELfWq2AFXkJYWZpW551UT6JyYY/+mw CdqAB6KbFt1wPNrmOYpDBiCHfTrzJoBSsBai6jmFYbX7QoNiuobgje+3dJEZola7Lu1g KlnEf4mYr6YbIHAxWzzzLASDrhSQVIICAykV3UeDEubkMnx6xNwdh6KQMonHI8qevHW5 kZAg== 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=t7cb1wo+zig4w5wRyfLayVY9BN4eEXg6/tPvYTE+r/M=; b=H4sSlFkLOOShvllR9sMiIGshm7weiPGJr7b6FHI9MzASdz1m/r6aD7+3Bbo+eMdIg0 PC1acR1caAKhUw1KzNNJinAFoJk8N0boiEO9q++p/XXoh8+vv1wQJpS6GjF+2myII92C dyX2HRGHm2d0vgz54k3UjqgH/FrDemiHRDc9Ypc0nPVzOmJHKyVYICio4ieWnbv/hVAa Q6sFmin90DoCsT8QH1fi0TsxMDGQ+bMhqHuf/h8U9DP3hQTYUbP3K+i7H7Z44d2fmHdG wf1DbUvn+yKmaqdvfUsts1/BudrwodHkEPMHavM+EFRy2eusglk5W5HM0qvcP96FsMIs /+dg== X-Gm-Message-State: AOAM531xrhWXMn2+Mtg459OLL6mSuj+fI0qijfSms8VTOgAKqdFfpIk0 435ufcFAw1aCqP11aSC1I9AQPQtsRSUqGg== X-Received: by 2002:aa7:8d12:0:b029:1ae:4344:3b4f with SMTP id j18-20020aa78d120000b02901ae43443b4fmr780455pfe.16.1610391690404; Mon, 11 Jan 2021 11:01:30 -0800 (PST) Received: from localhost.localdomain (rrcs-173-197-107-21.west.biz.rr.com. [173.197.107.21]) by smtp.gmail.com with ESMTPSA id n195sm350395pfd.169.2021.01.11.11.01.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jan 2021 11:01:29 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 08/30] target/arm: Move TBFLAG_ANY bits to the bottom Date: Mon, 11 Jan 2021 09:00:51 -1000 Message-Id: <20210111190113.303726-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210111190113.303726-1-richard.henderson@linaro.org> References: <20210111190113.303726-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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@linaro.org, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.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. Signed-off-by: Richard Henderson --- target/arm/cpu.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.25.1 diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 43bcd21959..aa2f2d3a04 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3275,15 +3275,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.