* [rfc] [01/05] Get rid of current_gdbarch in gdbarch.{c,h,sh}
@ 2007-11-07 11:13 Markus Deuling
2007-11-07 12:59 ` Daniel Jacobowitz
0 siblings, 1 reply; 8+ messages in thread
From: Markus Deuling @ 2007-11-07 11:13 UTC (permalink / raw)
To: GDB Patches; +Cc: Ulrich Weigand
[-- Attachment #1: Type: text/plain, Size: 557 bytes --]
Hi,
this patch replaces current_gdbarch by gdbarch in gdbarch_alloc from gdbarch.sh. Due to the fact that
current_gdbarch's focus in gdbarch_alloc is local only it doesn't interfere global current_gdbarch.
So there is no reason to give it the same name as a global variable. Hence this patch renames it.
Tested with testsuite on x86 and gdb_mbuild. Ok to commit ?
ChangeLog:
* gdbarch.sh (gdbarch_alloc): Replace current_gdbarch by gdbarch.
* gdbarch.{c,h}: Regenerate.
--
Markus Deuling
GNU Toolchain for Linux on Cell BE
deuling@de.ibm.com
[-- Attachment #2: diff-gdbarch --]
[-- Type: text/plain, Size: 9658 bytes --]
diff -urpN src/gdb/gdbarch.c dev/gdb/gdbarch.c
--- src/gdb/gdbarch.c 2007-11-07 07:57:51.000000000 +0100
+++ dev/gdb/gdbarch.c 2007-11-07 08:45:09.000000000 +0100
@@ -368,75 +368,75 @@ gdbarch_alloc (const struct gdbarch_info
architecture. This ensures that the new architectures initial
values are not influenced by the previous architecture. Once
everything is parameterised with gdbarch, this will go away. */
- struct gdbarch *current_gdbarch;
+ struct gdbarch *gdbarch;
/* Create an obstack for allocating all the per-architecture memory,
then use that to allocate the architecture vector. */
struct obstack *obstack = XMALLOC (struct obstack);
obstack_init (obstack);
- current_gdbarch = obstack_alloc (obstack, sizeof (*current_gdbarch));
- memset (current_gdbarch, 0, sizeof (*current_gdbarch));
- current_gdbarch->obstack = obstack;
-
- alloc_gdbarch_data (current_gdbarch);
-
- current_gdbarch->tdep = tdep;
-
- current_gdbarch->bfd_arch_info = info->bfd_arch_info;
- current_gdbarch->byte_order = info->byte_order;
- current_gdbarch->osabi = info->osabi;
- current_gdbarch->target_desc = info->target_desc;
+ gdbarch = obstack_alloc (obstack, sizeof (*gdbarch));
+ memset (gdbarch, 0, sizeof (*gdbarch));
+ gdbarch->obstack = obstack;
+
+ alloc_gdbarch_data (gdbarch);
+
+ gdbarch->tdep = tdep;
+
+ gdbarch->bfd_arch_info = info->bfd_arch_info;
+ gdbarch->byte_order = info->byte_order;
+ gdbarch->osabi = info->osabi;
+ gdbarch->target_desc = info->target_desc;
/* Force the explicit initialization of these. */
- current_gdbarch->short_bit = 2*TARGET_CHAR_BIT;
- current_gdbarch->int_bit = 4*TARGET_CHAR_BIT;
- current_gdbarch->long_bit = 4*TARGET_CHAR_BIT;
- current_gdbarch->long_long_bit = 2*current_gdbarch->long_bit;
- current_gdbarch->float_bit = 4*TARGET_CHAR_BIT;
- current_gdbarch->double_bit = 8*TARGET_CHAR_BIT;
- current_gdbarch->long_double_bit = 8*TARGET_CHAR_BIT;
- current_gdbarch->ptr_bit = current_gdbarch->int_bit;
- current_gdbarch->char_signed = -1;
- current_gdbarch->virtual_frame_pointer = legacy_virtual_frame_pointer;
- current_gdbarch->num_regs = -1;
- current_gdbarch->sp_regnum = -1;
- current_gdbarch->pc_regnum = -1;
- current_gdbarch->ps_regnum = -1;
- current_gdbarch->fp0_regnum = -1;
- current_gdbarch->stab_reg_to_regnum = no_op_reg_to_regnum;
- current_gdbarch->ecoff_reg_to_regnum = no_op_reg_to_regnum;
- current_gdbarch->dwarf_reg_to_regnum = no_op_reg_to_regnum;
- current_gdbarch->sdb_reg_to_regnum = no_op_reg_to_regnum;
- current_gdbarch->dwarf2_reg_to_regnum = no_op_reg_to_regnum;
- current_gdbarch->deprecated_fp_regnum = -1;
- current_gdbarch->call_dummy_location = AT_ENTRY_POINT;
- current_gdbarch->print_registers_info = default_print_registers_info;
- current_gdbarch->register_sim_regno = legacy_register_sim_regno;
- current_gdbarch->cannot_fetch_register = cannot_register_not;
- current_gdbarch->cannot_store_register = cannot_register_not;
- current_gdbarch->convert_register_p = generic_convert_register_p;
- current_gdbarch->value_from_register = default_value_from_register;
- current_gdbarch->pointer_to_address = unsigned_pointer_to_address;
- current_gdbarch->address_to_pointer = unsigned_address_to_pointer;
- current_gdbarch->memory_insert_breakpoint = default_memory_insert_breakpoint;
- current_gdbarch->memory_remove_breakpoint = default_memory_remove_breakpoint;
- current_gdbarch->remote_register_number = default_remote_register_number;
- current_gdbarch->stabs_argument_has_addr = default_stabs_argument_has_addr;
- current_gdbarch->convert_from_func_ptr_addr = convert_from_func_ptr_addr_identity;
- current_gdbarch->addr_bits_remove = core_addr_identity;
- current_gdbarch->smash_text_address = core_addr_identity;
- current_gdbarch->skip_trampoline_code = generic_skip_trampoline_code;
- current_gdbarch->skip_solib_resolver = generic_skip_solib_resolver;
- current_gdbarch->in_solib_return_trampoline = generic_in_solib_return_trampoline;
- current_gdbarch->in_function_epilogue_p = generic_in_function_epilogue_p;
- current_gdbarch->construct_inferior_arguments = construct_inferior_arguments;
- current_gdbarch->elf_make_msymbol_special = default_elf_make_msymbol_special;
- current_gdbarch->coff_make_msymbol_special = default_coff_make_msymbol_special;
- current_gdbarch->name_of_malloc = "malloc";
- current_gdbarch->register_reggroup_p = default_register_reggroup_p;
+ gdbarch->short_bit = 2*TARGET_CHAR_BIT;
+ gdbarch->int_bit = 4*TARGET_CHAR_BIT;
+ gdbarch->long_bit = 4*TARGET_CHAR_BIT;
+ gdbarch->long_long_bit = 2*gdbarch->long_bit;
+ gdbarch->float_bit = 4*TARGET_CHAR_BIT;
+ gdbarch->double_bit = 8*TARGET_CHAR_BIT;
+ gdbarch->long_double_bit = 8*TARGET_CHAR_BIT;
+ gdbarch->ptr_bit = gdbarch->int_bit;
+ gdbarch->char_signed = -1;
+ gdbarch->virtual_frame_pointer = legacy_virtual_frame_pointer;
+ gdbarch->num_regs = -1;
+ gdbarch->sp_regnum = -1;
+ gdbarch->pc_regnum = -1;
+ gdbarch->ps_regnum = -1;
+ gdbarch->fp0_regnum = -1;
+ gdbarch->stab_reg_to_regnum = no_op_reg_to_regnum;
+ gdbarch->ecoff_reg_to_regnum = no_op_reg_to_regnum;
+ gdbarch->dwarf_reg_to_regnum = no_op_reg_to_regnum;
+ gdbarch->sdb_reg_to_regnum = no_op_reg_to_regnum;
+ gdbarch->dwarf2_reg_to_regnum = no_op_reg_to_regnum;
+ gdbarch->deprecated_fp_regnum = -1;
+ gdbarch->call_dummy_location = AT_ENTRY_POINT;
+ gdbarch->print_registers_info = default_print_registers_info;
+ gdbarch->register_sim_regno = legacy_register_sim_regno;
+ gdbarch->cannot_fetch_register = cannot_register_not;
+ gdbarch->cannot_store_register = cannot_register_not;
+ gdbarch->convert_register_p = generic_convert_register_p;
+ gdbarch->value_from_register = default_value_from_register;
+ gdbarch->pointer_to_address = unsigned_pointer_to_address;
+ gdbarch->address_to_pointer = unsigned_address_to_pointer;
+ gdbarch->memory_insert_breakpoint = default_memory_insert_breakpoint;
+ gdbarch->memory_remove_breakpoint = default_memory_remove_breakpoint;
+ gdbarch->remote_register_number = default_remote_register_number;
+ gdbarch->stabs_argument_has_addr = default_stabs_argument_has_addr;
+ gdbarch->convert_from_func_ptr_addr = convert_from_func_ptr_addr_identity;
+ gdbarch->addr_bits_remove = core_addr_identity;
+ gdbarch->smash_text_address = core_addr_identity;
+ gdbarch->skip_trampoline_code = generic_skip_trampoline_code;
+ gdbarch->skip_solib_resolver = generic_skip_solib_resolver;
+ gdbarch->in_solib_return_trampoline = generic_in_solib_return_trampoline;
+ gdbarch->in_function_epilogue_p = generic_in_function_epilogue_p;
+ gdbarch->construct_inferior_arguments = construct_inferior_arguments;
+ gdbarch->elf_make_msymbol_special = default_elf_make_msymbol_special;
+ gdbarch->coff_make_msymbol_special = default_coff_make_msymbol_special;
+ gdbarch->name_of_malloc = "malloc";
+ gdbarch->register_reggroup_p = default_register_reggroup_p;
/* gdbarch_alloc() */
- return current_gdbarch;
+ return gdbarch;
}
diff -urpN src/gdb/gdbarch.sh dev/gdb/gdbarch.sh
--- src/gdb/gdbarch.sh 2007-11-07 07:57:51.000000000 +0100
+++ dev/gdb/gdbarch.sh 2007-11-07 08:44:52.000000000 +0100
@@ -355,7 +355,7 @@ v:int:int_bit:::8 * sizeof (int):4*TARGE
v:int:long_bit:::8 * sizeof (long):4*TARGET_CHAR_BIT::0
# Number of bits in a long long or unsigned long long for the target
# machine.
-v:int:long_long_bit:::8 * sizeof (LONGEST):2*current_gdbarch->long_bit::0
+v:int:long_long_bit:::8 * sizeof (LONGEST):2*gdbarch->long_bit::0
# The ABI default bit-size and format for "float", "double", and "long
# double". These bit/format pairs should eventually be combined into
@@ -380,7 +380,7 @@ v:const struct floatformat **:long_doubl
# as well.
#
# ptr_bit is the size of a pointer on the target
-v:int:ptr_bit:::8 * sizeof (void*):current_gdbarch->int_bit::0
+v:int:ptr_bit:::8 * sizeof (void*):gdbarch->int_bit::0
# addr_bit is the size of a target address as represented in gdb
v:int:addr_bit:::8 * sizeof (void*):0:gdbarch_ptr_bit (current_gdbarch):
#
@@ -1202,26 +1202,26 @@ gdbarch_alloc (const struct gdbarch_info
architecture. This ensures that the new architectures initial
values are not influenced by the previous architecture. Once
everything is parameterised with gdbarch, this will go away. */
- struct gdbarch *current_gdbarch;
+ struct gdbarch *gdbarch;
/* Create an obstack for allocating all the per-architecture memory,
then use that to allocate the architecture vector. */
struct obstack *obstack = XMALLOC (struct obstack);
obstack_init (obstack);
- current_gdbarch = obstack_alloc (obstack, sizeof (*current_gdbarch));
- memset (current_gdbarch, 0, sizeof (*current_gdbarch));
- current_gdbarch->obstack = obstack;
+ gdbarch = obstack_alloc (obstack, sizeof (*gdbarch));
+ memset (gdbarch, 0, sizeof (*gdbarch));
+ gdbarch->obstack = obstack;
- alloc_gdbarch_data (current_gdbarch);
+ alloc_gdbarch_data (gdbarch);
- current_gdbarch->tdep = tdep;
+ gdbarch->tdep = tdep;
EOF
printf "\n"
function_list | while do_read
do
if class_is_info_p
then
- printf " current_gdbarch->${function} = info->${function};\n"
+ printf " gdbarch->${function} = info->${function};\n"
fi
done
printf "\n"
@@ -1232,14 +1232,14 @@ do
then
if [ -n "${predefault}" -a "x${predefault}" != "x0" ]
then
- printf " current_gdbarch->${function} = ${predefault};\n"
+ printf " gdbarch->${function} = ${predefault};\n"
fi
fi
done
cat <<EOF
/* gdbarch_alloc() */
- return current_gdbarch;
+ return gdbarch;
}
EOF
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rfc] [01/05] Get rid of current_gdbarch in gdbarch.{c,h,sh}
2007-11-07 11:13 [rfc] [01/05] Get rid of current_gdbarch in gdbarch.{c,h,sh} Markus Deuling
@ 2007-11-07 12:59 ` Daniel Jacobowitz
2007-11-07 14:58 ` Markus Deuling
0 siblings, 1 reply; 8+ messages in thread
From: Daniel Jacobowitz @ 2007-11-07 12:59 UTC (permalink / raw)
To: Markus Deuling; +Cc: GDB Patches, Ulrich Weigand
On Wed, Nov 07, 2007 at 12:11:00PM +0100, Markus Deuling wrote:
> architecture. This ensures that the new architectures initial
> values are not influenced by the previous architecture. Once
> everything is parameterised with gdbarch, this will go away. */
> - struct gdbarch *current_gdbarch;
> + struct gdbarch *gdbarch;
Please read the comment above this variable :-)
--
Daniel Jacobowitz
CodeSourcery
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rfc] [01/05] Get rid of current_gdbarch in gdbarch.{c,h,sh}
2007-11-07 12:59 ` Daniel Jacobowitz
@ 2007-11-07 14:58 ` Markus Deuling
2007-11-07 15:05 ` Daniel Jacobowitz
2007-11-08 13:18 ` Ulrich Weigand
0 siblings, 2 replies; 8+ messages in thread
From: Markus Deuling @ 2007-11-07 14:58 UTC (permalink / raw)
To: GDB Patches; +Cc: Daniel Jacobowitz, Ulrich Weigand
Daniel Jacobowitz schrieb:
> On Wed, Nov 07, 2007 at 12:11:00PM +0100, Markus Deuling wrote:
>> architecture. This ensures that the new architectures initial
>> values are not influenced by the previous architecture. Once
>> everything is parameterised with gdbarch, this will go away. */
>> - struct gdbarch *current_gdbarch;
>> + struct gdbarch *gdbarch;
>
> Please read the comment above this variable :-)
>
Hm,
will gdbarch_alloc go away? I thought every target uses gdbarch_alloc to allocate a basic
gdbarch structure and then it overwrites every necessary callback to fit to its architecture.
This patch just changes the name of current_gdbarch to gdbarch. For gdbarch_alloc current_gdbarch
is a local variable invisible to the rest. Its not the global current_gdbarch what this patch changes.
For me its a bit confusing to have a global current_gdbarch and a local one.
--
Markus Deuling
GNU Toolchain for Linux on Cell BE
deuling@de.ibm.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rfc] [01/05] Get rid of current_gdbarch in gdbarch.{c,h,sh}
2007-11-07 14:58 ` Markus Deuling
@ 2007-11-07 15:05 ` Daniel Jacobowitz
2007-11-08 13:18 ` Ulrich Weigand
1 sibling, 0 replies; 8+ messages in thread
From: Daniel Jacobowitz @ 2007-11-07 15:05 UTC (permalink / raw)
To: Markus Deuling; +Cc: GDB Patches, Ulrich Weigand
On Wed, Nov 07, 2007 at 03:56:10PM +0100, Markus Deuling wrote:
> Daniel Jacobowitz schrieb:
> > On Wed, Nov 07, 2007 at 12:11:00PM +0100, Markus Deuling wrote:
> >> architecture. This ensures that the new architectures initial
> >> values are not influenced by the previous architecture. Once
> >> everything is parameterised with gdbarch, this will go away. */
> >> - struct gdbarch *current_gdbarch;
> >> + struct gdbarch *gdbarch;
> > Please read the comment above this variable :-)
>
> Hm,
> will gdbarch_alloc go away? I thought every target uses gdbarch_alloc to
> allocate a basic
> gdbarch structure and then it overwrites every necessary callback to fit to its
> architecture.
/* NOTE: The new architecture variable is named \`\`current_gdbarch''
so that macros such as TARGET_ARCHITECTURE, when expanded, refer to
the current local architecture and not the previous global
architecture. This ensures that the new architectures initial
values are not influenced by the previous architecture. Once
everything is parameterised with gdbarch, this will go away. */
struct gdbarch *current_gdbarch;
"this will go away" refers to "is named current_gdbarch".
--
Daniel Jacobowitz
CodeSourcery
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rfc] [01/05] Get rid of current_gdbarch in gdbarch.{c,h,sh}
2007-11-07 14:58 ` Markus Deuling
2007-11-07 15:05 ` Daniel Jacobowitz
@ 2007-11-08 13:18 ` Ulrich Weigand
2007-11-09 7:30 ` Markus Deuling
1 sibling, 1 reply; 8+ messages in thread
From: Ulrich Weigand @ 2007-11-08 13:18 UTC (permalink / raw)
To: Markus Deuling; +Cc: GDB Patches, Daniel Jacobowitz
Markus Deuling wrote.
> Daniel Jacobowitz schrieb:
> > On Wed, Nov 07, 2007 at 12:11:00PM +0100, Markus Deuling wrote:
> >> architecture. This ensures that the new architectures initial
> >> values are not influenced by the previous architecture. Once
> >> everything is parameterised with gdbarch, this will go away. */
> >> - struct gdbarch *current_gdbarch;
> >> + struct gdbarch *gdbarch;
> >
> > Please read the comment above this variable :-)
> >
>
> Hm,
>
> will gdbarch_alloc go away? I thought every target uses gdbarch_alloc to allocate a basic
> gdbarch structure and then it overwrites every necessary callback to fit to its architecture.
>
> This patch just changes the name of current_gdbarch to gdbarch. For gdbarch_alloc current_gdbarch
> is a local variable invisible to the rest. Its not the global current_gdbarch what this patch changes.
>
> For me its a bit confusing to have a global current_gdbarch and a local one.
Of course it is a hack to have the local current_gdbarch shadowing the
global one -- that is why the comment *says* it is a hack and should go
away at some time in future ("once everything is parameterised with gdbarch").
However, as your patch *implements* what the comment describes -- as of
right now, there are no macros implicitly using current_gdbarch any more,
and thus there is no need for the local current_gdbarch hack -- it does
not make any sense to leave the comment unchanged once your patch is in.
I would suggest you simply remove this comment as part of your patch.
Also, there is another comment that needs to be updated:
# Variable declarations can refer to ``current_gdbarch'' which
# will contain the current architecture. Care should be
# taken.
(at the description of "postdefault" in the loop immediately preceding
function_list).
In general, having stale comments in the code can be very confusing
for developers working on that code in the future, so when you work
on a patch, making sure comments are added/removed/changed as
appropriate is just as important as making sure the code changes
themselves are correct ...
Finally, I do think the change in inself is correct (provided the comments
are adapted). In fact, the very same should be done to the other two
functions in gdbarch.sh that use the "local current_gdbarch variable" hack,
verify_gdbarch and gdbarch_dump.
Bye,
Ulrich
--
Dr. Ulrich Weigand
GNU Toolchain for Linux on System z and Cell BE
Ulrich.Weigand@de.ibm.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rfc] [01/05] Get rid of current_gdbarch in gdbarch.{c,h,sh}
2007-11-08 13:18 ` Ulrich Weigand
@ 2007-11-09 7:30 ` Markus Deuling
2007-11-09 13:19 ` Ulrich Weigand
0 siblings, 1 reply; 8+ messages in thread
From: Markus Deuling @ 2007-11-09 7:30 UTC (permalink / raw)
To: GDB Patches; +Cc: Ulrich Weigand, Daniel Jacobowitz
[-- Attachment #1: Type: text/plain, Size: 927 bytes --]
Hi Uli,
Ulrich Weigand schrieb:
>
> Finally, I do think the change in inself is correct (provided the comments
> are adapted). In fact, the very same should be done to the other two
> functions in gdbarch.sh that use the "local current_gdbarch variable" hack,
> verify_gdbarch and gdbarch_dump.
thank you very much. Now I understand what was meant. I reworked the patch to update
the comments and also rework verify_gdbarch and gdbarch_dump.
Tested on x86 without regression.
Would this be ok to commit ?
ChangeLog:
* gdbarch.sh (gdbarch_alloc): Replace current_gdbarch by gdbarch. Remove
obsolete comment.
(verify_gdbarch, gdbarch_dump): Likewise.
(do_read): Update comment.
(addr_bit, bfd_arch_info, target_desc, long_long_bit, floatformat)
(ptr_bit, name_of_malloc): Replace current_gdbarch by gdbarch.
* gdbarch.{c,h}: Regenerate.
--
Markus Deuling
GNU Toolchain for Linux on Cell BE
deuling@de.ibm.com
[-- Attachment #2: diff-gdbarch --]
[-- Type: text/plain, Size: 54317 bytes --]
diff -urpN src/gdb/gdbarch.c dev2/gdb/gdbarch.c
--- src/gdb/gdbarch.c 2007-11-09 06:32:19.000000000 +0100
+++ dev2/gdb/gdbarch.c 2007-11-09 08:01:48.000000000 +0100
@@ -362,81 +362,75 @@ struct gdbarch *
gdbarch_alloc (const struct gdbarch_info *info,
struct gdbarch_tdep *tdep)
{
- /* NOTE: The new architecture variable is named ``current_gdbarch''
- so that macros such as TARGET_ARCHITECTURE, when expanded, refer to
- the current local architecture and not the previous global
- architecture. This ensures that the new architectures initial
- values are not influenced by the previous architecture. Once
- everything is parameterised with gdbarch, this will go away. */
- struct gdbarch *current_gdbarch;
+ struct gdbarch *gdbarch;
/* Create an obstack for allocating all the per-architecture memory,
then use that to allocate the architecture vector. */
struct obstack *obstack = XMALLOC (struct obstack);
obstack_init (obstack);
- current_gdbarch = obstack_alloc (obstack, sizeof (*current_gdbarch));
- memset (current_gdbarch, 0, sizeof (*current_gdbarch));
- current_gdbarch->obstack = obstack;
-
- alloc_gdbarch_data (current_gdbarch);
-
- current_gdbarch->tdep = tdep;
-
- current_gdbarch->bfd_arch_info = info->bfd_arch_info;
- current_gdbarch->byte_order = info->byte_order;
- current_gdbarch->osabi = info->osabi;
- current_gdbarch->target_desc = info->target_desc;
+ gdbarch = obstack_alloc (obstack, sizeof (*gdbarch));
+ memset (gdbarch, 0, sizeof (*gdbarch));
+ gdbarch->obstack = obstack;
+
+ alloc_gdbarch_data (gdbarch);
+
+ gdbarch->tdep = tdep;
+
+ gdbarch->bfd_arch_info = info->bfd_arch_info;
+ gdbarch->byte_order = info->byte_order;
+ gdbarch->osabi = info->osabi;
+ gdbarch->target_desc = info->target_desc;
/* Force the explicit initialization of these. */
- current_gdbarch->short_bit = 2*TARGET_CHAR_BIT;
- current_gdbarch->int_bit = 4*TARGET_CHAR_BIT;
- current_gdbarch->long_bit = 4*TARGET_CHAR_BIT;
- current_gdbarch->long_long_bit = 2*current_gdbarch->long_bit;
- current_gdbarch->float_bit = 4*TARGET_CHAR_BIT;
- current_gdbarch->double_bit = 8*TARGET_CHAR_BIT;
- current_gdbarch->long_double_bit = 8*TARGET_CHAR_BIT;
- current_gdbarch->ptr_bit = current_gdbarch->int_bit;
- current_gdbarch->char_signed = -1;
- current_gdbarch->virtual_frame_pointer = legacy_virtual_frame_pointer;
- current_gdbarch->num_regs = -1;
- current_gdbarch->sp_regnum = -1;
- current_gdbarch->pc_regnum = -1;
- current_gdbarch->ps_regnum = -1;
- current_gdbarch->fp0_regnum = -1;
- current_gdbarch->stab_reg_to_regnum = no_op_reg_to_regnum;
- current_gdbarch->ecoff_reg_to_regnum = no_op_reg_to_regnum;
- current_gdbarch->dwarf_reg_to_regnum = no_op_reg_to_regnum;
- current_gdbarch->sdb_reg_to_regnum = no_op_reg_to_regnum;
- current_gdbarch->dwarf2_reg_to_regnum = no_op_reg_to_regnum;
- current_gdbarch->deprecated_fp_regnum = -1;
- current_gdbarch->call_dummy_location = AT_ENTRY_POINT;
- current_gdbarch->print_registers_info = default_print_registers_info;
- current_gdbarch->register_sim_regno = legacy_register_sim_regno;
- current_gdbarch->cannot_fetch_register = cannot_register_not;
- current_gdbarch->cannot_store_register = cannot_register_not;
- current_gdbarch->convert_register_p = generic_convert_register_p;
- current_gdbarch->value_from_register = default_value_from_register;
- current_gdbarch->pointer_to_address = unsigned_pointer_to_address;
- current_gdbarch->address_to_pointer = unsigned_address_to_pointer;
- current_gdbarch->memory_insert_breakpoint = default_memory_insert_breakpoint;
- current_gdbarch->memory_remove_breakpoint = default_memory_remove_breakpoint;
- current_gdbarch->remote_register_number = default_remote_register_number;
- current_gdbarch->stabs_argument_has_addr = default_stabs_argument_has_addr;
- current_gdbarch->convert_from_func_ptr_addr = convert_from_func_ptr_addr_identity;
- current_gdbarch->addr_bits_remove = core_addr_identity;
- current_gdbarch->smash_text_address = core_addr_identity;
- current_gdbarch->skip_trampoline_code = generic_skip_trampoline_code;
- current_gdbarch->skip_solib_resolver = generic_skip_solib_resolver;
- current_gdbarch->in_solib_return_trampoline = generic_in_solib_return_trampoline;
- current_gdbarch->in_function_epilogue_p = generic_in_function_epilogue_p;
- current_gdbarch->construct_inferior_arguments = construct_inferior_arguments;
- current_gdbarch->elf_make_msymbol_special = default_elf_make_msymbol_special;
- current_gdbarch->coff_make_msymbol_special = default_coff_make_msymbol_special;
- current_gdbarch->name_of_malloc = "malloc";
- current_gdbarch->register_reggroup_p = default_register_reggroup_p;
+ gdbarch->short_bit = 2*TARGET_CHAR_BIT;
+ gdbarch->int_bit = 4*TARGET_CHAR_BIT;
+ gdbarch->long_bit = 4*TARGET_CHAR_BIT;
+ gdbarch->long_long_bit = 2*gdbarch->long_bit;
+ gdbarch->float_bit = 4*TARGET_CHAR_BIT;
+ gdbarch->double_bit = 8*TARGET_CHAR_BIT;
+ gdbarch->long_double_bit = 8*TARGET_CHAR_BIT;
+ gdbarch->ptr_bit = gdbarch->int_bit;
+ gdbarch->char_signed = -1;
+ gdbarch->virtual_frame_pointer = legacy_virtual_frame_pointer;
+ gdbarch->num_regs = -1;
+ gdbarch->sp_regnum = -1;
+ gdbarch->pc_regnum = -1;
+ gdbarch->ps_regnum = -1;
+ gdbarch->fp0_regnum = -1;
+ gdbarch->stab_reg_to_regnum = no_op_reg_to_regnum;
+ gdbarch->ecoff_reg_to_regnum = no_op_reg_to_regnum;
+ gdbarch->dwarf_reg_to_regnum = no_op_reg_to_regnum;
+ gdbarch->sdb_reg_to_regnum = no_op_reg_to_regnum;
+ gdbarch->dwarf2_reg_to_regnum = no_op_reg_to_regnum;
+ gdbarch->deprecated_fp_regnum = -1;
+ gdbarch->call_dummy_location = AT_ENTRY_POINT;
+ gdbarch->print_registers_info = default_print_registers_info;
+ gdbarch->register_sim_regno = legacy_register_sim_regno;
+ gdbarch->cannot_fetch_register = cannot_register_not;
+ gdbarch->cannot_store_register = cannot_register_not;
+ gdbarch->convert_register_p = generic_convert_register_p;
+ gdbarch->value_from_register = default_value_from_register;
+ gdbarch->pointer_to_address = unsigned_pointer_to_address;
+ gdbarch->address_to_pointer = unsigned_address_to_pointer;
+ gdbarch->memory_insert_breakpoint = default_memory_insert_breakpoint;
+ gdbarch->memory_remove_breakpoint = default_memory_remove_breakpoint;
+ gdbarch->remote_register_number = default_remote_register_number;
+ gdbarch->stabs_argument_has_addr = default_stabs_argument_has_addr;
+ gdbarch->convert_from_func_ptr_addr = convert_from_func_ptr_addr_identity;
+ gdbarch->addr_bits_remove = core_addr_identity;
+ gdbarch->smash_text_address = core_addr_identity;
+ gdbarch->skip_trampoline_code = generic_skip_trampoline_code;
+ gdbarch->skip_solib_resolver = generic_skip_solib_resolver;
+ gdbarch->in_solib_return_trampoline = generic_in_solib_return_trampoline;
+ gdbarch->in_function_epilogue_p = generic_in_function_epilogue_p;
+ gdbarch->construct_inferior_arguments = construct_inferior_arguments;
+ gdbarch->elf_make_msymbol_special = default_elf_make_msymbol_special;
+ gdbarch->coff_make_msymbol_special = default_coff_make_msymbol_special;
+ gdbarch->name_of_malloc = "malloc";
+ gdbarch->register_reggroup_p = default_register_reggroup_p;
/* gdbarch_alloc() */
- return current_gdbarch;
+ return gdbarch;
}
@@ -471,14 +465,8 @@ gdbarch_free (struct gdbarch *arch)
/* Ensure that all values in a GDBARCH are reasonable. */
-/* NOTE/WARNING: The parameter is called ``current_gdbarch'' so that it
- just happens to match the global variable ``current_gdbarch''. That
- way macros refering to that variable get the local and not the global
- version - ulgh. Once everything is parameterised with gdbarch, this
- will go away. */
-
static void
-verify_gdbarch (struct gdbarch *current_gdbarch)
+verify_gdbarch (struct gdbarch *gdbarch)
{
struct ui_file *log;
struct cleanup *cleanups;
@@ -487,9 +475,9 @@ verify_gdbarch (struct gdbarch *current_
log = mem_fileopen ();
cleanups = make_cleanup_ui_file_delete (log);
/* fundamental */
- if (current_gdbarch->byte_order == BFD_ENDIAN_UNKNOWN)
+ if (gdbarch->byte_order == BFD_ENDIAN_UNKNOWN)
fprintf_unfiltered (log, "\n\tbyte-order");
- if (current_gdbarch->bfd_arch_info == NULL)
+ if (gdbarch->bfd_arch_info == NULL)
fprintf_unfiltered (log, "\n\tbfd_arch_info");
/* Check those that need to be defined for the given multi-arch level. */
/* Skip verify of short_bit, invalid_p == 0 */
@@ -497,25 +485,25 @@ verify_gdbarch (struct gdbarch *current_
/* Skip verify of long_bit, invalid_p == 0 */
/* Skip verify of long_long_bit, invalid_p == 0 */
/* Skip verify of float_bit, invalid_p == 0 */
- if (current_gdbarch->float_format == 0)
- current_gdbarch->float_format = floatformats_ieee_single;
+ if (gdbarch->float_format == 0)
+ gdbarch->float_format = floatformats_ieee_single;
/* Skip verify of double_bit, invalid_p == 0 */
- if (current_gdbarch->double_format == 0)
- current_gdbarch->double_format = floatformats_ieee_double;
+ if (gdbarch->double_format == 0)
+ gdbarch->double_format = floatformats_ieee_double;
/* Skip verify of long_double_bit, invalid_p == 0 */
- if (current_gdbarch->long_double_format == 0)
- current_gdbarch->long_double_format = floatformats_ieee_double;
+ if (gdbarch->long_double_format == 0)
+ gdbarch->long_double_format = floatformats_ieee_double;
/* Skip verify of ptr_bit, invalid_p == 0 */
- if (current_gdbarch->addr_bit == 0)
- current_gdbarch->addr_bit = gdbarch_ptr_bit (current_gdbarch);
- if (current_gdbarch->char_signed == -1)
- current_gdbarch->char_signed = 1;
+ if (gdbarch->addr_bit == 0)
+ gdbarch->addr_bit = gdbarch_ptr_bit (gdbarch);
+ if (gdbarch->char_signed == -1)
+ gdbarch->char_signed = 1;
/* Skip verify of read_pc, has predicate */
/* Skip verify of write_pc, has predicate */
/* Skip verify of virtual_frame_pointer, invalid_p == 0 */
/* Skip verify of pseudo_register_read, has predicate */
/* Skip verify of pseudo_register_write, has predicate */
- if (current_gdbarch->num_regs == -1)
+ if (gdbarch->num_regs == -1)
fprintf_unfiltered (log, "\n\tnum_regs");
/* Skip verify of num_pseudo_regs, invalid_p == 0 */
/* Skip verify of sp_regnum, invalid_p == 0 */
@@ -527,7 +515,7 @@ verify_gdbarch (struct gdbarch *current_
/* Skip verify of dwarf_reg_to_regnum, invalid_p == 0 */
/* Skip verify of sdb_reg_to_regnum, invalid_p == 0 */
/* Skip verify of dwarf2_reg_to_regnum, invalid_p == 0 */
- if (current_gdbarch->register_name == 0)
+ if (gdbarch->register_name == 0)
fprintf_unfiltered (log, "\n\tregister_name");
/* Skip verify of register_type, has predicate */
/* Skip verify of unwind_dummy_id, has predicate */
@@ -548,11 +536,11 @@ verify_gdbarch (struct gdbarch *current_
/* Skip verify of address_to_pointer, invalid_p == 0 */
/* Skip verify of integer_to_address, has predicate */
/* Skip verify of return_value, has predicate */
- if (current_gdbarch->skip_prologue == 0)
+ if (gdbarch->skip_prologue == 0)
fprintf_unfiltered (log, "\n\tskip_prologue");
- if (current_gdbarch->inner_than == 0)
+ if (gdbarch->inner_than == 0)
fprintf_unfiltered (log, "\n\tinner_than");
- if (current_gdbarch->breakpoint_from_pc == 0)
+ if (gdbarch->breakpoint_from_pc == 0)
fprintf_unfiltered (log, "\n\tbreakpoint_from_pc");
/* Skip verify of adjust_breakpoint_address, has predicate */
/* Skip verify of memory_insert_breakpoint, invalid_p == 0 */
@@ -572,7 +560,7 @@ verify_gdbarch (struct gdbarch *current_
/* Skip verify of smash_text_address, invalid_p == 0 */
/* Skip verify of software_single_step, has predicate */
/* Skip verify of single_step_through_delay, has predicate */
- if (current_gdbarch->print_insn == 0)
+ if (gdbarch->print_insn == 0)
fprintf_unfiltered (log, "\n\tprint_insn");
/* Skip verify of skip_trampoline_code, invalid_p == 0 */
/* Skip verify of skip_solib_resolver, invalid_p == 0 */
@@ -610,14 +598,8 @@ verify_gdbarch (struct gdbarch *current_
/* Print out the details of the current architecture. */
-/* NOTE/WARNING: The parameter is called ``current_gdbarch'' so that it
- just happens to match the global variable ``current_gdbarch''. That
- way macros refering to that variable get the local and not the global
- version - ulgh. Once everything is parameterised with gdbarch, this
- will go away. */
-
void
-gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file)
+gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
{
const char *gdb_xm_file = "<not-defined>";
const char *gdb_nm_file = "<not-defined>";
@@ -642,408 +624,408 @@ gdbarch_dump (struct gdbarch *current_gd
gdb_tm_file);
fprintf_unfiltered (file,
"gdbarch_dump: addr_bit = %s\n",
- paddr_d (current_gdbarch->addr_bit));
+ paddr_d (gdbarch->addr_bit));
fprintf_unfiltered (file,
"gdbarch_dump: addr_bits_remove = <0x%lx>\n",
- (long) current_gdbarch->addr_bits_remove);
+ (long) gdbarch->addr_bits_remove);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_address_class_name_to_type_flags_p() = %d\n",
- gdbarch_address_class_name_to_type_flags_p (current_gdbarch));
+ gdbarch_address_class_name_to_type_flags_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: address_class_name_to_type_flags = <0x%lx>\n",
- (long) current_gdbarch->address_class_name_to_type_flags);
+ (long) gdbarch->address_class_name_to_type_flags);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_address_class_type_flags_p() = %d\n",
- gdbarch_address_class_type_flags_p (current_gdbarch));
+ gdbarch_address_class_type_flags_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: address_class_type_flags = <0x%lx>\n",
- (long) current_gdbarch->address_class_type_flags);
+ (long) gdbarch->address_class_type_flags);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_address_class_type_flags_to_name_p() = %d\n",
- gdbarch_address_class_type_flags_to_name_p (current_gdbarch));
+ gdbarch_address_class_type_flags_to_name_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: address_class_type_flags_to_name = <0x%lx>\n",
- (long) current_gdbarch->address_class_type_flags_to_name);
+ (long) gdbarch->address_class_type_flags_to_name);
fprintf_unfiltered (file,
"gdbarch_dump: address_to_pointer = <0x%lx>\n",
- (long) current_gdbarch->address_to_pointer);
+ (long) gdbarch->address_to_pointer);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_adjust_breakpoint_address_p() = %d\n",
- gdbarch_adjust_breakpoint_address_p (current_gdbarch));
+ gdbarch_adjust_breakpoint_address_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: adjust_breakpoint_address = <0x%lx>\n",
- (long) current_gdbarch->adjust_breakpoint_address);
+ (long) gdbarch->adjust_breakpoint_address);
fprintf_unfiltered (file,
"gdbarch_dump: believe_pcc_promotion = %s\n",
- paddr_d (current_gdbarch->believe_pcc_promotion));
+ paddr_d (gdbarch->believe_pcc_promotion));
fprintf_unfiltered (file,
"gdbarch_dump: bfd_arch_info = %s\n",
- gdbarch_bfd_arch_info (current_gdbarch)->printable_name);
+ gdbarch_bfd_arch_info (gdbarch)->printable_name);
fprintf_unfiltered (file,
"gdbarch_dump: breakpoint_from_pc = <0x%lx>\n",
- (long) current_gdbarch->breakpoint_from_pc);
+ (long) gdbarch->breakpoint_from_pc);
fprintf_unfiltered (file,
"gdbarch_dump: byte_order = %s\n",
- paddr_d (current_gdbarch->byte_order));
+ paddr_d (gdbarch->byte_order));
fprintf_unfiltered (file,
"gdbarch_dump: call_dummy_location = %s\n",
- paddr_d (current_gdbarch->call_dummy_location));
+ paddr_d (gdbarch->call_dummy_location));
fprintf_unfiltered (file,
"gdbarch_dump: cannot_fetch_register = <0x%lx>\n",
- (long) current_gdbarch->cannot_fetch_register);
+ (long) gdbarch->cannot_fetch_register);
fprintf_unfiltered (file,
"gdbarch_dump: cannot_step_breakpoint = %s\n",
- paddr_d (current_gdbarch->cannot_step_breakpoint));
+ paddr_d (gdbarch->cannot_step_breakpoint));
fprintf_unfiltered (file,
"gdbarch_dump: cannot_store_register = <0x%lx>\n",
- (long) current_gdbarch->cannot_store_register);
+ (long) gdbarch->cannot_store_register);
fprintf_unfiltered (file,
"gdbarch_dump: char_signed = %s\n",
- paddr_d (current_gdbarch->char_signed));
+ paddr_d (gdbarch->char_signed));
fprintf_unfiltered (file,
"gdbarch_dump: coff_make_msymbol_special = <0x%lx>\n",
- (long) current_gdbarch->coff_make_msymbol_special);
+ (long) gdbarch->coff_make_msymbol_special);
fprintf_unfiltered (file,
"gdbarch_dump: construct_inferior_arguments = <0x%lx>\n",
- (long) current_gdbarch->construct_inferior_arguments);
+ (long) gdbarch->construct_inferior_arguments);
fprintf_unfiltered (file,
"gdbarch_dump: convert_from_func_ptr_addr = <0x%lx>\n",
- (long) current_gdbarch->convert_from_func_ptr_addr);
+ (long) gdbarch->convert_from_func_ptr_addr);
fprintf_unfiltered (file,
"gdbarch_dump: convert_register_p = <0x%lx>\n",
- (long) current_gdbarch->convert_register_p);
+ (long) gdbarch->convert_register_p);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_core_read_description_p() = %d\n",
- gdbarch_core_read_description_p (current_gdbarch));
+ gdbarch_core_read_description_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: core_read_description = <0x%lx>\n",
- (long) current_gdbarch->core_read_description);
+ (long) gdbarch->core_read_description);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_core_xfer_shared_libraries_p() = %d\n",
- gdbarch_core_xfer_shared_libraries_p (current_gdbarch));
+ gdbarch_core_xfer_shared_libraries_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: core_xfer_shared_libraries = <0x%lx>\n",
- (long) current_gdbarch->core_xfer_shared_libraries);
+ (long) gdbarch->core_xfer_shared_libraries);
fprintf_unfiltered (file,
"gdbarch_dump: decr_pc_after_break = 0x%s\n",
- paddr_nz (current_gdbarch->decr_pc_after_break));
+ paddr_nz (gdbarch->decr_pc_after_break));
fprintf_unfiltered (file,
"gdbarch_dump: deprecated_fp_regnum = %s\n",
- paddr_d (current_gdbarch->deprecated_fp_regnum));
+ paddr_d (gdbarch->deprecated_fp_regnum));
fprintf_unfiltered (file,
"gdbarch_dump: deprecated_function_start_offset = 0x%s\n",
- paddr_nz (current_gdbarch->deprecated_function_start_offset));
+ paddr_nz (gdbarch->deprecated_function_start_offset));
fprintf_unfiltered (file,
"gdbarch_dump: double_bit = %s\n",
- paddr_d (current_gdbarch->double_bit));
+ paddr_d (gdbarch->double_bit));
fprintf_unfiltered (file,
"gdbarch_dump: double_format = %s\n",
- pformat (current_gdbarch->double_format));
+ pformat (gdbarch->double_format));
fprintf_unfiltered (file,
"gdbarch_dump: dwarf2_reg_to_regnum = <0x%lx>\n",
- (long) current_gdbarch->dwarf2_reg_to_regnum);
+ (long) gdbarch->dwarf2_reg_to_regnum);
fprintf_unfiltered (file,
"gdbarch_dump: dwarf_reg_to_regnum = <0x%lx>\n",
- (long) current_gdbarch->dwarf_reg_to_regnum);
+ (long) gdbarch->dwarf_reg_to_regnum);
fprintf_unfiltered (file,
"gdbarch_dump: ecoff_reg_to_regnum = <0x%lx>\n",
- (long) current_gdbarch->ecoff_reg_to_regnum);
+ (long) gdbarch->ecoff_reg_to_regnum);
fprintf_unfiltered (file,
"gdbarch_dump: elf_make_msymbol_special = <0x%lx>\n",
- (long) current_gdbarch->elf_make_msymbol_special);
+ (long) gdbarch->elf_make_msymbol_special);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_fetch_pointer_argument_p() = %d\n",
- gdbarch_fetch_pointer_argument_p (current_gdbarch));
+ gdbarch_fetch_pointer_argument_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: fetch_pointer_argument = <0x%lx>\n",
- (long) current_gdbarch->fetch_pointer_argument);
+ (long) gdbarch->fetch_pointer_argument);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_fetch_tls_load_module_address_p() = %d\n",
- gdbarch_fetch_tls_load_module_address_p (current_gdbarch));
+ gdbarch_fetch_tls_load_module_address_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: fetch_tls_load_module_address = <0x%lx>\n",
- (long) current_gdbarch->fetch_tls_load_module_address);
+ (long) gdbarch->fetch_tls_load_module_address);
fprintf_unfiltered (file,
"gdbarch_dump: float_bit = %s\n",
- paddr_d (current_gdbarch->float_bit));
+ paddr_d (gdbarch->float_bit));
fprintf_unfiltered (file,
"gdbarch_dump: float_format = %s\n",
- pformat (current_gdbarch->float_format));
+ pformat (gdbarch->float_format));
fprintf_unfiltered (file,
"gdbarch_dump: fp0_regnum = %s\n",
- paddr_d (current_gdbarch->fp0_regnum));
+ paddr_d (gdbarch->fp0_regnum));
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_frame_align_p() = %d\n",
- gdbarch_frame_align_p (current_gdbarch));
+ gdbarch_frame_align_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: frame_align = <0x%lx>\n",
- (long) current_gdbarch->frame_align);
+ (long) gdbarch->frame_align);
fprintf_unfiltered (file,
"gdbarch_dump: frame_args_skip = 0x%s\n",
- paddr_nz (current_gdbarch->frame_args_skip));
+ paddr_nz (gdbarch->frame_args_skip));
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_frame_num_args_p() = %d\n",
- gdbarch_frame_num_args_p (current_gdbarch));
+ gdbarch_frame_num_args_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: frame_num_args = <0x%lx>\n",
- (long) current_gdbarch->frame_num_args);
+ (long) gdbarch->frame_num_args);
fprintf_unfiltered (file,
"gdbarch_dump: frame_red_zone_size = %s\n",
- paddr_d (current_gdbarch->frame_red_zone_size));
+ paddr_d (gdbarch->frame_red_zone_size));
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_get_longjmp_target_p() = %d\n",
- gdbarch_get_longjmp_target_p (current_gdbarch));
+ gdbarch_get_longjmp_target_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: get_longjmp_target = <0x%lx>\n",
- (long) current_gdbarch->get_longjmp_target);
+ (long) gdbarch->get_longjmp_target);
fprintf_unfiltered (file,
"gdbarch_dump: have_nonsteppable_watchpoint = %s\n",
- paddr_d (current_gdbarch->have_nonsteppable_watchpoint));
+ paddr_d (gdbarch->have_nonsteppable_watchpoint));
fprintf_unfiltered (file,
"gdbarch_dump: in_function_epilogue_p = <0x%lx>\n",
- (long) current_gdbarch->in_function_epilogue_p);
+ (long) gdbarch->in_function_epilogue_p);
fprintf_unfiltered (file,
"gdbarch_dump: in_solib_return_trampoline = <0x%lx>\n",
- (long) current_gdbarch->in_solib_return_trampoline);
+ (long) gdbarch->in_solib_return_trampoline);
fprintf_unfiltered (file,
"gdbarch_dump: inner_than = <0x%lx>\n",
- (long) current_gdbarch->inner_than);
+ (long) gdbarch->inner_than);
fprintf_unfiltered (file,
"gdbarch_dump: int_bit = %s\n",
- paddr_d (current_gdbarch->int_bit));
+ paddr_d (gdbarch->int_bit));
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_integer_to_address_p() = %d\n",
- gdbarch_integer_to_address_p (current_gdbarch));
+ gdbarch_integer_to_address_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: integer_to_address = <0x%lx>\n",
- (long) current_gdbarch->integer_to_address);
+ (long) gdbarch->integer_to_address);
fprintf_unfiltered (file,
"gdbarch_dump: long_bit = %s\n",
- paddr_d (current_gdbarch->long_bit));
+ paddr_d (gdbarch->long_bit));
fprintf_unfiltered (file,
"gdbarch_dump: long_double_bit = %s\n",
- paddr_d (current_gdbarch->long_double_bit));
+ paddr_d (gdbarch->long_double_bit));
fprintf_unfiltered (file,
"gdbarch_dump: long_double_format = %s\n",
- pformat (current_gdbarch->long_double_format));
+ pformat (gdbarch->long_double_format));
fprintf_unfiltered (file,
"gdbarch_dump: long_long_bit = %s\n",
- paddr_d (current_gdbarch->long_long_bit));
+ paddr_d (gdbarch->long_long_bit));
fprintf_unfiltered (file,
"gdbarch_dump: memory_insert_breakpoint = <0x%lx>\n",
- (long) current_gdbarch->memory_insert_breakpoint);
+ (long) gdbarch->memory_insert_breakpoint);
fprintf_unfiltered (file,
"gdbarch_dump: memory_remove_breakpoint = <0x%lx>\n",
- (long) current_gdbarch->memory_remove_breakpoint);
+ (long) gdbarch->memory_remove_breakpoint);
fprintf_unfiltered (file,
"gdbarch_dump: name_of_malloc = %s\n",
- current_gdbarch->name_of_malloc);
+ gdbarch->name_of_malloc);
fprintf_unfiltered (file,
"gdbarch_dump: num_pseudo_regs = %s\n",
- paddr_d (current_gdbarch->num_pseudo_regs));
+ paddr_d (gdbarch->num_pseudo_regs));
fprintf_unfiltered (file,
"gdbarch_dump: num_regs = %s\n",
- paddr_d (current_gdbarch->num_regs));
+ paddr_d (gdbarch->num_regs));
fprintf_unfiltered (file,
"gdbarch_dump: osabi = %s\n",
- paddr_d (current_gdbarch->osabi));
+ paddr_d (gdbarch->osabi));
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_overlay_update_p() = %d\n",
- gdbarch_overlay_update_p (current_gdbarch));
+ gdbarch_overlay_update_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: overlay_update = <0x%lx>\n",
- (long) current_gdbarch->overlay_update);
+ (long) gdbarch->overlay_update);
fprintf_unfiltered (file,
"gdbarch_dump: pc_regnum = %s\n",
- paddr_d (current_gdbarch->pc_regnum));
+ paddr_d (gdbarch->pc_regnum));
fprintf_unfiltered (file,
"gdbarch_dump: pointer_to_address = <0x%lx>\n",
- (long) current_gdbarch->pointer_to_address);
+ (long) gdbarch->pointer_to_address);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_print_float_info_p() = %d\n",
- gdbarch_print_float_info_p (current_gdbarch));
+ gdbarch_print_float_info_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: print_float_info = <0x%lx>\n",
- (long) current_gdbarch->print_float_info);
+ (long) gdbarch->print_float_info);
fprintf_unfiltered (file,
"gdbarch_dump: print_insn = <0x%lx>\n",
- (long) current_gdbarch->print_insn);
+ (long) gdbarch->print_insn);
fprintf_unfiltered (file,
"gdbarch_dump: print_registers_info = <0x%lx>\n",
- (long) current_gdbarch->print_registers_info);
+ (long) gdbarch->print_registers_info);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_print_vector_info_p() = %d\n",
- gdbarch_print_vector_info_p (current_gdbarch));
+ gdbarch_print_vector_info_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: print_vector_info = <0x%lx>\n",
- (long) current_gdbarch->print_vector_info);
+ (long) gdbarch->print_vector_info);
fprintf_unfiltered (file,
"gdbarch_dump: ps_regnum = %s\n",
- paddr_d (current_gdbarch->ps_regnum));
+ paddr_d (gdbarch->ps_regnum));
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_pseudo_register_read_p() = %d\n",
- gdbarch_pseudo_register_read_p (current_gdbarch));
+ gdbarch_pseudo_register_read_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: pseudo_register_read = <0x%lx>\n",
- (long) current_gdbarch->pseudo_register_read);
+ (long) gdbarch->pseudo_register_read);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_pseudo_register_write_p() = %d\n",
- gdbarch_pseudo_register_write_p (current_gdbarch));
+ gdbarch_pseudo_register_write_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: pseudo_register_write = <0x%lx>\n",
- (long) current_gdbarch->pseudo_register_write);
+ (long) gdbarch->pseudo_register_write);
fprintf_unfiltered (file,
"gdbarch_dump: ptr_bit = %s\n",
- paddr_d (current_gdbarch->ptr_bit));
+ paddr_d (gdbarch->ptr_bit));
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_push_dummy_call_p() = %d\n",
- gdbarch_push_dummy_call_p (current_gdbarch));
+ gdbarch_push_dummy_call_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: push_dummy_call = <0x%lx>\n",
- (long) current_gdbarch->push_dummy_call);
+ (long) gdbarch->push_dummy_call);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_push_dummy_code_p() = %d\n",
- gdbarch_push_dummy_code_p (current_gdbarch));
+ gdbarch_push_dummy_code_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: push_dummy_code = <0x%lx>\n",
- (long) current_gdbarch->push_dummy_code);
+ (long) gdbarch->push_dummy_code);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_read_pc_p() = %d\n",
- gdbarch_read_pc_p (current_gdbarch));
+ gdbarch_read_pc_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: read_pc = <0x%lx>\n",
- (long) current_gdbarch->read_pc);
+ (long) gdbarch->read_pc);
fprintf_unfiltered (file,
"gdbarch_dump: register_name = <0x%lx>\n",
- (long) current_gdbarch->register_name);
+ (long) gdbarch->register_name);
fprintf_unfiltered (file,
"gdbarch_dump: register_reggroup_p = <0x%lx>\n",
- (long) current_gdbarch->register_reggroup_p);
+ (long) gdbarch->register_reggroup_p);
fprintf_unfiltered (file,
"gdbarch_dump: register_sim_regno = <0x%lx>\n",
- (long) current_gdbarch->register_sim_regno);
+ (long) gdbarch->register_sim_regno);
fprintf_unfiltered (file,
"gdbarch_dump: register_to_value = <0x%lx>\n",
- (long) current_gdbarch->register_to_value);
+ (long) gdbarch->register_to_value);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_register_type_p() = %d\n",
- gdbarch_register_type_p (current_gdbarch));
+ gdbarch_register_type_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: register_type = <0x%lx>\n",
- (long) current_gdbarch->register_type);
+ (long) gdbarch->register_type);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_regset_from_core_section_p() = %d\n",
- gdbarch_regset_from_core_section_p (current_gdbarch));
+ gdbarch_regset_from_core_section_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: regset_from_core_section = <0x%lx>\n",
- (long) current_gdbarch->regset_from_core_section);
+ (long) gdbarch->regset_from_core_section);
fprintf_unfiltered (file,
"gdbarch_dump: remote_register_number = <0x%lx>\n",
- (long) current_gdbarch->remote_register_number);
+ (long) gdbarch->remote_register_number);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_return_value_p() = %d\n",
- gdbarch_return_value_p (current_gdbarch));
+ gdbarch_return_value_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: return_value = <0x%lx>\n",
- (long) current_gdbarch->return_value);
+ (long) gdbarch->return_value);
fprintf_unfiltered (file,
"gdbarch_dump: sdb_reg_to_regnum = <0x%lx>\n",
- (long) current_gdbarch->sdb_reg_to_regnum);
+ (long) gdbarch->sdb_reg_to_regnum);
fprintf_unfiltered (file,
"gdbarch_dump: short_bit = %s\n",
- paddr_d (current_gdbarch->short_bit));
+ paddr_d (gdbarch->short_bit));
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_single_step_through_delay_p() = %d\n",
- gdbarch_single_step_through_delay_p (current_gdbarch));
+ gdbarch_single_step_through_delay_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: single_step_through_delay = <0x%lx>\n",
- (long) current_gdbarch->single_step_through_delay);
+ (long) gdbarch->single_step_through_delay);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_skip_permanent_breakpoint_p() = %d\n",
- gdbarch_skip_permanent_breakpoint_p (current_gdbarch));
+ gdbarch_skip_permanent_breakpoint_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: skip_permanent_breakpoint = <0x%lx>\n",
- (long) current_gdbarch->skip_permanent_breakpoint);
+ (long) gdbarch->skip_permanent_breakpoint);
fprintf_unfiltered (file,
"gdbarch_dump: skip_prologue = <0x%lx>\n",
- (long) current_gdbarch->skip_prologue);
+ (long) gdbarch->skip_prologue);
fprintf_unfiltered (file,
"gdbarch_dump: skip_solib_resolver = <0x%lx>\n",
- (long) current_gdbarch->skip_solib_resolver);
+ (long) gdbarch->skip_solib_resolver);
fprintf_unfiltered (file,
"gdbarch_dump: skip_trampoline_code = <0x%lx>\n",
- (long) current_gdbarch->skip_trampoline_code);
+ (long) gdbarch->skip_trampoline_code);
fprintf_unfiltered (file,
"gdbarch_dump: smash_text_address = <0x%lx>\n",
- (long) current_gdbarch->smash_text_address);
+ (long) gdbarch->smash_text_address);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_software_single_step_p() = %d\n",
- gdbarch_software_single_step_p (current_gdbarch));
+ gdbarch_software_single_step_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: software_single_step = <0x%lx>\n",
- (long) current_gdbarch->software_single_step);
+ (long) gdbarch->software_single_step);
fprintf_unfiltered (file,
"gdbarch_dump: sofun_address_maybe_missing = %s\n",
- paddr_d (current_gdbarch->sofun_address_maybe_missing));
+ paddr_d (gdbarch->sofun_address_maybe_missing));
fprintf_unfiltered (file,
"gdbarch_dump: sp_regnum = %s\n",
- paddr_d (current_gdbarch->sp_regnum));
+ paddr_d (gdbarch->sp_regnum));
fprintf_unfiltered (file,
"gdbarch_dump: stab_reg_to_regnum = <0x%lx>\n",
- (long) current_gdbarch->stab_reg_to_regnum);
+ (long) gdbarch->stab_reg_to_regnum);
fprintf_unfiltered (file,
"gdbarch_dump: stabs_argument_has_addr = <0x%lx>\n",
- (long) current_gdbarch->stabs_argument_has_addr);
+ (long) gdbarch->stabs_argument_has_addr);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_static_transform_name_p() = %d\n",
- gdbarch_static_transform_name_p (current_gdbarch));
+ gdbarch_static_transform_name_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: static_transform_name = <0x%lx>\n",
- (long) current_gdbarch->static_transform_name);
+ (long) gdbarch->static_transform_name);
fprintf_unfiltered (file,
"gdbarch_dump: target_desc = %s\n",
- paddr_d ((long) current_gdbarch->target_desc));
+ paddr_d ((long) gdbarch->target_desc));
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_unwind_dummy_id_p() = %d\n",
- gdbarch_unwind_dummy_id_p (current_gdbarch));
+ gdbarch_unwind_dummy_id_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: unwind_dummy_id = <0x%lx>\n",
- (long) current_gdbarch->unwind_dummy_id);
+ (long) gdbarch->unwind_dummy_id);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_unwind_pc_p() = %d\n",
- gdbarch_unwind_pc_p (current_gdbarch));
+ gdbarch_unwind_pc_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: unwind_pc = <0x%lx>\n",
- (long) current_gdbarch->unwind_pc);
+ (long) gdbarch->unwind_pc);
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_unwind_sp_p() = %d\n",
- gdbarch_unwind_sp_p (current_gdbarch));
+ gdbarch_unwind_sp_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: unwind_sp = <0x%lx>\n",
- (long) current_gdbarch->unwind_sp);
+ (long) gdbarch->unwind_sp);
fprintf_unfiltered (file,
"gdbarch_dump: value_from_register = <0x%lx>\n",
- (long) current_gdbarch->value_from_register);
+ (long) gdbarch->value_from_register);
fprintf_unfiltered (file,
"gdbarch_dump: value_to_register = <0x%lx>\n",
- (long) current_gdbarch->value_to_register);
+ (long) gdbarch->value_to_register);
fprintf_unfiltered (file,
"gdbarch_dump: vbit_in_delta = %s\n",
- paddr_d (current_gdbarch->vbit_in_delta));
+ paddr_d (gdbarch->vbit_in_delta));
fprintf_unfiltered (file,
"gdbarch_dump: virtual_frame_pointer = <0x%lx>\n",
- (long) current_gdbarch->virtual_frame_pointer);
+ (long) gdbarch->virtual_frame_pointer);
fprintf_unfiltered (file,
"gdbarch_dump: vtable_function_descriptors = %s\n",
- paddr_d (current_gdbarch->vtable_function_descriptors));
+ paddr_d (gdbarch->vtable_function_descriptors));
fprintf_unfiltered (file,
"gdbarch_dump: gdbarch_write_pc_p() = %d\n",
- gdbarch_write_pc_p (current_gdbarch));
+ gdbarch_write_pc_p (gdbarch));
fprintf_unfiltered (file,
"gdbarch_dump: write_pc = <0x%lx>\n",
- (long) current_gdbarch->write_pc);
- if (current_gdbarch->dump_tdep != NULL)
- current_gdbarch->dump_tdep (current_gdbarch, file);
+ (long) gdbarch->write_pc);
+ if (gdbarch->dump_tdep != NULL)
+ gdbarch->dump_tdep (gdbarch, file);
}
struct gdbarch_tdep *
diff -urpN src/gdb/gdbarch.sh dev2/gdb/gdbarch.sh
--- src/gdb/gdbarch.sh 2007-11-09 06:32:19.000000000 +0100
+++ dev2/gdb/gdbarch.sh 2007-11-09 08:01:10.000000000 +0100
@@ -292,7 +292,7 @@ do
# You cannot specify both a zero INVALID_P and a POSTDEFAULT.
- # Variable declarations can refer to ``current_gdbarch'' which
+ # Variable declarations can refer to ``gdbarch'' which
# will contain the current architecture. Care should be
# taken.
@@ -336,13 +336,13 @@ function_list ()
{
# See below (DOCO) for description of each field
cat <<EOF
-i:const struct bfd_arch_info *:bfd_arch_info:::&bfd_default_arch_struct::::gdbarch_bfd_arch_info (current_gdbarch)->printable_name
+i:const struct bfd_arch_info *:bfd_arch_info:::&bfd_default_arch_struct::::gdbarch_bfd_arch_info (gdbarch)->printable_name
#
i:int:byte_order:::BFD_ENDIAN_BIG
#
i:enum gdb_osabi:osabi:::GDB_OSABI_UNKNOWN
#
-i:const struct target_desc *:target_desc:::::::paddr_d ((long) current_gdbarch->target_desc)
+i:const struct target_desc *:target_desc:::::::paddr_d ((long) gdbarch->target_desc)
# Number of bits in a char or unsigned char for the target machine.
# Just like CHAR_BIT in <limits.h> but describes the target machine.
# v:TARGET_CHAR_BIT:int:char_bit::::8 * sizeof (char):8::0:
@@ -355,7 +355,7 @@ v:int:int_bit:::8 * sizeof (int):4*TARGE
v:int:long_bit:::8 * sizeof (long):4*TARGET_CHAR_BIT::0
# Number of bits in a long long or unsigned long long for the target
# machine.
-v:int:long_long_bit:::8 * sizeof (LONGEST):2*current_gdbarch->long_bit::0
+v:int:long_long_bit:::8 * sizeof (LONGEST):2*gdbarch->long_bit::0
# The ABI default bit-size and format for "float", "double", and "long
# double". These bit/format pairs should eventually be combined into
@@ -364,11 +364,11 @@ v:int:long_long_bit:::8 * sizeof (LONGES
# useful).
v:int:float_bit:::8 * sizeof (float):4*TARGET_CHAR_BIT::0
-v:const struct floatformat **:float_format:::::floatformats_ieee_single::pformat (current_gdbarch->float_format)
+v:const struct floatformat **:float_format:::::floatformats_ieee_single::pformat (gdbarch->float_format)
v:int:double_bit:::8 * sizeof (double):8*TARGET_CHAR_BIT::0
-v:const struct floatformat **:double_format:::::floatformats_ieee_double::pformat (current_gdbarch->double_format)
+v:const struct floatformat **:double_format:::::floatformats_ieee_double::pformat (gdbarch->double_format)
v:int:long_double_bit:::8 * sizeof (long double):8*TARGET_CHAR_BIT::0
-v:const struct floatformat **:long_double_format:::::floatformats_ieee_double::pformat (current_gdbarch->long_double_format)
+v:const struct floatformat **:long_double_format:::::floatformats_ieee_double::pformat (gdbarch->long_double_format)
# For most targets, a pointer on the target and its representation as an
# address in GDB have the same size and "look the same". For such a
@@ -380,9 +380,9 @@ v:const struct floatformat **:long_doubl
# as well.
#
# ptr_bit is the size of a pointer on the target
-v:int:ptr_bit:::8 * sizeof (void*):current_gdbarch->int_bit::0
+v:int:ptr_bit:::8 * sizeof (void*):gdbarch->int_bit::0
# addr_bit is the size of a target address as represented in gdb
-v:int:addr_bit:::8 * sizeof (void*):0:gdbarch_ptr_bit (current_gdbarch):
+v:int:addr_bit:::8 * sizeof (void*):0:gdbarch_ptr_bit (gdbarch):
#
# One if \`char' acts like \`signed char', zero if \`unsigned char'.
v:int:char_signed:::1:-1:1
@@ -574,7 +574,7 @@ m:int:in_function_epilogue_p:CORE_ADDR a
m:char *:construct_inferior_arguments:int argc, char **argv:argc, argv::construct_inferior_arguments::0
f:void:elf_make_msymbol_special:asymbol *sym, struct minimal_symbol *msym:sym, msym::default_elf_make_msymbol_special::0
f:void:coff_make_msymbol_special:int val, struct minimal_symbol *msym:val, msym::default_coff_make_msymbol_special::0
-v:const char *:name_of_malloc:::"malloc":"malloc"::0:current_gdbarch->name_of_malloc
+v:const char *:name_of_malloc:::"malloc":"malloc"::0:gdbarch->name_of_malloc
v:int:cannot_step_breakpoint:::0:0::0
v:int:have_nonsteppable_watchpoint:::0:0::0
F:int:address_class_type_flags:int byte_size, int dwarf2_addr_class:byte_size, dwarf2_addr_class
@@ -1196,32 +1196,26 @@ struct gdbarch *
gdbarch_alloc (const struct gdbarch_info *info,
struct gdbarch_tdep *tdep)
{
- /* NOTE: The new architecture variable is named \`\`current_gdbarch''
- so that macros such as TARGET_ARCHITECTURE, when expanded, refer to
- the current local architecture and not the previous global
- architecture. This ensures that the new architectures initial
- values are not influenced by the previous architecture. Once
- everything is parameterised with gdbarch, this will go away. */
- struct gdbarch *current_gdbarch;
+ struct gdbarch *gdbarch;
/* Create an obstack for allocating all the per-architecture memory,
then use that to allocate the architecture vector. */
struct obstack *obstack = XMALLOC (struct obstack);
obstack_init (obstack);
- current_gdbarch = obstack_alloc (obstack, sizeof (*current_gdbarch));
- memset (current_gdbarch, 0, sizeof (*current_gdbarch));
- current_gdbarch->obstack = obstack;
+ gdbarch = obstack_alloc (obstack, sizeof (*gdbarch));
+ memset (gdbarch, 0, sizeof (*gdbarch));
+ gdbarch->obstack = obstack;
- alloc_gdbarch_data (current_gdbarch);
+ alloc_gdbarch_data (gdbarch);
- current_gdbarch->tdep = tdep;
+ gdbarch->tdep = tdep;
EOF
printf "\n"
function_list | while do_read
do
if class_is_info_p
then
- printf " current_gdbarch->${function} = info->${function};\n"
+ printf " gdbarch->${function} = info->${function};\n"
fi
done
printf "\n"
@@ -1232,14 +1226,14 @@ do
then
if [ -n "${predefault}" -a "x${predefault}" != "x0" ]
then
- printf " current_gdbarch->${function} = ${predefault};\n"
+ printf " gdbarch->${function} = ${predefault};\n"
fi
fi
done
cat <<EOF
/* gdbarch_alloc() */
- return current_gdbarch;
+ return gdbarch;
}
EOF
@@ -1282,14 +1276,8 @@ cat <<EOF
/* Ensure that all values in a GDBARCH are reasonable. */
-/* NOTE/WARNING: The parameter is called \`\`current_gdbarch'' so that it
- just happens to match the global variable \`\`current_gdbarch''. That
- way macros refering to that variable get the local and not the global
- version - ulgh. Once everything is parameterised with gdbarch, this
- will go away. */
-
static void
-verify_gdbarch (struct gdbarch *current_gdbarch)
+verify_gdbarch (struct gdbarch *gdbarch)
{
struct ui_file *log;
struct cleanup *cleanups;
@@ -1298,9 +1286,9 @@ verify_gdbarch (struct gdbarch *current_
log = mem_fileopen ();
cleanups = make_cleanup_ui_file_delete (log);
/* fundamental */
- if (current_gdbarch->byte_order == BFD_ENDIAN_UNKNOWN)
+ if (gdbarch->byte_order == BFD_ENDIAN_UNKNOWN)
fprintf_unfiltered (log, "\n\tbyte-order");
- if (current_gdbarch->bfd_arch_info == NULL)
+ if (gdbarch->bfd_arch_info == NULL)
fprintf_unfiltered (log, "\n\tbfd_arch_info");
/* Check those that need to be defined for the given multi-arch level. */
EOF
@@ -1318,22 +1306,22 @@ do
elif [ -n "${invalid_p}" -a -n "${postdefault}" ]
then
printf " if (${invalid_p})\n"
- printf " current_gdbarch->${function} = ${postdefault};\n"
+ printf " gdbarch->${function} = ${postdefault};\n"
elif [ -n "${predefault}" -a -n "${postdefault}" ]
then
- printf " if (current_gdbarch->${function} == ${predefault})\n"
- printf " current_gdbarch->${function} = ${postdefault};\n"
+ printf " if (gdbarch->${function} == ${predefault})\n"
+ printf " gdbarch->${function} = ${postdefault};\n"
elif [ -n "${postdefault}" ]
then
- printf " if (current_gdbarch->${function} == 0)\n"
- printf " current_gdbarch->${function} = ${postdefault};\n"
+ printf " if (gdbarch->${function} == 0)\n"
+ printf " gdbarch->${function} = ${postdefault};\n"
elif [ -n "${invalid_p}" ]
then
printf " if (${invalid_p})\n"
printf " fprintf_unfiltered (log, \"\\\\n\\\\t${function}\");\n"
elif [ -n "${predefault}" ]
then
- printf " if (current_gdbarch->${function} == ${predefault})\n"
+ printf " if (gdbarch->${function} == ${predefault})\n"
printf " fprintf_unfiltered (log, \"\\\\n\\\\t${function}\");\n"
fi
fi
@@ -1355,14 +1343,8 @@ printf "\n"
cat <<EOF
/* Print out the details of the current architecture. */
-/* NOTE/WARNING: The parameter is called \`\`current_gdbarch'' so that it
- just happens to match the global variable \`\`current_gdbarch''. That
- way macros refering to that variable get the local and not the global
- version - ulgh. Once everything is parameterised with gdbarch, this
- will go away. */
-
void
-gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file)
+gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
{
const char *gdb_xm_file = "<not-defined>";
const char *gdb_nm_file = "<not-defined>";
@@ -1393,24 +1375,24 @@ do
then
printf " fprintf_unfiltered (file,\n"
printf " \"gdbarch_dump: gdbarch_${function}_p() = %%d\\\\n\",\n"
- printf " gdbarch_${function}_p (current_gdbarch));\n"
+ printf " gdbarch_${function}_p (gdbarch));\n"
fi
# Print the corresponding value.
if class_is_function_p
then
printf " fprintf_unfiltered (file,\n"
printf " \"gdbarch_dump: ${function} = <0x%%lx>\\\\n\",\n"
- printf " (long) current_gdbarch->${function});\n"
+ printf " (long) gdbarch->${function});\n"
else
# It is a variable
case "${print}:${returntype}" in
:CORE_ADDR )
fmt="0x%s"
- print="paddr_nz (current_gdbarch->${function})"
+ print="paddr_nz (gdbarch->${function})"
;;
:* )
fmt="%s"
- print="paddr_d (current_gdbarch->${function})"
+ print="paddr_d (gdbarch->${function})"
;;
* )
fmt="%s"
@@ -1422,8 +1404,8 @@ do
fi
done
cat <<EOF
- if (current_gdbarch->dump_tdep != NULL)
- current_gdbarch->dump_tdep (current_gdbarch, file);
+ if (gdbarch->dump_tdep != NULL)
+ gdbarch->dump_tdep (gdbarch, file);
}
EOF
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rfc] [01/05] Get rid of current_gdbarch in gdbarch.{c,h,sh}
2007-11-09 7:30 ` Markus Deuling
@ 2007-11-09 13:19 ` Ulrich Weigand
2007-11-12 6:48 ` Markus Deuling
0 siblings, 1 reply; 8+ messages in thread
From: Ulrich Weigand @ 2007-11-09 13:19 UTC (permalink / raw)
To: Markus Deuling; +Cc: GDB Patches, Daniel Jacobowitz
Markus Deuling wrote:
> * gdbarch.sh (gdbarch_alloc): Replace current_gdbarch by gdbarch. Remove
> obsolete comment.
> (verify_gdbarch, gdbarch_dump): Likewise.
> (do_read): Update comment.
> (addr_bit, bfd_arch_info, target_desc, long_long_bit, floatformat)
> (ptr_bit, name_of_malloc): Replace current_gdbarch by gdbarch.
> * gdbarch.{c,h}: Regenerate.
This is OK, thanks.
Bye,
Ulrich
--
Dr. Ulrich Weigand
GNU Toolchain for Linux on System z and Cell BE
Ulrich.Weigand@de.ibm.com
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [rfc] [01/05] Get rid of current_gdbarch in gdbarch.{c,h,sh}
2007-11-09 13:19 ` Ulrich Weigand
@ 2007-11-12 6:48 ` Markus Deuling
0 siblings, 0 replies; 8+ messages in thread
From: Markus Deuling @ 2007-11-12 6:48 UTC (permalink / raw)
To: GDB Patches; +Cc: Ulrich Weigand, Daniel Jacobowitz
Ulrich Weigand schrieb:
> Markus Deuling wrote:
>
>> * gdbarch.sh (gdbarch_alloc): Replace current_gdbarch by gdbarch. Remove
>> obsolete comment.
>> (verify_gdbarch, gdbarch_dump): Likewise.
>> (do_read): Update comment.
>> (addr_bit, bfd_arch_info, target_desc, long_long_bit, floatformat)
>> (ptr_bit, name_of_malloc): Replace current_gdbarch by gdbarch.
>> * gdbarch.{c,h}: Regenerate.
>
> This is OK, thanks.
>
> Bye,
> Ulrich
>
I've committed this one now. Thank you!
--
Markus Deuling
GNU Toolchain for Linux on Cell BE
deuling@de.ibm.com
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2007-11-12 6:48 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-11-07 11:13 [rfc] [01/05] Get rid of current_gdbarch in gdbarch.{c,h,sh} Markus Deuling
2007-11-07 12:59 ` Daniel Jacobowitz
2007-11-07 14:58 ` Markus Deuling
2007-11-07 15:05 ` Daniel Jacobowitz
2007-11-08 13:18 ` Ulrich Weigand
2007-11-09 7:30 ` Markus Deuling
2007-11-09 13:19 ` Ulrich Weigand
2007-11-12 6:48 ` Markus Deuling
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox