From 15ac804d2f0b001dfcdf6113735ce8911ca1aab9 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sun, 13 Jun 2004 13:49:53 +0000 Subject: [PATCH] 2004-06-13 Andrew Cagney * gdbarch.sh (DEPRECATED_MAX_REGISTER_RAW_SIZE) (DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE): Delete. * gdbarch.h, gdbarch.c: Regenerate. * ns32k-tdep.h (NS32K_MAX_REGISTER_RAW_SIZE) (NS32K_MAX_REGISTER_VIRTUAL_SIZE): Delete macros. * xstormy16-tdep.c (xstormy16_gdbarch_init): Do not set deprecated_max_register_raw_size and deprecated_max_register_virtual_size. * v850-tdep.c (v850_gdbarch_init): Ditto. * ns32k-tdep.c (ns32k_gdbarch_init): Ditto. * mn10300-tdep.c (mn10300_gdbarch_init): Ditto. * mcore-tdep.c (mcore_gdbarch_init): Ditto. * cris-tdep.c (cris_gdbarch_init): Ditto. --- gdb/ChangeLog | 14 ++++++++ gdb/cris-tdep.c | 6 ---- gdb/gdbarch.c | 86 -------------------------------------------- gdb/gdbarch.h | 54 ---------------------------- gdb/gdbarch.sh | 6 ---- gdb/mcore-tdep.c | 2 -- gdb/mn10300-tdep.c | 2 -- gdb/ns32k-tdep.c | 3 -- gdb/ns32k-tdep.h | 2 -- gdb/v850-tdep.c | 2 -- gdb/xstormy16-tdep.c | 2 -- 11 files changed, 14 insertions(+), 165 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 79e0e0e073..0c047684e4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,19 @@ 2004-06-13 Andrew Cagney + * gdbarch.sh (DEPRECATED_MAX_REGISTER_RAW_SIZE) + (DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE): Delete. + * gdbarch.h, gdbarch.c: Regenerate. + * ns32k-tdep.h (NS32K_MAX_REGISTER_RAW_SIZE) + (NS32K_MAX_REGISTER_VIRTUAL_SIZE): Delete macros. + * xstormy16-tdep.c (xstormy16_gdbarch_init): Do not set + deprecated_max_register_raw_size and + deprecated_max_register_virtual_size. + * v850-tdep.c (v850_gdbarch_init): Ditto. + * ns32k-tdep.c (ns32k_gdbarch_init): Ditto. + * mn10300-tdep.c (mn10300_gdbarch_init): Ditto. + * mcore-tdep.c (mcore_gdbarch_init): Ditto. + * cris-tdep.c (cris_gdbarch_init): Ditto. + * gdbarch.sh (RETURN_VALUE_ON_STACK): Delete method. * gdbarch.h, gdbarch.c: Re-generate. * m68hc11-tdep.c (m68hc11_return_value_on_stack): Delete function. diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index 4708f54ad0..85cc9471b3 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -3857,15 +3857,9 @@ cris_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* The length of the registers in the actual machine representation. */ set_gdbarch_deprecated_register_raw_size (gdbarch, cris_register_size); - /* The largest value DEPRECATED_REGISTER_RAW_SIZE can have. */ - set_gdbarch_deprecated_max_register_raw_size (gdbarch, 32); - /* The length of the registers in the program's representation. */ set_gdbarch_deprecated_register_virtual_size (gdbarch, cris_register_size); - /* The largest value DEPRECATED_REGISTER_VIRTUAL_SIZE can have. */ - set_gdbarch_deprecated_max_register_virtual_size (gdbarch, 32); - set_gdbarch_deprecated_register_virtual_type (gdbarch, cris_register_virtual_type); /* Dummy frame functions. */ diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index b101db8df0..26c7006246 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -150,8 +150,6 @@ struct gdbarch gdbarch_deprecated_register_byte_ftype *deprecated_register_byte; gdbarch_deprecated_register_raw_size_ftype *deprecated_register_raw_size; gdbarch_deprecated_register_virtual_size_ftype *deprecated_register_virtual_size; - int deprecated_max_register_raw_size; - int deprecated_max_register_virtual_size; gdbarch_unwind_dummy_id_ftype *unwind_dummy_id; gdbarch_deprecated_save_dummy_frame_tos_ftype *deprecated_save_dummy_frame_tos; int deprecated_fp_regnum; @@ -298,8 +296,6 @@ struct gdbarch startup_gdbarch = generic_register_byte, /* deprecated_register_byte */ generic_register_size, /* deprecated_register_raw_size */ generic_register_size, /* deprecated_register_virtual_size */ - 0, /* deprecated_max_register_raw_size */ - 0, /* deprecated_max_register_virtual_size */ 0, /* unwind_dummy_id */ 0, /* deprecated_save_dummy_frame_tos */ -1, /* deprecated_fp_regnum */ @@ -578,8 +574,6 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of deprecated_register_byte, has predicate */ /* Skip verify of deprecated_register_raw_size, has predicate */ /* Skip verify of deprecated_register_virtual_size, has predicate */ - /* Skip verify of deprecated_max_register_raw_size, has predicate */ - /* Skip verify of deprecated_max_register_virtual_size, has predicate */ /* Skip verify of unwind_dummy_id, has predicate */ /* Skip verify of deprecated_save_dummy_frame_tos, has predicate */ /* Skip verify of deprecated_fp_regnum, invalid_p == 0 */ @@ -1147,40 +1141,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) (long) current_gdbarch->deprecated_init_frame_pc /*DEPRECATED_INIT_FRAME_PC ()*/); #endif -#ifdef DEPRECATED_MAX_REGISTER_RAW_SIZE_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_MAX_REGISTER_RAW_SIZE_P()", - XSTRING (DEPRECATED_MAX_REGISTER_RAW_SIZE_P ())); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_MAX_REGISTER_RAW_SIZE_P() = %d\n", - DEPRECATED_MAX_REGISTER_RAW_SIZE_P ()); -#endif -#ifdef DEPRECATED_MAX_REGISTER_RAW_SIZE - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_MAX_REGISTER_RAW_SIZE # %s\n", - XSTRING (DEPRECATED_MAX_REGISTER_RAW_SIZE)); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_MAX_REGISTER_RAW_SIZE = %d\n", - DEPRECATED_MAX_REGISTER_RAW_SIZE); -#endif -#ifdef DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE_P()", - XSTRING (DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE_P ())); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE_P() = %d\n", - DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE_P ()); -#endif -#ifdef DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE # %s\n", - XSTRING (DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE)); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE = %d\n", - DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE); -#endif #ifdef DEPRECATED_POP_FRAME_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -2841,52 +2801,6 @@ set_gdbarch_deprecated_register_virtual_size (struct gdbarch *gdbarch, gdbarch->deprecated_register_virtual_size = deprecated_register_virtual_size; } -int -gdbarch_deprecated_max_register_raw_size_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_max_register_raw_size != 0; -} - -int -gdbarch_deprecated_max_register_raw_size (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_max_register_raw_size called\n"); - return gdbarch->deprecated_max_register_raw_size; -} - -void -set_gdbarch_deprecated_max_register_raw_size (struct gdbarch *gdbarch, - int deprecated_max_register_raw_size) -{ - gdbarch->deprecated_max_register_raw_size = deprecated_max_register_raw_size; -} - -int -gdbarch_deprecated_max_register_virtual_size_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_max_register_virtual_size != 0; -} - -int -gdbarch_deprecated_max_register_virtual_size (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_max_register_virtual_size called\n"); - return gdbarch->deprecated_max_register_virtual_size; -} - -void -set_gdbarch_deprecated_max_register_virtual_size (struct gdbarch *gdbarch, - int deprecated_max_register_virtual_size) -{ - gdbarch->deprecated_max_register_virtual_size = deprecated_max_register_virtual_size; -} - int gdbarch_unwind_dummy_id_p (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 6e05cab696..e675f6910e 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -586,60 +586,6 @@ extern void set_gdbarch_deprecated_register_virtual_size (struct gdbarch *gdbarc #define DEPRECATED_REGISTER_VIRTUAL_SIZE(reg_nr) (gdbarch_deprecated_register_virtual_size (current_gdbarch, reg_nr)) #endif -/* DEPRECATED_MAX_REGISTER_RAW_SIZE can be deleted. It has been - replaced by the constant MAX_REGISTER_SIZE. */ - -#if defined (DEPRECATED_MAX_REGISTER_RAW_SIZE) -/* Legacy for systems yet to multi-arch DEPRECATED_MAX_REGISTER_RAW_SIZE */ -#if !defined (DEPRECATED_MAX_REGISTER_RAW_SIZE_P) -#define DEPRECATED_MAX_REGISTER_RAW_SIZE_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_max_register_raw_size_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_MAX_REGISTER_RAW_SIZE_P) -#error "Non multi-arch definition of DEPRECATED_MAX_REGISTER_RAW_SIZE" -#endif -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (DEPRECATED_MAX_REGISTER_RAW_SIZE_P) -#define DEPRECATED_MAX_REGISTER_RAW_SIZE_P() (gdbarch_deprecated_max_register_raw_size_p (current_gdbarch)) -#endif - -extern int gdbarch_deprecated_max_register_raw_size (struct gdbarch *gdbarch); -extern void set_gdbarch_deprecated_max_register_raw_size (struct gdbarch *gdbarch, int deprecated_max_register_raw_size); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_MAX_REGISTER_RAW_SIZE) -#error "Non multi-arch definition of DEPRECATED_MAX_REGISTER_RAW_SIZE" -#endif -#if !defined (DEPRECATED_MAX_REGISTER_RAW_SIZE) -#define DEPRECATED_MAX_REGISTER_RAW_SIZE (gdbarch_deprecated_max_register_raw_size (current_gdbarch)) -#endif - -/* DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE can be deleted. It has been - replaced by the constant MAX_REGISTER_SIZE. */ - -#if defined (DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE) -/* Legacy for systems yet to multi-arch DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE */ -#if !defined (DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE_P) -#define DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_max_register_virtual_size_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE_P) -#error "Non multi-arch definition of DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE" -#endif -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE_P) -#define DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE_P() (gdbarch_deprecated_max_register_virtual_size_p (current_gdbarch)) -#endif - -extern int gdbarch_deprecated_max_register_virtual_size (struct gdbarch *gdbarch); -extern void set_gdbarch_deprecated_max_register_virtual_size (struct gdbarch *gdbarch, int deprecated_max_register_virtual_size); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE) -#error "Non multi-arch definition of DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE" -#endif -#if !defined (DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE) -#define DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE (gdbarch_deprecated_max_register_virtual_size (current_gdbarch)) -#endif - /* See gdbint.texinfo, and PUSH_DUMMY_CALL. */ extern int gdbarch_unwind_dummy_id_p (struct gdbarch *gdbarch); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 7ee06dedcc..c9436485f3 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -493,12 +493,6 @@ F:2:DEPRECATED_REGISTER_RAW_SIZE:int:deprecated_register_raw_size:int reg_nr:reg # DEPRECATED_REGISTER_VIRTUAL_SIZE can be deleted. See: maint print # registers. F:2:DEPRECATED_REGISTER_VIRTUAL_SIZE:int:deprecated_register_virtual_size:int reg_nr:reg_nr::generic_register_size:generic_register_size -# DEPRECATED_MAX_REGISTER_RAW_SIZE can be deleted. It has been -# replaced by the constant MAX_REGISTER_SIZE. -V:2:DEPRECATED_MAX_REGISTER_RAW_SIZE:int:deprecated_max_register_raw_size -# DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE can be deleted. It has been -# replaced by the constant MAX_REGISTER_SIZE. -V:2:DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE:int:deprecated_max_register_virtual_size # See gdbint.texinfo, and PUSH_DUMMY_CALL. M::UNWIND_DUMMY_ID:struct frame_id:unwind_dummy_id:struct frame_info *info:info diff --git a/gdb/mcore-tdep.c b/gdb/mcore-tdep.c index 3f60e26fdf..1c9eafe187 100644 --- a/gdb/mcore-tdep.c +++ b/gdb/mcore-tdep.c @@ -1036,8 +1036,6 @@ mcore_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* All registers are 32 bits */ set_gdbarch_deprecated_register_size (gdbarch, MCORE_REG_SIZE); - set_gdbarch_deprecated_max_register_raw_size (gdbarch, MCORE_REG_SIZE); - set_gdbarch_deprecated_max_register_virtual_size (gdbarch, MCORE_REG_SIZE); set_gdbarch_register_name (gdbarch, mcore_register_name); set_gdbarch_deprecated_register_virtual_type (gdbarch, mcore_register_virtual_type); set_gdbarch_deprecated_register_virtual_size (gdbarch, mcore_register_size); diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index 35345a2b37..e5e9dd2748 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -1291,10 +1291,8 @@ mn10300_gdbarch_init (struct gdbarch_info info, set_gdbarch_register_name (gdbarch, register_name); set_gdbarch_deprecated_register_size (gdbarch, 4); set_gdbarch_deprecated_register_bytes (gdbarch, num_regs * gdbarch_deprecated_register_size (gdbarch)); - set_gdbarch_deprecated_max_register_raw_size (gdbarch, 4); set_gdbarch_deprecated_register_raw_size (gdbarch, mn10300_register_raw_size); set_gdbarch_deprecated_register_byte (gdbarch, mn10300_register_byte); - set_gdbarch_deprecated_max_register_virtual_size (gdbarch, 4); set_gdbarch_deprecated_register_virtual_size (gdbarch, mn10300_register_virtual_size); set_gdbarch_deprecated_register_virtual_type (gdbarch, mn10300_register_virtual_type); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, mn10300_dwarf2_reg_to_regnum); diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c index 784cea4993..500f3a06cc 100644 --- a/gdb/ns32k-tdep.c +++ b/gdb/ns32k-tdep.c @@ -521,10 +521,7 @@ ns32k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_register_size (gdbarch, NS32K_REGISTER_SIZE); set_gdbarch_deprecated_register_raw_size (gdbarch, ns32k_register_raw_size); - set_gdbarch_deprecated_max_register_raw_size (gdbarch, NS32K_MAX_REGISTER_RAW_SIZE); set_gdbarch_deprecated_register_virtual_size (gdbarch, ns32k_register_virtual_size); - set_gdbarch_deprecated_max_register_virtual_size (gdbarch, - NS32K_MAX_REGISTER_VIRTUAL_SIZE); set_gdbarch_deprecated_register_virtual_type (gdbarch, ns32k_register_virtual_type); /* Frame and stack info */ diff --git a/gdb/ns32k-tdep.h b/gdb/ns32k-tdep.h index c2dc71aab2..0b6551f4fc 100644 --- a/gdb/ns32k-tdep.h +++ b/gdb/ns32k-tdep.h @@ -50,8 +50,6 @@ + 8 * 8 /* size of floating point regs */) #define NS32K_REGISTER_SIZE 4 -#define NS32K_MAX_REGISTER_RAW_SIZE 8 -#define NS32K_MAX_REGISTER_VIRTUAL_SIZE 8 void ns32k_gdbarch_init_32082 (struct gdbarch *); void ns32k_gdbarch_init_32382 (struct gdbarch *); diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c index d15dacdc58..4482809f63 100644 --- a/gdb/v850-tdep.c +++ b/gdb/v850-tdep.c @@ -1194,9 +1194,7 @@ v850_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_register_bytes (gdbarch, E_ALL_REGS_SIZE); set_gdbarch_deprecated_register_byte (gdbarch, v850_register_byte); set_gdbarch_deprecated_register_raw_size (gdbarch, v850_register_raw_size); - set_gdbarch_deprecated_max_register_raw_size (gdbarch, v850_reg_size); set_gdbarch_deprecated_register_virtual_size (gdbarch, v850_register_raw_size); - set_gdbarch_deprecated_max_register_virtual_size (gdbarch, v850_reg_size); set_gdbarch_deprecated_register_virtual_type (gdbarch, v850_reg_virtual_type); set_gdbarch_deprecated_target_read_fp (gdbarch, v850_target_read_fp); diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c index 760e34fc3a..6f747c8618 100644 --- a/gdb/xstormy16-tdep.c +++ b/gdb/xstormy16-tdep.c @@ -1130,9 +1130,7 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_register_bytes (gdbarch, E_ALL_REGS_SIZE); set_gdbarch_deprecated_register_byte (gdbarch, xstormy16_register_byte); set_gdbarch_deprecated_register_raw_size (gdbarch, xstormy16_register_raw_size); - set_gdbarch_deprecated_max_register_raw_size (gdbarch, xstormy16_pc_size); set_gdbarch_deprecated_register_virtual_size (gdbarch, xstormy16_register_raw_size); - set_gdbarch_deprecated_max_register_virtual_size (gdbarch, 4); set_gdbarch_deprecated_register_virtual_type (gdbarch, xstormy16_reg_virtual_type); /*