From 7de2341de55ac437100dd6d0ad1fcab41fcae8c4 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Mon, 10 Nov 2003 02:50:04 +0000 Subject: [PATCH] 2003-11-09 Andrew Cagney * gdbarch.sh (clear_gdbarch_swap): Delete function. (swapout_gdbarch_swap): Delete function. (swapin_gdbarch_swap): Delete function. (init_gdbarch_swap): Delete function. (initialize_non_multiarch): Delete function. (current_gdbarch_swap_in_hack): New function. (current_gdbarch_swap_out_hack): New function. (current_gdbarch_swap_init_hack): New function. * gdbarch.c: Re-generate. --- gdb/ChangeLog | 10 ++++++ gdb/gdbarch.c | 76 +++++++++++++++++---------------------------- gdb/gdbarch.h | 5 --- gdb/gdbarch.sh | 83 ++++++++++++++++++-------------------------------- 4 files changed, 67 insertions(+), 107 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d5a24f25c7b..0af2e0d3b94 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2003-11-09 Andrew Cagney + * gdbarch.sh (clear_gdbarch_swap): Delete function. + (swapout_gdbarch_swap): Delete function. + (swapin_gdbarch_swap): Delete function. + (init_gdbarch_swap): Delete function. + (initialize_non_multiarch): Delete function. + (current_gdbarch_swap_in_hack): New function. + (current_gdbarch_swap_out_hack): New function. + (current_gdbarch_swap_init_hack): New function. + * gdbarch.c: Re-generate. + * gdbarch.sh (verify_gdbarch, gdbarch_dump): Rename "gdbarch" parameter to "current_gdbarch". Add comment explaining why. (TARGET_FLOAT_FORMAT: Pass "current_gdbarch" to default_double_format. diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 89bb0ed16c9..1c79c43ad05 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -53,10 +53,6 @@ /* Static function declarations */ static void alloc_gdbarch_data (struct gdbarch *); -static void init_gdbarch_swap (struct gdbarch *); -static void clear_gdbarch_swap (struct gdbarch *); -static void swapout_gdbarch_swap (struct gdbarch *); -static void swapin_gdbarch_swap (struct gdbarch *); /* Non-zero if we want to trace architecture code. */ @@ -448,19 +444,6 @@ struct gdbarch startup_gdbarch = struct gdbarch *current_gdbarch = &startup_gdbarch; -/* Do any initialization needed for a non-multiarch configuration - after the _initialize_MODULE functions have been run. */ -void -initialize_non_multiarch (void) -{ - alloc_gdbarch_data (&startup_gdbarch); - /* Ensure that all swap areas are zeroed so that they again think - they are starting from scratch. */ - clear_gdbarch_swap (&startup_gdbarch); - init_gdbarch_swap (&startup_gdbarch); -} - - /* Create a new ``struct gdbarch'' based on information provided by ``struct gdbarch_info''. */ @@ -5742,31 +5725,21 @@ register_gdbarch_swap (void *data, } static void -clear_gdbarch_swap (struct gdbarch *gdbarch) -{ - struct gdbarch_swap *curr; - for (curr = gdbarch->swap; - curr != NULL; - curr = curr->next) - { - memset (curr->source->data, 0, curr->source->sizeof_data); - } -} - -static void -init_gdbarch_swap (struct gdbarch *gdbarch) +current_gdbarch_swap_init_hack (void) { struct gdbarch_swap_registration *rego; - struct gdbarch_swap **curr = &gdbarch->swap; + struct gdbarch_swap **curr = ¤t_gdbarch->swap; for (rego = gdbarch_swap_registry.registrations; rego != NULL; rego = rego->next) { if (rego->data != NULL) { - (*curr) = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct gdbarch_swap); + (*curr) = GDBARCH_OBSTACK_ZALLOC (current_gdbarch, + struct gdbarch_swap); (*curr)->source = rego; - (*curr)->swap = gdbarch_obstack_zalloc (gdbarch, rego->sizeof_data); + (*curr)->swap = gdbarch_obstack_zalloc (current_gdbarch, + rego->sizeof_data); (*curr)->next = NULL; curr = &(*curr)->next; } @@ -5775,24 +5748,35 @@ init_gdbarch_swap (struct gdbarch *gdbarch) } } -static void -swapout_gdbarch_swap (struct gdbarch *gdbarch) +static struct gdbarch * +current_gdbarch_swap_out_hack (void) { + struct gdbarch *old_gdbarch = current_gdbarch; struct gdbarch_swap *curr; - for (curr = gdbarch->swap; + + gdb_assert (old_gdbarch != NULL); + for (curr = old_gdbarch->swap; curr != NULL; curr = curr->next) - memcpy (curr->swap, curr->source->data, curr->source->sizeof_data); + { + memcpy (curr->swap, curr->source->data, curr->source->sizeof_data); + memset (curr->source->data, 0, curr->source->sizeof_data); + } + current_gdbarch = NULL; + return old_gdbarch; } static void -swapin_gdbarch_swap (struct gdbarch *gdbarch) +current_gdbarch_swap_in_hack (struct gdbarch *new_gdbarch) { struct gdbarch_swap *curr; - for (curr = gdbarch->swap; + + gdb_assert (current_gdbarch == NULL); + for (curr = new_gdbarch->swap; curr != NULL; curr = curr->next) memcpy (curr->source->data, curr->swap, curr->source->sizeof_data); + current_gdbarch = new_gdbarch; } @@ -5972,8 +5956,7 @@ gdbarch_update_p (struct gdbarch_info info) /* Swap the data belonging to the old target out setting the installed data to zero. This stops the ->init() function trying to refer to the previous architecture's global data structures. */ - swapout_gdbarch_swap (current_gdbarch); - clear_gdbarch_swap (current_gdbarch); + current_gdbarch_swap_out_hack (); /* Save the previously selected architecture, setting the global to NULL. This stops ->init() trying to use the previous @@ -5993,8 +5976,7 @@ gdbarch_update_p (struct gdbarch_info info) { if (gdbarch_debug) fprintf_unfiltered (gdb_stdlog, "gdbarch_update: Target rejected architecture\n"); - swapin_gdbarch_swap (old_gdbarch); - current_gdbarch = old_gdbarch; + current_gdbarch_swap_in_hack (old_gdbarch); return 0; } @@ -6006,8 +5988,7 @@ gdbarch_update_p (struct gdbarch_info info) fprintf_unfiltered (gdb_stdlog, "gdbarch_update: Architecture 0x%08lx (%s) unchanged\n", (long) new_gdbarch, new_gdbarch->bfd_arch_info->printable_name); - swapin_gdbarch_swap (old_gdbarch); - current_gdbarch = old_gdbarch; + current_gdbarch_swap_in_hack (old_gdbarch); return 1; } @@ -6035,8 +6016,7 @@ gdbarch_update_p (struct gdbarch_info info) this->next = rego->arches; rego->arches = this; /* Copy the new architecture in. */ - current_gdbarch = new_gdbarch; - swapin_gdbarch_swap (new_gdbarch); + current_gdbarch_swap_in_hack (new_gdbarch); architecture_changed_event (); return 1; } @@ -6071,7 +6051,7 @@ gdbarch_update_p (struct gdbarch_info info) /* Initialize the per-architecture memory (swap) areas. CURRENT_GDBARCH must be update before these modules are called. */ - init_gdbarch_swap (new_gdbarch); + current_gdbarch_swap_init_hack (); /* Initialize the per-architecture data. CURRENT_GDBARCH must be updated before these modules are called. */ diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 021ab363639..05fb41f9b01 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -2644,11 +2644,6 @@ extern void set_gdbarch_from_file (bfd *); extern void initialize_current_architecture (void); -/* For non-multiarched targets, do any initialization of the default - gdbarch object necessary after the _initialize_MODULE functions - have run. */ -extern void initialize_non_multiarch (void); - /* gdbarch trace variable */ extern int gdbarch_debug; diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 7453276f01b..16dcc29fd0b 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -1250,11 +1250,6 @@ extern void set_gdbarch_from_file (bfd *); extern void initialize_current_architecture (void); -/* For non-multiarched targets, do any initialization of the default - gdbarch object necessary after the _initialize_MODULE functions - have run. */ -extern void initialize_non_multiarch (void); - /* gdbarch trace variable */ extern int gdbarch_debug; @@ -1295,10 +1290,6 @@ cat <swap; - curr != NULL; - curr = curr->next) - { - memset (curr->source->data, 0, curr->source->sizeof_data); - } -} - -static void -init_gdbarch_swap (struct gdbarch *gdbarch) +current_gdbarch_swap_init_hack (void) { struct gdbarch_swap_registration *rego; - struct gdbarch_swap **curr = &gdbarch->swap; + struct gdbarch_swap **curr = ¤t_gdbarch->swap; for (rego = gdbarch_swap_registry.registrations; rego != NULL; rego = rego->next) { if (rego->data != NULL) { - (*curr) = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct gdbarch_swap); + (*curr) = GDBARCH_OBSTACK_ZALLOC (current_gdbarch, + struct gdbarch_swap); (*curr)->source = rego; - (*curr)->swap = gdbarch_obstack_zalloc (gdbarch, rego->sizeof_data); + (*curr)->swap = gdbarch_obstack_zalloc (current_gdbarch, + rego->sizeof_data); (*curr)->next = NULL; curr = &(*curr)->next; } @@ -1992,24 +1960,35 @@ init_gdbarch_swap (struct gdbarch *gdbarch) } } -static void -swapout_gdbarch_swap (struct gdbarch *gdbarch) +static struct gdbarch * +current_gdbarch_swap_out_hack (void) { + struct gdbarch *old_gdbarch = current_gdbarch; struct gdbarch_swap *curr; - for (curr = gdbarch->swap; + + gdb_assert (old_gdbarch != NULL); + for (curr = old_gdbarch->swap; curr != NULL; curr = curr->next) - memcpy (curr->swap, curr->source->data, curr->source->sizeof_data); + { + memcpy (curr->swap, curr->source->data, curr->source->sizeof_data); + memset (curr->source->data, 0, curr->source->sizeof_data); + } + current_gdbarch = NULL; + return old_gdbarch; } static void -swapin_gdbarch_swap (struct gdbarch *gdbarch) +current_gdbarch_swap_in_hack (struct gdbarch *new_gdbarch) { struct gdbarch_swap *curr; - for (curr = gdbarch->swap; + + gdb_assert (current_gdbarch == NULL); + for (curr = new_gdbarch->swap; curr != NULL; curr = curr->next) memcpy (curr->source->data, curr->swap, curr->source->sizeof_data); + current_gdbarch = new_gdbarch; } @@ -2189,8 +2168,7 @@ gdbarch_update_p (struct gdbarch_info info) /* Swap the data belonging to the old target out setting the installed data to zero. This stops the ->init() function trying to refer to the previous architecture's global data structures. */ - swapout_gdbarch_swap (current_gdbarch); - clear_gdbarch_swap (current_gdbarch); + current_gdbarch_swap_out_hack (); /* Save the previously selected architecture, setting the global to NULL. This stops ->init() trying to use the previous @@ -2210,8 +2188,7 @@ gdbarch_update_p (struct gdbarch_info info) { if (gdbarch_debug) fprintf_unfiltered (gdb_stdlog, "gdbarch_update: Target rejected architecture\\n"); - swapin_gdbarch_swap (old_gdbarch); - current_gdbarch = old_gdbarch; + current_gdbarch_swap_in_hack (old_gdbarch); return 0; } @@ -2223,8 +2200,7 @@ gdbarch_update_p (struct gdbarch_info info) fprintf_unfiltered (gdb_stdlog, "gdbarch_update: Architecture 0x%08lx (%s) unchanged\\n", (long) new_gdbarch, new_gdbarch->bfd_arch_info->printable_name); - swapin_gdbarch_swap (old_gdbarch); - current_gdbarch = old_gdbarch; + current_gdbarch_swap_in_hack (old_gdbarch); return 1; } @@ -2252,8 +2228,7 @@ gdbarch_update_p (struct gdbarch_info info) this->next = rego->arches; rego->arches = this; /* Copy the new architecture in. */ - current_gdbarch = new_gdbarch; - swapin_gdbarch_swap (new_gdbarch); + current_gdbarch_swap_in_hack (new_gdbarch); architecture_changed_event (); return 1; } @@ -2288,7 +2263,7 @@ gdbarch_update_p (struct gdbarch_info info) /* Initialize the per-architecture memory (swap) areas. CURRENT_GDBARCH must be update before these modules are called. */ - init_gdbarch_swap (new_gdbarch); + current_gdbarch_swap_init_hack (); /* Initialize the per-architecture data. CURRENT_GDBARCH must be updated before these modules are called. */ -- 2.30.2