OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Yank previous change - set current arch to NULL.

Browse Source
This commit is contained in:
Andrew Cagney 2002-05-02 01:38:27 +00:00
parent 6371b78ee2
commit cf17c188f5
3 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2002-05-02 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (gdbarch_update_p): Revert 2002-05-02 Andrew Cagney
<cagney@redhat.com> change.
* gdbarch.c: Regenerate.
2002-05-02 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (gdbarch_update_p): Swap out the old architecture

35
gdb/gdbarch.c
View File

@ -4887,7 +4887,6 @@ int
gdbarch_update_p (struct gdbarch_info info)
{
struct gdbarch *new_gdbarch;
struct gdbarch *old_gdbarch;
struct gdbarch_registration *rego;
/* Fill in missing parts of the INFO struct using a number of
@ -4956,40 +4955,30 @@ gdbarch_update_p (struct gdbarch_info info)
return 0;
}
/* Swap the data belonging to the old target out. This stops the
->init() function trying to refer to the previous architecture. */
swapout_gdbarch_swap (current_gdbarch);
init_gdbarch_swap (current_gdbarch);
old_gdbarch = current_gdbarch;
current_gdbarch = NULL;
/* Ask the target for a replacement architecture. */
new_gdbarch = rego->init (info, rego->arches);
/* Did the target like it? No. Reject the change and revert to the
old architecture. */
/* Did the target like it? No. Reject the change. */
if (new_gdbarch == NULL)
{
if (gdbarch_debug)
fprintf_unfiltered (gdb_stdlog, "gdbarch_update: Target rejected architecture\n");
swapin_gdbarch_swap (old_gdbarch);
current_gdbarch = old_gdbarch;
return 0;
}
/* Did the architecture change? No. Oops, put the old architecture
back. */
if (old_gdbarch == new_gdbarch)
/* Did the architecture change? No. Do nothing. */
if (current_gdbarch == new_gdbarch)
{
if (gdbarch_debug)
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;
return 1;
}
/* Swap all data belonging to the old target out */
swapout_gdbarch_swap (current_gdbarch);
/* Is this a pre-existing architecture? Yes. Move it to the front
of the list of architectures (keeping the list sorted Most
Recently Used) and then copy it in. */
@ -5046,10 +5035,14 @@ gdbarch_update_p (struct gdbarch_info info)
new_gdbarch->dump_tdep = rego->dump_tdep;
verify_gdbarch (new_gdbarch);
/* Initialize the per-architecture data-pointers and swap areas for
all parties that registered an interest in this architecture.
CURRENT_GDBARCH must be updated before these modules are called.
The swap area's will have already been initialized to zero. */
/* Initialize the per-architecture memory (swap) areas.
CURRENT_GDBARCH must be update before these modules are
called. */
init_gdbarch_swap (new_gdbarch);
/* Initialize the per-architecture data-pointer of all parties that
registered an interest in this architecture. CURRENT_GDBARCH
must be updated before these modules are called. */
init_gdbarch_data (new_gdbarch);
architecture_changed_event ();

35
gdb/gdbarch.sh
View File

@ -2079,7 +2079,6 @@ int
gdbarch_update_p (struct gdbarch_info info)
{
struct gdbarch *new_gdbarch;
struct gdbarch *old_gdbarch;
struct gdbarch_registration *rego;
/* Fill in missing parts of the INFO struct using a number of
@ -2148,40 +2147,30 @@ gdbarch_update_p (struct gdbarch_info info)
return 0;
}
/* Swap the data belonging to the old target out. This stops the
->init() function trying to refer to the previous architecture. */
swapout_gdbarch_swap (current_gdbarch);
init_gdbarch_swap (current_gdbarch);
old_gdbarch = current_gdbarch;
current_gdbarch = NULL;
/* Ask the target for a replacement architecture. */
new_gdbarch = rego->init (info, rego->arches);
/* Did the target like it? No. Reject the change and revert to the
old architecture. */
/* Did the target like it? No. Reject the change. */
if (new_gdbarch == NULL)
{
if (gdbarch_debug)
fprintf_unfiltered (gdb_stdlog, "gdbarch_update: Target rejected architecture\\n");
swapin_gdbarch_swap (old_gdbarch);
current_gdbarch = old_gdbarch;
return 0;
}
/* Did the architecture change? No. Oops, put the old architecture
back. */
if (old_gdbarch == new_gdbarch)
/* Did the architecture change? No. Do nothing. */
if (current_gdbarch == new_gdbarch)
{
if (gdbarch_debug)
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;
return 1;
}
/* Swap all data belonging to the old target out */
swapout_gdbarch_swap (current_gdbarch);
/* Is this a pre-existing architecture? Yes. Move it to the front
of the list of architectures (keeping the list sorted Most
Recently Used) and then copy it in. */
@ -2238,10 +2227,14 @@ gdbarch_update_p (struct gdbarch_info info)
new_gdbarch->dump_tdep = rego->dump_tdep;
verify_gdbarch (new_gdbarch);
/* Initialize the per-architecture data-pointers and swap areas for
all parties that registered an interest in this architecture.
CURRENT_GDBARCH must be updated before these modules are called.
The swap area's will have already been initialized to zero. */
/* Initialize the per-architecture memory (swap) areas.
CURRENT_GDBARCH must be update before these modules are
called. */
init_gdbarch_swap (new_gdbarch);
/* Initialize the per-architecture data-pointer of all parties that
registered an interest in this architecture. CURRENT_GDBARCH
must be updated before these modules are called. */
init_gdbarch_data (new_gdbarch);
architecture_changed_event ();