From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 6962FC352A2 for ; Thu, 6 Feb 2020 11:04:09 +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 3391E20659 for ; Thu, 6 Feb 2020 11:04:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="znbk1Ksf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3391E20659 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]:35902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izex6-0002Dw-9u for qemu-devel@archiver.kernel.org; Thu, 06 Feb 2020 06:04:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49908) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izeoP-00035X-OZ for qemu-devel@nongnu.org; Thu, 06 Feb 2020 05:55:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izeoO-0007GS-4i for qemu-devel@nongnu.org; Thu, 06 Feb 2020 05:55:09 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:52180) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1izeoM-00077V-I3 for qemu-devel@nongnu.org; Thu, 06 Feb 2020 05:55:07 -0500 Received: by mail-wm1-x344.google.com with SMTP id t23so5808569wmi.1 for ; Thu, 06 Feb 2020 02:55:06 -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=5yzZc503rPeFl27xGectI9n2/yV3xCJ4JGIEujvRapk=; b=znbk1KsfAYh/W1RzNOnnYzeGezj1WMh1l+J90ExSLacofXz+rs5bJRmT0C8vtkcN7/ DnCGyykx5SpXs9XxH3T67cg+G0BkObOlDsTbmn+iJQUA0fvsEgiYXGVYzQgJCqtsDWfH 2ch02VwI8YhayWlePN9zf9iWOxmIKGjAShfbqY8kx6hgaNr4T8CVDjZiN9eH2pXfEXfG WUknelQbZJTi+90GWMwrYkWS4xUU/hkP26in5T5v+RhDnC+j8yVOyRzh7xuq2bJ8uRfR am+l7qpXljOJ/u1mJq2auy3uPAO9ifZGR8W/LsGixZ4s44C0jnKJHQaseK/BVy+RodN0 Zw3Q== 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=5yzZc503rPeFl27xGectI9n2/yV3xCJ4JGIEujvRapk=; b=KDCghk43iAUP901w9ugIbHtzHSjgTSigGDS9sVpQl7cd9gt+4y6mb5E8VeDsgCQRZh Fy/wMwWbHOl9bXz+PfDUF/K5OmQVEkwgvoJFCcq8fvg9H6qsj4vQ4lReiI63SkmYr97C dCInaoWF7lN+N1KJJFgBVGCS0PezlAjfJtU12QLYHOzwv9bC+RUsuYQEYCjvmnE+afpG BiK0JZFqgru0wn/GFqWFdvu8WwK0foiR0E4h5YTbbPrU6kxIQNIQGRh66QcLKVI2caay 77Oj8tKlHKDvZbhiJVy3l60pkTQIzxzUYMsCnVdZqy1JEHDhvmEXBys0Ti+kp4GZ0yoQ KEPg== X-Gm-Message-State: APjAAAXPv+gLhG6i2xFHZNV0zfG382nzPGaCO7bLkKklPRAvKyMvgDO6 J9zuSJ33zYIPlgKfdMYhFkdNgTkKCD0DaA== X-Google-Smtp-Source: APXvYqzcJZs7krl9jVSIipx7Y7RZClVuu5gz0D03d3URbNHLt5Jdfr4bXl+/8Oq3E/GGxsyTvHeaDA== X-Received: by 2002:a7b:cb46:: with SMTP id v6mr4139078wmj.117.1580986505324; Thu, 06 Feb 2020 02:55:05 -0800 (PST) Received: from cloudburst.c.hoisthospitality.com ([135.196.99.211]) by smtp.gmail.com with ESMTPSA id m21sm3364995wmi.27.2020.02.06.02.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Feb 2020 02:55:04 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v7 18/41] target/arm: Tidy ARMMMUIdx m-profile definitions Date: Thu, 6 Feb 2020 10:54:25 +0000 Message-Id: <20200206105448.4726-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200206105448.4726-1-richard.henderson@linaro.org> References: <20200206105448.4726-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 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, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Replace the magic numbers with the relevant ARM_MMU_IDX_M_* constants. Keep the definitions short by referencing previous symbols. Tested-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- 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 aa121cd9d0..ad92873943 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2912,14 +2912,14 @@ typedef enum ARMMMUIdx { ARMMMUIdx_SE10_0 = 4 | ARM_MMU_IDX_A, ARMMMUIdx_SE10_1 = 5 | ARM_MMU_IDX_A, ARMMMUIdx_Stage2 = 6 | ARM_MMU_IDX_A, - ARMMMUIdx_MUser = 0 | ARM_MMU_IDX_M, - ARMMMUIdx_MPriv = 1 | ARM_MMU_IDX_M, - ARMMMUIdx_MUserNegPri = 2 | ARM_MMU_IDX_M, - ARMMMUIdx_MPrivNegPri = 3 | ARM_MMU_IDX_M, - ARMMMUIdx_MSUser = 4 | ARM_MMU_IDX_M, - ARMMMUIdx_MSPriv = 5 | ARM_MMU_IDX_M, - ARMMMUIdx_MSUserNegPri = 6 | ARM_MMU_IDX_M, - ARMMMUIdx_MSPrivNegPri = 7 | ARM_MMU_IDX_M, + ARMMMUIdx_MUser = ARM_MMU_IDX_M, + ARMMMUIdx_MPriv = ARM_MMU_IDX_M | ARM_MMU_IDX_M_PRIV, + ARMMMUIdx_MUserNegPri = ARMMMUIdx_MUser | ARM_MMU_IDX_M_NEGPRI, + ARMMMUIdx_MPrivNegPri = ARMMMUIdx_MPriv | ARM_MMU_IDX_M_NEGPRI, + ARMMMUIdx_MSUser = ARMMMUIdx_MUser | ARM_MMU_IDX_M_S, + ARMMMUIdx_MSPriv = ARMMMUIdx_MPriv | ARM_MMU_IDX_M_S, + ARMMMUIdx_MSUserNegPri = ARMMMUIdx_MUserNegPri | ARM_MMU_IDX_M_S, + ARMMMUIdx_MSPrivNegPri = 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. */ -- 2.20.1