From patchwork Thu May 5 09:11:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 569938 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:66c4:0:0:0:0 with SMTP id x4csp616991mal; Thu, 5 May 2022 03:12:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhglt5K4lcj0zRcgtZ5cx4t5sg3zL1cqgdWQclj9O4YWw9KJYSwKHrORbNdl4PoPY5c+a/ X-Received: by 2002:ac8:5a43:0:b0:2f3:873b:83c8 with SMTP id o3-20020ac85a43000000b002f3873b83c8mr23367599qta.90.1651745527090; Thu, 05 May 2022 03:12:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651745527; cv=none; d=google.com; s=arc-20160816; b=TuYBX5dEELr9PbHsXqbF2ovPOezg1c/FzhF4cvTfwNGd/Mbz7qlqBk/gS/Dhatqc21 M9v28EzJQDCt/6sxbUPBaLEMmElyW5UU8guxBS9uwFJ/CzWGWYEzshEdBixioZd9Otd0 aOo5L2LJoRQw2fn7s/ajfW7cwQiPd84k99tTXWDtK7nIUeWZiui35feBPf0Ii9zgkh8s K2ci+/e7e9FqjWxc2J8WaoVvj70YpBck1WPLlIo85lcQrltUGSkt29esH5t7dD21fki7 zmlVCv4QcfivIIO7km0jSa7JMN7Bszfi3ROkLj0R9derdXsKn7KYZFof9RWHljaH4k6Z mBOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=ArM5vDP/EbKZawRU57Aqm2WP6vjT8p7Zzo7XHj++yzg=; b=LjWUSi1fFPhf6csYtXcbhyzNaR6KUceNs/aDnFjpgAy4SirEp/n/+NuLfYXfFHn8yM RZCmLN2Bitsidd5YNh1oFfutFOWGJOQXPhTHw9HLdEuwgxvq1WNk3m/tee+m66cSVoQb Yg0oXM561RXQjNQMmtxpZUN0mmC7uoYNXL2B6qkJocirn2UmD7J2QEh33NnuquRtgIC6 geQubu8ETTXQ2vJ64i+1UoDsBMrfSB99611+igazWnop0XgiJ0SBRkGuIV5wkNdltV7Q JGq1lsWta3qU8NpYDercwOwBUeSwlETDAHAFJub+185K5MDrfzwn/1hXSjqCLKrrqOAL njVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CjHMDuHY; 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=pass (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 z124-20020a379782000000b0069e5ce8c656si563184qkd.512.2022.05.05.03.12.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 May 2022 03:12:07 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=CjHMDuHY; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nmYSs-0005LC-Iv for patch@linaro.org; Thu, 05 May 2022 06:12:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nmXWj-00053M-Kf for qemu-devel@nongnu.org; Thu, 05 May 2022 05:12:01 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:52032) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nmXWh-0003Hd-U5 for qemu-devel@nongnu.org; Thu, 05 May 2022 05:12:01 -0400 Received: by mail-wm1-x329.google.com with SMTP id q20so2247239wmq.1 for ; Thu, 05 May 2022 02:11:59 -0700 (PDT) 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=ArM5vDP/EbKZawRU57Aqm2WP6vjT8p7Zzo7XHj++yzg=; b=CjHMDuHYM8Nk/cP8pe5ZJtiSurn/naPnyefnFzK5ZTV/ajoCFkaArmGmNEj1Hwcb5M UwU0wWhJ+2vjcS7QbehH6b4vCcYkykQgn54/dDys3ye01kR0ammrph6mdGTKSA5BXUnr dOUc9m0RIH9VCUa7yG5WImBBBPBNGGiKvbP1NgbMbNOpomsVyfLLXjdGUWV/0JOh1azN 0e41K2VA/WwqnPzMCl4Bd/YNIVP8xb/Ti6wxFQy33Y2esaPinA6Po2pZaN12J+cceJgs mJ6sg0r2ZFjNTZSEX4orMbZBYVbmqCB90u2Mq3rp6WLk+w0Mxzo6Z6XNAwtiSJFH773p /ugA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ArM5vDP/EbKZawRU57Aqm2WP6vjT8p7Zzo7XHj++yzg=; b=lgbt3hwfwPkDg+php2ON7S8RZ2Vuvs3qdT3F3cZZ0zOyZiNYfn2gvzBb0qTBZ7wOfJ 3SlGLad9ocWLlz4DmdCSISuvAL2y6FOOZ3c902GbbuA2oUSpWv+kRvEFSPR3dfuFmEuD P/ahxmzM0rig5H9VYLbFYAuU5AnuniFdYP56xB9jIH9YtVK+z+FIFOTsP05i/gSOg5YA DJJmgavQQsnlOP++CvvI8Ct3SVqWLTNL1ZVI26+uahwFNFWct07po7XY08yaado28J+7 moXu1EFI5sxfQ2loVDcf26Sb/6BuEGgwBX9DCkmczw1jdMaZpO+Mpslpl3fdk3WAcwjA PDww== X-Gm-Message-State: AOAM531hvVZKaCPeOX6aJn0ag8fK4kY+q5vjfHeXkPgCIVmCmRJ0jzqo Pk4v13hY264NnkfqQgCHquwzd71t3dVUeQ== X-Received: by 2002:a05:600c:3391:b0:393:fbba:3789 with SMTP id o17-20020a05600c339100b00393fbba3789mr3618049wmp.206.1651741918389; Thu, 05 May 2022 02:11:58 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id j14-20020adfe50e000000b0020c6a524fd5sm841612wrm.99.2022.05.05.02.11.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 02:11:58 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 08/23] target/arm: Change cpreg access permissions to enum Date: Thu, 5 May 2022 10:11:32 +0100 Message-Id: <20220505091147.2657652-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220505091147.2657652-1-peter.maydell@linaro.org> References: <20220505091147.2657652-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Create a typedef as well, and use it in ARMCPRegInfo. This won't be perfect for debugging, but it'll nicely display the most common cases. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20220501055028.646596-8-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpregs.h | 44 +++++++++++++++++++++++--------------------- target/arm/helper.c | 2 +- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h index ff3817decbd..858c5da57d8 100644 --- a/target/arm/cpregs.h +++ b/target/arm/cpregs.h @@ -154,31 +154,33 @@ enum { * described with these bits, then use a laxer set of restrictions, and * do the more restrictive/complex check inside a helper function. */ -#define PL3_R 0x80 -#define PL3_W 0x40 -#define PL2_R (0x20 | PL3_R) -#define PL2_W (0x10 | PL3_W) -#define PL1_R (0x08 | PL2_R) -#define PL1_W (0x04 | PL2_W) -#define PL0_R (0x02 | PL1_R) -#define PL0_W (0x01 | PL1_W) +typedef enum { + PL3_R = 0x80, + PL3_W = 0x40, + PL2_R = 0x20 | PL3_R, + PL2_W = 0x10 | PL3_W, + PL1_R = 0x08 | PL2_R, + PL1_W = 0x04 | PL2_W, + PL0_R = 0x02 | PL1_R, + PL0_W = 0x01 | PL1_W, -/* - * For user-mode some registers are accessible to EL0 via a kernel - * trap-and-emulate ABI. In this case we define the read permissions - * as actually being PL0_R. However some bits of any given register - * may still be masked. - */ + /* + * For user-mode some registers are accessible to EL0 via a kernel + * trap-and-emulate ABI. In this case we define the read permissions + * as actually being PL0_R. However some bits of any given register + * may still be masked. + */ #ifdef CONFIG_USER_ONLY -#define PL0U_R PL0_R + PL0U_R = PL0_R, #else -#define PL0U_R PL1_R + PL0U_R = PL1_R, #endif -#define PL3_RW (PL3_R | PL3_W) -#define PL2_RW (PL2_R | PL2_W) -#define PL1_RW (PL1_R | PL1_W) -#define PL0_RW (PL0_R | PL0_W) + PL3_RW = PL3_R | PL3_W, + PL2_RW = PL2_R | PL2_W, + PL1_RW = PL1_R | PL1_W, + PL0_RW = PL0_R | PL0_W, +} CPAccessRights; typedef enum CPAccessResult { /* Access is permitted */ @@ -262,7 +264,7 @@ struct ARMCPRegInfo { /* Register type: ARM_CP_* bits/values */ int type; /* Access rights: PL*_[RW] */ - int access; + CPAccessRights access; /* Security state: ARM_CP_SECSTATE_* bits/values */ int secure; /* diff --git a/target/arm/helper.c b/target/arm/helper.c index 06f8864c778..a19e04bb0bf 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -8711,7 +8711,7 @@ void define_one_arm_cp_reg_with_opaque(ARMCPU *cpu, * to encompass the generic architectural permission check. */ if (r->state != ARM_CP_STATE_AA32) { - int mask = 0; + CPAccessRights mask; switch (r->opc1) { case 0: /* min_EL EL1, but some accessible to EL0 via kernel ABI */