From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by sourceware.org (Postfix) with ESMTPS id 0CA8D3939C12 for ; Wed, 17 Jun 2020 17:38:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0CA8D3939C12 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wr1-x442.google.com with SMTP id a6so1293396wrm.4 for ; Wed, 17 Jun 2020 10:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zJVosfDiGs6PraGS1Tvtv7O0hb3+B3vYQYDAyybLhlE=; b=ebRYFBe7p5+8poUELc2XOVSOwBaI7qW/Tmhx61qwjKddGh4iBIp2z+JZqbfftLJtq8 bOygx+9whSII2OaLTdd5f0gkjE0YR+gslWNmutCPOACRQvYqtBumFzmUHJyWK2NjwfVH TAA0ofSZ0wcYiuQB0jJT3ecM8uPC9UnDsBDhkDpfpEiDlNfQh9XolWl/v4x38CGpx2M7 D3mileqIGByf4rVvHYa28CrU7xvy4dA4mwnIYPp5Hw3MNLol9lhMVeGaWmb+K1txYio7 tSwPFlq0XV+B62QRVHwcMk1xQ5OthHkOurJZaOWtqjTyu3rdp87dCIFZ8Y0lHA9SZdCo jyrg== 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=zJVosfDiGs6PraGS1Tvtv7O0hb3+B3vYQYDAyybLhlE=; b=F8SZApaEFEN6z4c5T0X3ZJIFPyjBbjulk2h+sEGHbCWZJhEg0H9FBKRD9JcJIzm+p8 o816xm/ty2ybGwJ+54qd/XCx1Vwa0dj1Exqgma5y8NVps76qE/nqZTDEObwTd0kMjgv1 SlN4P8llDpxzb3nCw4zOtyq5AVD/eOmER9zaGZoZFXMXaNOIk7yyfLAKzcDQE2QnHTDk HSuMjoghPv66314nTDUSzmobWxNyXo8bSsWHotcipt4ciwRUC0RiddMeCdYpT2thkoh2 bodZJFEnsYXWmeRCdLddBykPx3NAqFwZKtFmctKzrJkgHNf1EkSsBmC77PenQkKjLz5N D05Q== X-Gm-Message-State: AOAM533rqGhbf+ByDbzm/waG/cUvz3t/2api6HQh1pIgI+9v0oYxHRxZ MriZIOrMY2vQIHYQrJ0waqNrQapayjM= X-Google-Smtp-Source: ABdhPJwN9sq0NVjsGFQewNii7lHmI4k0SVE9nTCwiEyCHvailkUhSRLi4PLZCzdWIeR6LO0vntYHQQ== X-Received: by 2002:adf:a306:: with SMTP id c6mr401313wrb.122.1592415495772; Wed, 17 Jun 2020 10:38:15 -0700 (PDT) Received: from localhost (host86-128-12-16.range86-128.btcentralplus.com. [86.128.12.16]) by smtp.gmail.com with ESMTPSA id k21sm340218wrd.24.2020.06.17.10.38.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2020 10:38:15 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Subject: [PATCH 1/5] gdb: Remove deprecated_set_gdbarch_data Date: Wed, 17 Jun 2020 18:38:05 +0100 Message-Id: <4661a532a3f9873127c6b056bea80ebadb7041e2.1592415321.git.andrew.burgess@embecosm.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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, 17 Jun 2020 17:38:19 -0000 There are currently two remaining uses of deprecated_set_gdbarch_data, both of which are needed because during gdbarch initialisation we call gdbarch_data for a data field that is registered using: gdbarch_data_register_post_init (....) However, in both of these cases, the only thing that the call back needs from the gdbarch struct is its obstack. Given this there is nothing stopping us changing the post-init hooks into pre-init hooks. The pre-init hooks don't get passed the full gdbarch, they only get passed its obstack. The IA64 change is completely untested. The user-regs change has been tested a little by locally adding some user-regs to the x86-64 target, and also by running the RISC-V tests, which do use user-regs. gdb/ChangeLog: * gdbarch.c: Regenerate. * gdbarch.h: Regenerate. * gdbarch.sh (deprecated_set_gdbarch_data): Delete. (gdbarch_data): Use internal_error for the case where deprecated_set_gdbarch_data was originally needed. * ia64-libunwind-tdep.c (libunwind_descr_init): Update parameters, and use passed in obstack. (libunwind_frame_set_descr): Should no longer get back NULL from gdbarch_data. (_initialize_libunwind_frame): Register as a pre-init gdbarch data type. * user-regs.c (user_regs_init): Update parameters, and use passed in obstack. (user_reg_add): Should no longer get back NULL from gdbarch_data. (_initialize_user_regs): Register as a pre-init gdbarch data type. --- gdb/ChangeLog | 18 ++++++++++++++++++ gdb/gdbarch.c | 22 +++------------------- gdb/gdbarch.h | 3 --- gdb/gdbarch.sh | 25 +++---------------------- gdb/ia64-libunwind-tdep.c | 15 ++++----------- gdb/user-regs.c | 18 +++++------------- 6 files changed, 33 insertions(+), 68 deletions(-) diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 55e4a67e2c5..cc3962d951a 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -5240,20 +5240,6 @@ alloc_gdbarch_data (struct gdbarch *gdbarch) gdbarch->data = GDBARCH_OBSTACK_CALLOC (gdbarch, gdbarch->nr_data, void *); } -/* Initialize the current value of the specified per-architecture - data-pointer. */ - -void -deprecated_set_gdbarch_data (struct gdbarch *gdbarch, - struct gdbarch_data *data, - void *pointer) -{ - gdb_assert (data->index < gdbarch->nr_data); - gdb_assert (gdbarch->data[data->index] == NULL); - gdb_assert (data->pre_init == NULL); - gdbarch->data[data->index] = pointer; -} - /* Return the current value of the specified per-architecture data-pointer. */ @@ -5283,11 +5269,9 @@ gdbarch_data (struct gdbarch *gdbarch, struct gdbarch_data *data) data->init_p = 1; } else - /* The architecture initialization hasn't completed - punt - - hope that the caller knows what they are doing. Once - deprecated_set_gdbarch_data has been initialized, this can be - changed to an internal error. */ - return NULL; + internal_error (__FILE__, __LINE__, + _("gdbarch post-init data field can only be used " + "after gdbarch is fully initialised")); gdb_assert (gdbarch->data[data->index] != NULL); } return gdbarch->data[data->index]; diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index c7621f2fda1..ee42972d66f 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -1849,9 +1849,6 @@ typedef void *(gdbarch_data_pre_init_ftype) (struct obstack *obstack); extern struct gdbarch_data *gdbarch_data_register_pre_init (gdbarch_data_pre_init_ftype *init); typedef void *(gdbarch_data_post_init_ftype) (struct gdbarch *gdbarch); extern struct gdbarch_data *gdbarch_data_register_post_init (gdbarch_data_post_init_ftype *init); -extern void deprecated_set_gdbarch_data (struct gdbarch *gdbarch, - struct gdbarch_data *data, - void *pointer); extern void *gdbarch_data (struct gdbarch *gdbarch, struct gdbarch_data *); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index e297b1c56a0..f1e948e6037 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -1634,9 +1634,6 @@ typedef void *(gdbarch_data_pre_init_ftype) (struct obstack *obstack); extern struct gdbarch_data *gdbarch_data_register_pre_init (gdbarch_data_pre_init_ftype *init); typedef void *(gdbarch_data_post_init_ftype) (struct gdbarch *gdbarch); extern struct gdbarch_data *gdbarch_data_register_post_init (gdbarch_data_post_init_ftype *init); -extern void deprecated_set_gdbarch_data (struct gdbarch *gdbarch, - struct gdbarch_data *data, - void *pointer); extern void *gdbarch_data (struct gdbarch *gdbarch, struct gdbarch_data *); @@ -2241,20 +2238,6 @@ alloc_gdbarch_data (struct gdbarch *gdbarch) gdbarch->data = GDBARCH_OBSTACK_CALLOC (gdbarch, gdbarch->nr_data, void *); } -/* Initialize the current value of the specified per-architecture - data-pointer. */ - -void -deprecated_set_gdbarch_data (struct gdbarch *gdbarch, - struct gdbarch_data *data, - void *pointer) -{ - gdb_assert (data->index < gdbarch->nr_data); - gdb_assert (gdbarch->data[data->index] == NULL); - gdb_assert (data->pre_init == NULL); - gdbarch->data[data->index] = pointer; -} - /* Return the current value of the specified per-architecture data-pointer. */ @@ -2284,11 +2267,9 @@ gdbarch_data (struct gdbarch *gdbarch, struct gdbarch_data *data) data->init_p = 1; } else - /* The architecture initialization hasn't completed - punt - - hope that the caller knows what they are doing. Once - deprecated_set_gdbarch_data has been initialized, this can be - changed to an internal error. */ - return NULL; + internal_error (__FILE__, __LINE__, + _("gdbarch post-init data field can only be used " + "after gdbarch is fully initialised")); gdb_assert (gdbarch->data[data->index] != NULL); } return gdbarch->data[data->index]; diff --git a/gdb/ia64-libunwind-tdep.c b/gdb/ia64-libunwind-tdep.c index 59b7df13d2f..94881bbfb5d 100644 --- a/gdb/ia64-libunwind-tdep.c +++ b/gdb/ia64-libunwind-tdep.c @@ -133,10 +133,10 @@ libunwind_descr (struct gdbarch *gdbarch) } static void * -libunwind_descr_init (struct gdbarch *gdbarch) +libunwind_descr_init (struct obstack *obstack) { struct libunwind_descr *descr - = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct libunwind_descr); + = OBSTACK_ZALLOC (obstack, struct libunwind_descr); return descr; } @@ -151,14 +151,7 @@ libunwind_frame_set_descr (struct gdbarch *gdbarch, arch_descr = ((struct libunwind_descr *) gdbarch_data (gdbarch, libunwind_descr_handle)); - - if (arch_descr == NULL) - { - /* First time here. Must initialize data area. */ - arch_descr = (struct libunwind_descr *) libunwind_descr_init (gdbarch); - deprecated_set_gdbarch_data (gdbarch, - libunwind_descr_handle, arch_descr); - } + gdb_assert (arch_descr != NULL); /* Copy new descriptor info into arch descriptor. */ arch_descr->gdb2uw = descr->gdb2uw; @@ -596,7 +589,7 @@ void _initialize_libunwind_frame () { libunwind_descr_handle - = gdbarch_data_register_post_init (libunwind_descr_init); + = gdbarch_data_register_pre_init (libunwind_descr_init); libunwind_initialized = libunwind_load (); } diff --git a/gdb/user-regs.c b/gdb/user-regs.c index cb922313b0c..d461f857390 100644 --- a/gdb/user-regs.c +++ b/gdb/user-regs.c @@ -98,16 +98,15 @@ user_reg_add_builtin (const char *name, user_reg_read_ftype *xread, static struct gdbarch_data *user_regs_data; static void * -user_regs_init (struct gdbarch *gdbarch) +user_regs_init (struct obstack *obstack) { struct user_reg *reg; - struct gdb_user_regs *regs - = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct gdb_user_regs); + struct gdb_user_regs *regs = OBSTACK_ZALLOC (obstack, struct gdb_user_regs); regs->last = ®s->first; for (reg = builtin_user_regs.first; reg != NULL; reg = reg->next) append_user_reg (regs, reg->name, reg->xread, reg->baton, - GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg)); + OBSTACK_ZALLOC (obstack, struct user_reg)); return regs; } @@ -117,14 +116,7 @@ user_reg_add (struct gdbarch *gdbarch, const char *name, { struct gdb_user_regs *regs = (struct gdb_user_regs *) gdbarch_data (gdbarch, user_regs_data); - - if (regs == NULL) - { - /* ULGH, called during architecture initialization. Patch - things up. */ - regs = (struct gdb_user_regs *) user_regs_init (gdbarch); - deprecated_set_gdbarch_data (gdbarch, user_regs_data, regs); - } + gdb_assert (regs != NULL); append_user_reg (regs, name, xread, baton, GDBARCH_OBSTACK_ZALLOC (gdbarch, struct user_reg)); } @@ -240,7 +232,7 @@ void _initialize_user_regs (); void _initialize_user_regs () { - user_regs_data = gdbarch_data_register_post_init (user_regs_init); + user_regs_data = gdbarch_data_register_pre_init (user_regs_init); add_cmd ("user-registers", class_maintenance, maintenance_print_user_registers, -- 2.25.4