From 5d8140d1dab14fd514362a9a2131367ee9c95e95 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Sat, 16 Jun 2007 18:28:24 +0000 Subject: [PATCH] * gdbarch.sh (bfd_vma): Remove. * gdbarch.c, gdbarch.h: Regenerate. * gdbtypes.h (builtin_bfd_vma_type): Remove. * gdbtypes.h (builtin_bfd_vma_type): Remove. (build_gdbtypes): Do not initialize it. (_initialize_gdbtypes): Do not swap it. --- gdb/ChangeLog | 10 ++++++++++ gdb/gdbarch.c | 24 ------------------------ gdb/gdbarch.h | 5 ----- gdb/gdbarch.sh | 2 -- gdb/gdbtypes.c | 6 ------ gdb/gdbtypes.h | 4 ---- 6 files changed, 10 insertions(+), 41 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0c44c6008cd..ad3c71c4986 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2007-06-16 Ulrich Weigand + + * gdbarch.sh (bfd_vma): Remove. + * gdbarch.c, gdbarch.h: Regenerate. + + * gdbtypes.h (builtin_bfd_vma_type): Remove. + * gdbtypes.h (builtin_bfd_vma_type): Remove. + (build_gdbtypes): Do not initialize it. + (_initialize_gdbtypes): Do not swap it. + 2007-06-16 Ulrich Weigand * gdbtypes.c (builtin_type_v2_double, builtin_type_v4_float, diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index d63afe5eff2..68089df2458 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -144,7 +144,6 @@ struct gdbarch const struct floatformat ** long_double_format; int ptr_bit; int addr_bit; - int bfd_vma_bit; int char_signed; gdbarch_read_pc_ftype *read_pc; gdbarch_write_pc_ftype *write_pc; @@ -268,7 +267,6 @@ struct gdbarch startup_gdbarch = 0, /* long_double_format */ 8 * sizeof (void*), /* ptr_bit */ 8 * sizeof (void*), /* addr_bit */ - 8 * sizeof (void*), /* bfd_vma_bit */ 1, /* char_signed */ 0, /* read_pc */ 0, /* write_pc */ @@ -404,7 +402,6 @@ gdbarch_alloc (const struct gdbarch_info *info, 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->bfd_vma_bit = gdbarch_bfd_arch_info (current_gdbarch)->bits_per_address; current_gdbarch->char_signed = -1; current_gdbarch->virtual_frame_pointer = legacy_virtual_frame_pointer; current_gdbarch->num_regs = -1; @@ -519,7 +516,6 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of ptr_bit, invalid_p == 0 */ if (current_gdbarch->addr_bit == 0) current_gdbarch->addr_bit = gdbarch_ptr_bit (current_gdbarch); - /* Skip verify of bfd_vma_bit, invalid_p == 0 */ if (current_gdbarch->char_signed == -1) current_gdbarch->char_signed = 1; /* Skip verify of read_pc, has predicate */ @@ -693,9 +689,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: bfd_arch_info = %s\n", gdbarch_bfd_arch_info (current_gdbarch)->printable_name); - fprintf_unfiltered (file, - "gdbarch_dump: bfd_vma_bit = %s\n", - paddr_d (current_gdbarch->bfd_vma_bit)); fprintf_unfiltered (file, "gdbarch_dump: breakpoint_from_pc = <0x%lx>\n", (long) current_gdbarch->breakpoint_from_pc); @@ -1408,23 +1401,6 @@ set_gdbarch_addr_bit (struct gdbarch *gdbarch, gdbarch->addr_bit = addr_bit; } -int -gdbarch_bfd_vma_bit (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - /* Skip verify of bfd_vma_bit, invalid_p == 0 */ - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_bfd_vma_bit called\n"); - return gdbarch->bfd_vma_bit; -} - -void -set_gdbarch_bfd_vma_bit (struct gdbarch *gdbarch, - int bfd_vma_bit) -{ - gdbarch->bfd_vma_bit = bfd_vma_bit; -} - int gdbarch_char_signed (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index f0ed1ad1572..e167250707c 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -141,11 +141,6 @@ extern void set_gdbarch_ptr_bit (struct gdbarch *gdbarch, int ptr_bit); extern int gdbarch_addr_bit (struct gdbarch *gdbarch); extern void set_gdbarch_addr_bit (struct gdbarch *gdbarch, int addr_bit); -/* Number of bits in a BFD_VMA for the target object file format. */ - -extern int gdbarch_bfd_vma_bit (struct gdbarch *gdbarch); -extern void set_gdbarch_bfd_vma_bit (struct gdbarch *gdbarch, int bfd_vma_bit); - /* One if `char' acts like `signed char', zero if `unsigned char'. */ extern int gdbarch_char_signed (struct gdbarch *gdbarch); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 76c87b323ae..ca6d0804b0e 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -414,8 +414,6 @@ v::const struct floatformat **:long_double_format:::::floatformats_ieee_double:: v::int:ptr_bit:::8 * sizeof (void*):current_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): -# Number of bits in a BFD_VMA for the target object file format. -v::int:bfd_vma_bit:::8 * sizeof (void*):gdbarch_bfd_arch_info (current_gdbarch)->bits_per_address::0 # # One if \`char' acts like \`signed char', zero if \`unsigned char'. v::int:char_signed:::1:-1:1 diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 8551c06086d..c2f580b45bb 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -129,7 +129,6 @@ struct type *builtin_type_ia64_quad; struct type *builtin_type_void_data_ptr; struct type *builtin_type_void_func_ptr; struct type *builtin_type_CORE_ADDR; -struct type *builtin_type_bfd_vma; int opaque_type_resolution = 1; static void @@ -3435,10 +3434,6 @@ Show resolution of opaque struct/class/union types (if set before loading symbol init_type (TYPE_CODE_INT, gdbarch_addr_bit (current_gdbarch) / 8, TYPE_FLAG_UNSIGNED, "__CORE_ADDR", (struct objfile *) NULL); - builtin_type_bfd_vma = - init_type (TYPE_CODE_INT, gdbarch_addr_bit (current_gdbarch) / 8, - TYPE_FLAG_UNSIGNED, - "__bfd_vma", (struct objfile *) NULL); } static struct gdbarch_data *gdbtypes_data; @@ -3678,7 +3673,6 @@ _initialize_gdbtypes (void) 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 diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 3ce5ed698a0..36bf2d69a0e 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -1069,10 +1069,6 @@ extern struct type *builtin_type_void_func_ptr; /* The target CPU's address type. This is the ISA address size. */ extern struct type *builtin_type_CORE_ADDR; -/* The symbol table address type. Some object file formats have a 32 - bit address type even though the TARGET has a 64 bit pointer type - (cf MIPS). */ -extern struct type *builtin_type_bfd_vma; /* Explicit sizes - see C9X for naming scheme. The "int0" is for when an architecture needs to describe a register that has -- 2.30.2