From patchwork Thu May 5 09:11:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 569934 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:66c4:0:0:0:0 with SMTP id x4csp609578mal; Thu, 5 May 2022 03:02:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCIRumya71Xu/JcHq47IBL1cCeShwBsCGJ76jRO+iMzFkdffWJrJhjja0KKCSsyyNAN+05 X-Received: by 2002:a05:6214:d87:b0:45a:bb62:fa24 with SMTP id e7-20020a0562140d8700b0045abb62fa24mr4308414qve.71.1651744949755; Thu, 05 May 2022 03:02:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651744949; cv=none; d=google.com; s=arc-20160816; b=TVgmWeXyLd/ENPQ/U+KTWKgI+pkxnO/AuYxCra/1HrZVs4rFfctdpaqnMX0LVNjNlD BgJkfF27LOqjemZoDckbaj7co8SNNmq8Wdrw7ciXlaFX2Pqzlc4hk8Boe6mO/YEAXlEm u/0ONb8L5tm5rL4faWwbB1yUV6jg6TPvW+oYD7PEwv/PnIdQMyHME3TtOZ7O5YW5qakx Tnw8BLztvOdUY6oetKOWn46aVuWXFODuGrpi8WNdJG34zd5sySozMgKgD95xN7505AQ3 m8h01qtD2vOqiT9Tyk/NQubn/mhGbfCftu78C0o2xUb6OYsRSKizZg9MmD+76KH4TM9I AMVQ== 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=YjElCrdn3SbyJTPO/xD9X6anEjzd2DD/bUoEpuTw2Og=; b=kk/9wL2/e7NhjX1/BgXvi61/YKiUCzpqzluZJSpR3J847JWtL7PMK37dvOEMGajXdq OkECLZmWFeG2fhSTn/iOUxywLh8ijE2zvVyXYkw6Czv0pvnZh5J6fgwBuAvxHJ5jWQ90 bGOc6FWOsGgLNvz/o2kIoR8+geuUfGeQ2OfRU4qok/QlzJbQI/BvgOBe6vbAWePL1xwL gvnNI90OhDAQsvqGAr/ztv5RNYRjI7TcArm3qNfvDiWP5cvSEA/s8T/dvpCfZkCCtRsp hvltU/HTJx2QZVjZmQzfoxAgf8dZIbBCdmbguMPfQKQs2yINVLRuF5523Jav3EeNuV+e /1lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jW9A5bjX; 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 x23-20020ac85397000000b002f38cfdf8c0si422964qtp.681.2022.05.05.03.02.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 May 2022 03:02:29 -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=jW9A5bjX; 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]:47900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nmYJZ-0001qN-5G for patch@linaro.org; Thu, 05 May 2022 06:02:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nmXWg-0004v4-GA for qemu-devel@nongnu.org; Thu, 05 May 2022 05:11:58 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:44699) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nmXWe-00039c-MM for qemu-devel@nongnu.org; Thu, 05 May 2022 05:11:58 -0400 Received: by mail-wr1-x42c.google.com with SMTP id b19so5210540wrh.11 for ; Thu, 05 May 2022 02:11:56 -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=YjElCrdn3SbyJTPO/xD9X6anEjzd2DD/bUoEpuTw2Og=; b=jW9A5bjXRH+ElNJJaw28EZLD6vj/3dCXgloKdehl4ei/9aIz2JjIKj0MQha7UrzJNk 0PxXdiCIH2F84AzOorgrluEpmhup0AEzBIT2b1nAjfsGvA316lQvwW4mLd1StDyYx/za DPCkbllE+aYCgzGVQ6RRzBCA4XWfkFlL3VD0A7DOl058wpZ+uktQt6G+XpTgAgt9deM+ SP+5URG0pT3wBjdtDJeo8hsJ05TlIpQtKsUn2rFmNlAWrpGZE5vAUqsnE1tL76XEsI+W SnWyIkzG6esKXBSTK9vf7LLt2SYo+T+Z4OHKT4GMF38yFWjOqT4xoHoNrz1xO9iITpjM gVSw== 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=YjElCrdn3SbyJTPO/xD9X6anEjzd2DD/bUoEpuTw2Og=; b=SpntCB5wwW8Xspp+Qe1mFELD48oLG5hQ3zOXv1kt9pauDRXHHxmKNb7iU3DUXWEiee 0fBNlsmf2zjewMDpIrEiBDKGbBl2b/OBMcr5VpzQvTGbrg7us/Mtl2XOztkF7ZHfd0jn TJ15pgqRKgzndLHUFAXiN7zEX5OXZKlU3WM0mjJYFvJ9gygUD0oTjjaoZdBCf/di6GZ8 1uINf7I9ngzR9EMp0dHC3kJJ39D/KOd0CrkFMFQCaUxFlq/X8l88AbvQicbJcccyVgQe iu79KWi/MpDJOOuBhazJ2n6IuopXDBWsm3j11zVWZkfrDs+aK6GDl7HMdzAwK17zGjD4 ZMsw== X-Gm-Message-State: AOAM531CoYpx5tMqhZg/p+oam217bcq1i10VrilPwdWporJgoJlRlL/O +pMhkEayggn2Y09uM7WfaFFXEIJMuxG9Ww== X-Received: by 2002:a5d:4f8b:0:b0:20c:6970:fb3c with SMTP id d11-20020a5d4f8b000000b0020c6970fb3cmr12687783wru.554.1651741915789; Thu, 05 May 2022 02:11:55 -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.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 02:11:55 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 05/23] target/arm: Make some more cpreg data static const Date: Thu, 5 May 2022 10:11:29 +0100 Message-Id: <20220505091147.2657652-6-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::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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 These particular data structures are not modified at runtime. Reviewed-by: Alex Bennée Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20220501055028.646596-5-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index a68f14fe8e2..ca6ba9bd820 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7860,7 +7860,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) .resetvalue = cpu->pmceid1 }, }; #ifdef CONFIG_USER_ONLY - ARMCPRegUserSpaceInfo v8_user_idregs[] = { + static const ARMCPRegUserSpaceInfo v8_user_idregs[] = { { .name = "ID_AA64PFR0_EL1", .exported_bits = 0x000f000f00ff0000, .fixed_bits = 0x0000000000000011 }, @@ -8000,7 +8000,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) */ if (arm_feature(env, ARM_FEATURE_EL3)) { if (arm_feature(env, ARM_FEATURE_AARCH64)) { - ARMCPRegInfo nsacr = { + static const ARMCPRegInfo nsacr = { .name = "NSACR", .type = ARM_CP_CONST, .cp = 15, .opc1 = 0, .crn = 1, .crm = 1, .opc2 = 2, .access = PL1_RW, .accessfn = nsacr_access, @@ -8008,7 +8008,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) }; define_one_arm_cp_reg(cpu, &nsacr); } else { - ARMCPRegInfo nsacr = { + static const ARMCPRegInfo nsacr = { .name = "NSACR", .cp = 15, .opc1 = 0, .crn = 1, .crm = 1, .opc2 = 2, .access = PL3_RW | PL1_R, @@ -8019,7 +8019,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) } } else { if (arm_feature(env, ARM_FEATURE_V8)) { - ARMCPRegInfo nsacr = { + static const ARMCPRegInfo nsacr = { .name = "NSACR", .type = ARM_CP_CONST, .cp = 15, .opc1 = 0, .crn = 1, .crm = 1, .opc2 = 2, .access = PL1_R, @@ -8172,13 +8172,13 @@ void register_cp_regs_for_features(ARMCPU *cpu) .access = PL1_R, .type = ARM_CP_CONST, .resetvalue = cpu->pmsav7_dregion << 8 }; - ARMCPRegInfo crn0_wi_reginfo = { + static const ARMCPRegInfo crn0_wi_reginfo = { .name = "CRN0_WI", .cp = 15, .crn = 0, .crm = CP_ANY, .opc1 = CP_ANY, .opc2 = CP_ANY, .access = PL1_W, .type = ARM_CP_NOP | ARM_CP_OVERRIDE }; #ifdef CONFIG_USER_ONLY - ARMCPRegUserSpaceInfo id_v8_user_midr_cp_reginfo[] = { + static const ARMCPRegUserSpaceInfo id_v8_user_midr_cp_reginfo[] = { { .name = "MIDR_EL1", .exported_bits = 0x00000000ffffffff }, { .name = "REVIDR_EL1" }, @@ -8223,7 +8223,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) .access = PL1_R, .readfn = mpidr_read, .type = ARM_CP_NO_RAW }, }; #ifdef CONFIG_USER_ONLY - ARMCPRegUserSpaceInfo mpidr_user_cp_reginfo[] = { + static const ARMCPRegUserSpaceInfo mpidr_user_cp_reginfo[] = { { .name = "MPIDR_EL1", .fixed_bits = 0x0000000080000000 }, }; @@ -8302,7 +8302,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) } if (arm_feature(env, ARM_FEATURE_VBAR)) { - ARMCPRegInfo vbar_cp_reginfo[] = { + static const ARMCPRegInfo vbar_cp_reginfo[] = { { .name = "VBAR", .state = ARM_CP_STATE_BOTH, .opc0 = 3, .crn = 12, .crm = 0, .opc1 = 0, .opc2 = 0, .access = PL1_RW, .writefn = vbar_write,