From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id ADB13385800E for ; Wed, 6 Apr 2022 12:05:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org ADB13385800E Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-91-qXu-uOwBPxWO9kw1eHpKFw-1; Wed, 06 Apr 2022 08:05:17 -0400 X-MC-Unique: qXu-uOwBPxWO9kw1eHpKFw-1 Received: by mail-wr1-f69.google.com with SMTP id d29-20020adfa35d000000b002060fd92b14so421738wrb.23 for ; Wed, 06 Apr 2022 05:05:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tw8XJTr7APy9pfnaOEzSC77D6rbxT+oP9DqjEoBUJRM=; b=h6fDPkxWwCayttqoZx1ONST49vE1uH5B288E+B6uFB56VgnsoNXqRlw4o6QSsuDiDu hmF5Imok4ZUp6P/7qlFIKHD1UpWHQkpH8qpGyzkUEsjYDdiEyVsrNlur/qykUR7hK/hm wEoxNeR7ezWlYyTbQqJyOKAqssLkmCaBHAN/iIzWIP4vGqX5SvJQ4HJAq3ga57dwBMOR z78DPMCWRSqyKcFbGC4xtV5m6mKXp9bU947otAEWBA/49PVqN5G3/rEx1UEzJgvAMZ/0 GeOOCWE3DHhSG8x0EOvuOG3P1h2/KvsdMfXmK41EzfLa1t6knF7EQlLuivVJAO9+GT78 /SqA== X-Gm-Message-State: AOAM533sQ5yHdrXS6jeZ/g5FEFuMuWMFTo9F1ZGJexp+g85jP3quNTAH ArD2aqruPQbrzdJXHzOVY9WjL7OgSU4s+m8xar6gmHUZZeIdYGHliEOcrfx8aKLLf6jPTjyHVMt ZIJPaQJQNxkNrkHHExn267rGNdMabnISD6HF4roV//7Wjep2zYIvQjPLJbAjZAgCv7tV5w8mKIQ == X-Received: by 2002:a05:600c:3482:b0:38c:40:9b30 with SMTP id a2-20020a05600c348200b0038c00409b30mr7340188wmq.68.1649246715982; Wed, 06 Apr 2022 05:05:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwS4rJR1cQGtJXT3ZbGE4JlzGoJ8w63kBueh+2zVm5cDB6dc+U0g7LEAaVH/gAX3jzkinEonw== X-Received: by 2002:a05:600c:3482:b0:38c:40:9b30 with SMTP id a2-20020a05600c348200b0038c00409b30mr7340145wmq.68.1649246715499; Wed, 06 Apr 2022 05:05:15 -0700 (PDT) Received: from localhost (host86-169-131-113.range86-169.btcentralplus.com. [86.169.131.113]) by smtp.gmail.com with ESMTPSA id p5-20020adff205000000b0020614a499fbsm9968734wro.90.2022.04.06.05.05.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Apr 2022 05:05:14 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv2 12/16] gdb: more 'const' in gdb/reggroups.{c,h} Date: Wed, 6 Apr 2022 13:04:45 +0100 Message-Id: X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_INVALID, DKIM_SIGNED, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Apr 2022 12:05:20 -0000 Convert the reggroup_new and reggroup_gdbarch_new functions to return a 'const regggroup *', and fix up all the fallout. There should be no user visible changes after this commit. --- gdb/csky-tdep.c | 10 +++++----- gdb/i386-tdep.c | 4 ++-- gdb/m32c-tdep.c | 2 +- gdb/m68hc11-tdep.c | 4 ++-- gdb/mep-tdep.c | 6 +++--- gdb/nds32-tdep.c | 20 ++++++++++---------- gdb/reggroups.c | 8 ++++---- gdb/reggroups.h | 13 +++++++------ gdb/riscv-tdep.c | 2 +- gdb/xtensa-tdep.c | 8 ++++---- 10 files changed, 39 insertions(+), 38 deletions(-) diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c index feb416a2406..3712409dbe8 100644 --- a/gdb/csky-tdep.c +++ b/gdb/csky-tdep.c @@ -61,11 +61,11 @@ /* Control debugging information emitted in this file. */ static bool csky_debug = false; -static struct reggroup *cr_reggroup; -static struct reggroup *fr_reggroup; -static struct reggroup *vr_reggroup; -static struct reggroup *mmu_reggroup; -static struct reggroup *prof_reggroup; +static const reggroup *cr_reggroup; +static const reggroup *fr_reggroup; +static const reggroup *vr_reggroup; +static const reggroup *mmu_reggroup; +static const reggroup *prof_reggroup; /* Convenience function to print debug messages in prologue analysis. */ diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 99a81b98da1..8501e12e241 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -4531,8 +4531,8 @@ i386_svr4_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) /* i386 register groups. In addition to the normal groups, add "mmx" and "sse". */ -static struct reggroup *i386_sse_reggroup; -static struct reggroup *i386_mmx_reggroup; +static const reggroup *i386_sse_reggroup; +static const reggroup *i386_mmx_reggroup; static void i386_init_reggroups (void) diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c index 5a767c9ed52..55ef5a551f8 100644 --- a/gdb/m32c-tdep.c +++ b/gdb/m32c-tdep.c @@ -35,7 +35,7 @@ /* The m32c tdep structure. */ -static struct reggroup *m32c_dma_reggroup; +static const reggroup *m32c_dma_reggroup; /* The type of a function that moves the value of REG between CACHE or BUF --- in either direction. */ diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c index 9d978d88018..5c1f20415c8 100644 --- a/gdb/m68hc11-tdep.c +++ b/gdb/m68hc11-tdep.c @@ -1346,8 +1346,8 @@ m68hc11_elf_make_msymbol_special (asymbol *sym, struct minimal_symbol *msym) /* 68HC11/68HC12 register groups. Identify real hard registers and soft registers used by gcc. */ -static struct reggroup *m68hc11_soft_reggroup; -static struct reggroup *m68hc11_hard_reggroup; +static const reggroup *m68hc11_soft_reggroup; +static const reggroup *m68hc11_hard_reggroup; static void m68hc11_init_reggroups (void) diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c index e449c66c9b5..27a1c5dd1ca 100644 --- a/gdb/mep-tdep.c +++ b/gdb/mep-tdep.c @@ -1022,9 +1022,9 @@ mep_register_name (struct gdbarch *gdbarch, int regnr) /* Custom register groups for the MeP. */ -static struct reggroup *mep_csr_reggroup; /* control/special */ -static struct reggroup *mep_cr_reggroup; /* coprocessor general-purpose */ -static struct reggroup *mep_ccr_reggroup; /* coprocessor control */ +static const reggroup *mep_csr_reggroup; /* control/special */ +static const reggroup *mep_cr_reggroup; /* coprocessor general-purpose */ +static const reggroup *mep_ccr_reggroup; /* coprocessor control */ static int diff --git a/gdb/nds32-tdep.c b/gdb/nds32-tdep.c index a94a03ab2ab..06b129bdd31 100644 --- a/gdb/nds32-tdep.c +++ b/gdb/nds32-tdep.c @@ -314,16 +314,16 @@ nds32_dwarf2_reg_to_regnum (struct gdbarch *gdbarch, int num) } /* NDS32 register groups. */ -static struct reggroup *nds32_cr_reggroup; -static struct reggroup *nds32_ir_reggroup; -static struct reggroup *nds32_mr_reggroup; -static struct reggroup *nds32_dr_reggroup; -static struct reggroup *nds32_pfr_reggroup; -static struct reggroup *nds32_hspr_reggroup; -static struct reggroup *nds32_dmar_reggroup; -static struct reggroup *nds32_racr_reggroup; -static struct reggroup *nds32_idr_reggroup; -static struct reggroup *nds32_secur_reggroup; +static const reggroup *nds32_cr_reggroup; +static const reggroup *nds32_ir_reggroup; +static const reggroup *nds32_mr_reggroup; +static const reggroup *nds32_dr_reggroup; +static const reggroup *nds32_pfr_reggroup; +static const reggroup *nds32_hspr_reggroup; +static const reggroup *nds32_dmar_reggroup; +static const reggroup *nds32_racr_reggroup; +static const reggroup *nds32_idr_reggroup; +static const reggroup *nds32_secur_reggroup; static void nds32_init_reggroups (void) diff --git a/gdb/reggroups.c b/gdb/reggroups.c index 4607c4b674c..419e091c3c0 100644 --- a/gdb/reggroups.c +++ b/gdb/reggroups.c @@ -36,7 +36,7 @@ struct reggroup enum reggroup_type type; }; -struct reggroup * +const reggroup * reggroup_new (const char *name, enum reggroup_type type) { struct reggroup *group = XNEW (struct reggroup); @@ -48,7 +48,7 @@ reggroup_new (const char *name, enum reggroup_type type) /* See reggroups.h. */ -struct reggroup * +const reggroup * reggroup_gdbarch_new (struct gdbarch *gdbarch, const char *name, enum reggroup_type type) { @@ -81,7 +81,7 @@ struct reggroups { /* Add GROUP to the list of register groups. */ - void add (struct reggroup *group) + void add (const reggroup *group) { gdb_assert (group != nullptr); gdb_assert (std::find (m_groups.begin(), m_groups.end(), group) @@ -116,7 +116,7 @@ static struct gdbarch_data *reggroups_data; /* Add GROUP to the list of register groups for GDBARCH. */ void -reggroup_add (struct gdbarch *gdbarch, struct reggroup *group) +reggroup_add (struct gdbarch *gdbarch, const reggroup *group) { struct reggroups *groups = (struct reggroups *) gdbarch_data (gdbarch, reggroups_data); diff --git a/gdb/reggroups.h b/gdb/reggroups.h index 959191c4180..28bd00ff176 100644 --- a/gdb/reggroups.h +++ b/gdb/reggroups.h @@ -39,15 +39,16 @@ extern struct reggroup *const save_reggroup; extern struct reggroup *const restore_reggroup; /* Create a new local register group. */ -extern struct reggroup *reggroup_new (const char *name, - enum reggroup_type type); +extern const reggroup *reggroup_new (const char *name, + enum reggroup_type type); + /* Create a new register group allocated onto the gdbarch obstack. */ -extern struct reggroup *reggroup_gdbarch_new (struct gdbarch *gdbarch, - const char *name, - enum reggroup_type type); +extern const reggroup *reggroup_gdbarch_new (struct gdbarch *gdbarch, + const char *name, + enum reggroup_type type); /* Add a register group (with attribute values) to the pre-defined list. */ -extern void reggroup_add (struct gdbarch *gdbarch, struct reggroup *group); +extern void reggroup_add (struct gdbarch *gdbarch, const reggroup *group); /* Register group attributes. */ extern const char *reggroup_name (const struct reggroup *reggroup); diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c index 79b81351039..ab239744393 100644 --- a/gdb/riscv-tdep.c +++ b/gdb/riscv-tdep.c @@ -129,7 +129,7 @@ struct riscv_unwind_cache /* RISC-V specific register group for CSRs. */ -static reggroup *csr_reggroup = NULL; +static const reggroup *csr_reggroup = nullptr; /* Callback function for user_reg_add. */ diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c index 6e478ee893d..89bdd7ffd28 100644 --- a/gdb/xtensa-tdep.c +++ b/gdb/xtensa-tdep.c @@ -712,10 +712,10 @@ xtensa_pseudo_register_write (struct gdbarch *gdbarch, _("invalid register number %d"), regnum); } -static struct reggroup *xtensa_ar_reggroup; -static struct reggroup *xtensa_user_reggroup; -static struct reggroup *xtensa_vectra_reggroup; -static struct reggroup *xtensa_cp[XTENSA_MAX_COPROCESSOR]; +static const reggroup *xtensa_ar_reggroup; +static const reggroup *xtensa_user_reggroup; +static const reggroup *xtensa_vectra_reggroup; +static const reggroup *xtensa_cp[XTENSA_MAX_COPROCESSOR]; static void xtensa_init_reggroups (void) -- 2.25.4