From 046a4708e43cc23af647089c058c034ff23adec0 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sun, 15 Feb 2004 15:22:06 +0000 Subject: [PATCH] 2004-02-15 Andrew Cagney * gdbarch.sh (deprecated_register_gdbarch_swap): Rename register_gdbarch_swap. (DEPRECATED_REGISTER_GDBARCH_SWAP): Rename REGISTER_GDBARCH_SWAP. * f-lang.c (_initialize_f_language): Update, use DEPRECATED_REGISTER_GDBARCH_SWAP. * remote.c (_initialize_remote): Ditto. * regcache.c (_initialize_regcache): Ditto. * parse.c (_initialize_parse): Ditto. * infrun.c (_initialize_infrun): Ditto. * mi/mi-main.c (_initialize_mi_main): Ditto. * gdbtypes.c (_initialize_gdbtypes): Ditto. --- gdb/ChangeLog | 12 ++++++ gdb/f-lang.c | 46 ++++++++------------- gdb/gdbarch.c | 6 +-- gdb/gdbarch.h | 4 +- gdb/gdbarch.sh | 10 ++--- gdb/gdbtypes.c | 104 +++++++++++++++++++++++------------------------ gdb/infrun.c | 4 +- gdb/mi/mi-main.c | 4 +- gdb/parse.c | 9 ++-- gdb/regcache.c | 8 ++-- gdb/remote.c | 5 +-- gdb/std-regs.c | 2 +- 12 files changed, 105 insertions(+), 109 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d777cc36db8..382cd72f7a5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,17 @@ 2004-02-15 Andrew Cagney + * gdbarch.sh (deprecated_register_gdbarch_swap): Rename + register_gdbarch_swap. + (DEPRECATED_REGISTER_GDBARCH_SWAP): Rename REGISTER_GDBARCH_SWAP. + * f-lang.c (_initialize_f_language): Update, use + DEPRECATED_REGISTER_GDBARCH_SWAP. + * remote.c (_initialize_remote): Ditto. + * regcache.c (_initialize_regcache): Ditto. + * parse.c (_initialize_parse): Ditto. + * infrun.c (_initialize_infrun): Ditto. + * mi/mi-main.c (_initialize_mi_main): Ditto. + * gdbtypes.c (_initialize_gdbtypes): Ditto. + * solib.c (solib_map_sections): Use bfd_set_cacheable instead of poking .cacheable directly. * symfile.c (symfile_bfd_open): Ditto. diff --git a/gdb/f-lang.c b/gdb/f-lang.c index c34b4a7b826..1e7cd45362c 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -568,36 +568,22 @@ void _initialize_f_language (void) { build_fortran_types (); - register_gdbarch_swap (&builtin_type_f_character, - sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_f_logical, - sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_f_logical_s1, - sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_f_logical_s2, - sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_f_integer, - sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_f_integer_s2, - sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_f_real, - sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_f_real_s8, - sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_f_real_s16, - sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_f_complex_s8, - sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_f_complex_s16, - sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_f_complex_s32, - sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_f_void, - sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_string, - sizeof (struct type *), NULL); - - register_gdbarch_swap (NULL, 0, build_fortran_types); + + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_character); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_logical); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_logical_s1); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_logical_s2); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_integer); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_integer_s2); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_real); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_real_s8); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_real_s16); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_complex_s8); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_complex_s16); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_complex_s32); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_f_void); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_string); + deprecated_register_gdbarch_swap (NULL, 0, build_fortran_types); builtin_type_string = init_type (TYPE_CODE_STRING, TARGET_CHAR_BIT / TARGET_CHAR_BIT, diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 86c2e02189d..0f6e41535e7 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -5483,9 +5483,9 @@ struct gdbarch_swap_registry gdbarch_swap_registry = }; void -register_gdbarch_swap (void *data, - unsigned long sizeof_data, - gdbarch_swap_ftype *init) +deprecated_register_gdbarch_swap (void *data, + unsigned long sizeof_data, + gdbarch_swap_ftype *init) { struct gdbarch_swap_registration **rego; for (rego = &gdbarch_swap_registry.registrations; diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index d6b7b58bc51..4de86546bbc 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -2538,8 +2538,8 @@ extern void *gdbarch_data (struct gdbarch *gdbarch, struct gdbarch_data *); New code should use register_gdbarch_data(). */ typedef void (gdbarch_swap_ftype) (void); -extern void register_gdbarch_swap (void *data, unsigned long size, gdbarch_swap_ftype *init); -#define REGISTER_GDBARCH_SWAP(VAR) register_gdbarch_swap (&(VAR), sizeof ((VAR)), NULL) +extern void deprecated_register_gdbarch_swap (void *data, unsigned long size, gdbarch_swap_ftype *init); +#define DEPRECATED_REGISTER_GDBARCH_SWAP(VAR) deprecated_register_gdbarch_swap (&(VAR), sizeof ((VAR)), NULL) diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 8156a62070c..6c9ce48ac3d 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -1238,8 +1238,8 @@ extern void *gdbarch_data (struct gdbarch *gdbarch, struct gdbarch_data *); New code should use register_gdbarch_data(). */ typedef void (gdbarch_swap_ftype) (void); -extern void register_gdbarch_swap (void *data, unsigned long size, gdbarch_swap_ftype *init); -#define REGISTER_GDBARCH_SWAP(VAR) register_gdbarch_swap (&(VAR), sizeof ((VAR)), NULL) +extern void deprecated_register_gdbarch_swap (void *data, unsigned long size, gdbarch_swap_ftype *init); +#define DEPRECATED_REGISTER_GDBARCH_SWAP(VAR) deprecated_register_gdbarch_swap (&(VAR), sizeof ((VAR)), NULL) @@ -1924,9 +1924,9 @@ struct gdbarch_swap_registry gdbarch_swap_registry = }; void -register_gdbarch_swap (void *data, - unsigned long sizeof_data, - gdbarch_swap_ftype *init) +deprecated_register_gdbarch_swap (void *data, + unsigned long sizeof_data, + gdbarch_swap_ftype *init) { struct gdbarch_swap_registration **rego; for (rego = &gdbarch_swap_registry.registrations; diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 4c24fa27a8d..2dc3a46e07b 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -3365,58 +3365,58 @@ _initialize_gdbtypes (void) /* FIXME - For the moment, handle types by swapping them in and out. Should be using the per-architecture data-pointer and a large struct. */ - register_gdbarch_swap (&builtin_type_void, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_char, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_short, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_int, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_long, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_long_long, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_signed_char, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_unsigned_char, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_unsigned_short, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_unsigned_int, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_unsigned_long, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_unsigned_long_long, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_float, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_double, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_long_double, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_complex, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_double_complex, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_string, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_int8, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_uint8, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_int16, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_uint16, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_int32, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_uint32, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_int64, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_uint64, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_int128, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_uint128, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v4sf, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v4si, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v16qi, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v8qi, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v8hi, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v4hi, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v2si, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v2_double, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v4_float, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v2_int64, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v4_int32, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v8_int16, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v16_int8, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v2_float, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v2_int32, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v8_int8, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_v4_int16, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_vec128, sizeof (struct type *), NULL); - register_gdbarch_swap (&builtin_type_vec128i, sizeof (struct type *), NULL); - REGISTER_GDBARCH_SWAP (builtin_type_void_data_ptr); - REGISTER_GDBARCH_SWAP (builtin_type_void_func_ptr); - REGISTER_GDBARCH_SWAP (builtin_type_CORE_ADDR); - REGISTER_GDBARCH_SWAP (builtin_type_bfd_vma); - register_gdbarch_swap (NULL, 0, build_gdbtypes); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_void); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_char); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_short); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_int); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_long); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_long_long); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_signed_char); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_unsigned_char); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_unsigned_short); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_unsigned_int); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_unsigned_long); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_unsigned_long_long); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_float); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_double); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_long_double); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_complex); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_double_complex); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_string); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_int8); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_uint8); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_int16); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_uint16); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_int32); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_uint32); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_int64); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_uint64); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_int128); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_uint128); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v4sf); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v4si); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v16qi); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v8qi); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v8hi); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v4hi); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v2si); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v2_double); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v4_float); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v2_int64); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v4_int32); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v8_int16); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v16_int8); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v2_float); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v2_int32); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v8_int8); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_v4_int16); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_vec128); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_vec128i); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_void_data_ptr); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_void_func_ptr); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_CORE_ADDR); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_bfd_vma); + deprecated_register_gdbarch_swap (NULL, 0, build_gdbtypes); /* Note: These types do not need to be swapped - they are target neutral. */ diff --git a/gdb/infrun.c b/gdb/infrun.c index ea83f13f1de..3d41f4289cc 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3997,8 +3997,8 @@ _initialize_infrun (void) int numsigs; struct cmd_list_element *c; - register_gdbarch_swap (&stop_registers, sizeof (stop_registers), NULL); - register_gdbarch_swap (NULL, 0, build_infrun); + DEPRECATED_REGISTER_GDBARCH_SWAP (stop_registers); + deprecated_register_gdbarch_swap (NULL, 0, build_infrun); add_info ("signals", signals_info, "What debugger does when program gets various signals.\n\ diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index db5f3b9a301..c46bf636597 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -1489,6 +1489,6 @@ mi_setup_architecture_data (void) void _initialize_mi_main (void) { - register_gdbarch_swap (&old_regs, sizeof (old_regs), NULL); - register_gdbarch_swap (NULL, 0, mi_setup_architecture_data); + DEPRECATED_REGISTER_GDBARCH_SWAP (old_regs); + deprecated_register_gdbarch_swap (NULL, 0, mi_setup_architecture_data); } diff --git a/gdb/parse.c b/gdb/parse.c index da39866f759..374e88ed85d 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -1293,11 +1293,10 @@ _initialize_parse (void) /* FIXME - For the moment, handle types by swapping them in and out. Should be using the per-architecture data-pointer and a large struct. */ - register_gdbarch_swap (&msym_text_symbol_type, sizeof (msym_text_symbol_type), NULL); - register_gdbarch_swap (&msym_data_symbol_type, sizeof (msym_data_symbol_type), NULL); - register_gdbarch_swap (&msym_unknown_symbol_type, sizeof (msym_unknown_symbol_type), NULL); - - register_gdbarch_swap (NULL, 0, build_parse); + DEPRECATED_REGISTER_GDBARCH_SWAP (msym_text_symbol_type); + DEPRECATED_REGISTER_GDBARCH_SWAP (msym_data_symbol_type); + DEPRECATED_REGISTER_GDBARCH_SWAP (msym_unknown_symbol_type); + deprecated_register_gdbarch_swap (NULL, 0, build_parse); add_show_from_set ( add_set_cmd ("expression", class_maintenance, var_zinteger, diff --git a/gdb/regcache.c b/gdb/regcache.c index 7c403837f87..e479954296e 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -1707,10 +1707,10 @@ void _initialize_regcache (void) { regcache_descr_handle = register_gdbarch_data (init_regcache_descr); - REGISTER_GDBARCH_SWAP (current_regcache); - register_gdbarch_swap (&deprecated_registers, sizeof (deprecated_registers), NULL); - register_gdbarch_swap (&deprecated_register_valid, sizeof (deprecated_register_valid), NULL); - register_gdbarch_swap (NULL, 0, build_regcache); + DEPRECATED_REGISTER_GDBARCH_SWAP (current_regcache); + DEPRECATED_REGISTER_GDBARCH_SWAP (deprecated_registers); + DEPRECATED_REGISTER_GDBARCH_SWAP (deprecated_register_valid); + deprecated_register_gdbarch_swap (NULL, 0, build_regcache); add_com ("flushregs", class_maintenance, reg_flush_command, "Force gdb to flush its register cache (maintainer command)"); diff --git a/gdb/remote.c b/gdb/remote.c index 99f51a31671..55bc135a9b2 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -5406,9 +5406,8 @@ _initialize_remote (void) /* Old tacky stuff. NOTE: This comes after the remote protocol so that the remote protocol has been initialized. */ - register_gdbarch_swap (&remote_address_size, - sizeof (&remote_address_size), NULL); - register_gdbarch_swap (NULL, 0, build_remote_gdbarch_data); + DEPRECATED_REGISTER_GDBARCH_SWAP (remote_address_size); + deprecated_register_gdbarch_swap (NULL, 0, build_remote_gdbarch_data); init_remote_ops (); add_target (&remote_ops); diff --git a/gdb/std-regs.c b/gdb/std-regs.c index 0bce7edd1f3..368720dd95b 100644 --- a/gdb/std-regs.c +++ b/gdb/std-regs.c @@ -142,7 +142,7 @@ _initialize_frame_reg (void) can't be initialized using _initialize*() or gdbarch. Due mainly to non-multi-arch targets, GDB initializes things piece meal and, as a consequence can leave these types NULL. */ - REGISTER_GDBARCH_SWAP (builtin_type_frame_reg); + DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_frame_reg); /* Frame based $fp, $pc, $sp and $ps. These only come into play when the target does not define its own version of these -- 2.30.2