From nobody Mon Apr 7 18:11:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1581086876611531.9724108035052; Fri, 7 Feb 2020 06:47:56 -0800 (PST) Received: from localhost ([::1]:58296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j04vD-0003F2-Fi for importer@patchew.org; Fri, 07 Feb 2020 09:47:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51555) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j04hs-0000Nj-9f for qemu-devel@nongnu.org; Fri, 07 Feb 2020 09:34:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j04hr-0002sP-3Z for qemu-devel@nongnu.org; Fri, 07 Feb 2020 09:34:08 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:40827) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j04hq-0002r9-TB for qemu-devel@nongnu.org; Fri, 07 Feb 2020 09:34:07 -0500 Received: by mail-wm1-x336.google.com with SMTP id t14so2991076wmi.5 for ; Fri, 07 Feb 2020 06:34:06 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id w1sm3796430wro.72.2020.02.07.06.34.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 06:34:05 -0800 (PST) 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=2ibQFQ8vRdFf6A4S5SdMKP0nibw7kp74YHQp6sWgPGg=; b=iPvCHbLOwzHNOwpwlgNBVFcbUWotuQfgLQJ2SLGK5cQLBXZAjrRvsDBkOrtUuyYRuM bVc89CAW5LIKwuapjWeZmVftOw6UpxWg7dQWAS4F8AyfgBeNi+Xo1xmPOX76RXdtXRCg YRwEA5hJoArrYh+quNForJRyRVDi0Z9EgqsGwLTD1i1p4uEjT7yGsWUjDrMe/OIdYmaH ZCvpH3hut4Y7NGU2s4iFzIyMg1JvvePFkyUDjVo19/GM2/OBK44aQTB6mnQ19Sen5f3q 8+FU5Nk9BmezlPhrDEmWPUST8xPiUqlcH+VpmBrrVqRF2b+ScXcL5/R5S6SP2D4tq2nQ CrXw== 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=2ibQFQ8vRdFf6A4S5SdMKP0nibw7kp74YHQp6sWgPGg=; b=MTcRnecqXWNlJ+e+4MuxgZk273Apj/PgYPe8gi0cykGh5lgxBJCr6VuPi399FyHESq aF0Rla+hm8Cqr8RvaTV1mRx5iOHa68xhwaDGgTJM76HxkKCJ8sno59GXBGBiXG5JOgqS 09Ix6xCMlpdD4D2z8L5Sy8+ZqdGhJDKMSV6eooFKTzdnVX+Tjkrny3wxyRLdFtiGM15q 9N5D+Wq7p1LZhncE9W0TSJWt5uCOluz+75pdCoM18M80BU2QXF/j/HO7Eli7i0RxaQkI ZLcXlBLxrNj8j7vFpToLnr5stKzdifzARSYJsUotqnVFcxlR9+JAfqPwnq4mCZuoxdY/ 4Gww== X-Gm-Message-State: APjAAAU/acMEwdlhxmVuDeMmhE+B02kTWelrbNOmIjhj9bs7+ATHjZLW nPXSUpmHa6EBWoqgrz7qvs6RTcMTRGg= X-Google-Smtp-Source: APXvYqwcnciNrvoPQ1oJ/mgcj7UQV3KEysLMOsnkqAZD7wiQGoTHriaZHpbHwrmKQUZHxpYZl+QHuA== X-Received: by 2002:a1c:a4c3:: with SMTP id n186mr4732506wme.25.1581086045714; Fri, 07 Feb 2020 06:34:05 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/48] target/arm: Tidy ARMMMUIdx m-profile definitions Date: Fri, 7 Feb 2020 14:33:14 +0000 Message-Id: <20200207143343.30322-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200207143343.30322-1-peter.maydell@linaro.org> References: <20200207143343.30322-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::336 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Richard Henderson Replace the magic numbers with the relevant ARM_MMU_IDX_M_* constants. Keep the definitions short by referencing previous symbols. Tested-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Message-id: 20200206105448.4726-19-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index aa121cd9d0a..ad92873943f 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2912,14 +2912,14 @@ typedef enum ARMMMUIdx { ARMMMUIdx_SE10_0 =3D 4 | ARM_MMU_IDX_A, ARMMMUIdx_SE10_1 =3D 5 | ARM_MMU_IDX_A, ARMMMUIdx_Stage2 =3D 6 | ARM_MMU_IDX_A, - ARMMMUIdx_MUser =3D 0 | ARM_MMU_IDX_M, - ARMMMUIdx_MPriv =3D 1 | ARM_MMU_IDX_M, - ARMMMUIdx_MUserNegPri =3D 2 | ARM_MMU_IDX_M, - ARMMMUIdx_MPrivNegPri =3D 3 | ARM_MMU_IDX_M, - ARMMMUIdx_MSUser =3D 4 | ARM_MMU_IDX_M, - ARMMMUIdx_MSPriv =3D 5 | ARM_MMU_IDX_M, - ARMMMUIdx_MSUserNegPri =3D 6 | ARM_MMU_IDX_M, - ARMMMUIdx_MSPrivNegPri =3D 7 | ARM_MMU_IDX_M, + ARMMMUIdx_MUser =3D ARM_MMU_IDX_M, + ARMMMUIdx_MPriv =3D ARM_MMU_IDX_M | ARM_MMU_IDX_M_PRIV, + ARMMMUIdx_MUserNegPri =3D ARMMMUIdx_MUser | ARM_MMU_IDX_M_NEGPRI, + ARMMMUIdx_MPrivNegPri =3D ARMMMUIdx_MPriv | ARM_MMU_IDX_M_NEGPRI, + ARMMMUIdx_MSUser =3D ARMMMUIdx_MUser | ARM_MMU_IDX_M_S, + ARMMMUIdx_MSPriv =3D ARMMMUIdx_MPriv | ARM_MMU_IDX_M_S, + ARMMMUIdx_MSUserNegPri =3D ARMMMUIdx_MUserNegPri | ARM_MMU_IDX_M_S, + ARMMMUIdx_MSPrivNegPri =3D ARMMMUIdx_MPrivNegPri | ARM_MMU_IDX_M_S, /* Indexes below here don't have TLBs and are used only for AT system * instructions or for the first stage of an S12 page table walk. */ --=20 2.20.1