From 7be0c536371055e9b15403d88f6149bbd656df37 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Thu, 6 Nov 2003 02:52:28 +0000 Subject: [PATCH] 2003-11-05 Andrew Cagney * xcoffread.c (find_linenos): Replace "sec_ptr" and "bfd" with "struct bfd_section" and "struct bfd". * target.h (struct section_table): Ditto. * rs6000-nat.c (xcoff_relocate_core): Ditto. * solib-svr4.c (elf_locate_base): Ditto. * pa64solib.c (dld_cache_t): Ditto. * objfiles.h (struct obj_section): Ditto. * objfiles.c (add_to_objfile_sections): Ditto. * exec.c (bfdsec_to_vmap): Ditto. (add_to_section_table): Ditto. (build_section_table): Ditto. * corelow.c (get_core_register_section): Ditto. * coffread.c (find_linenos): Ditto. * elfread.c (elf_interpreter): Delete #if0'd function. * mips-tdep.c (mips_dump_tdep): Delete code prinint VX_NUM_REGS. * config/sparc/tm-vxsparc.h (VX_NUM_REGS): Delete macro. * config/mips/tm-vxmips.h (VX_NUM_REGS): Delete macro. * config/m68k/tm-vx68.h (VX_NUM_REGS): Delete macro. * arch-utils.h (generic_cannot_extract_struct_value_address): Delete declaration. * wince.c (_initialize_wince): Fix multi-line string. * ia64-tdep.c (floatformat_valid): Convert to ISO C. --- gdb/ChangeLog | 27 +++++++++++++++++++++++++++ gdb/coffread.c | 2 +- gdb/config/m68k/tm-vx68.h | 4 ---- gdb/config/mips/tm-vxmips.h | 6 ------ gdb/config/sparc/tm-vxsparc.h | 6 ------ gdb/corelow.c | 2 +- gdb/elfread.c | 29 ----------------------------- gdb/exec.c | 11 ++++------- gdb/ia64-tdep.c | 4 +--- gdb/mips-tdep.c | 5 ----- gdb/objfiles.c | 5 ++--- gdb/objfiles.h | 2 +- gdb/pa64solib.c | 2 +- gdb/rs6000-nat.c | 2 +- gdb/solib-svr4.c | 2 +- gdb/target.h | 2 +- gdb/wince.c | 3 ++- gdb/xcoffread.c | 6 ++---- 18 files changed, 45 insertions(+), 75 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e2b2befeaa..43ac45455b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,30 @@ +2003-11-05 Andrew Cagney + + * xcoffread.c (find_linenos): Replace "sec_ptr" and "bfd" with + "struct bfd_section" and "struct bfd". + * target.h (struct section_table): Ditto. + * rs6000-nat.c (xcoff_relocate_core): Ditto. + * solib-svr4.c (elf_locate_base): Ditto. + * pa64solib.c (dld_cache_t): Ditto. + * objfiles.h (struct obj_section): Ditto. + * objfiles.c (add_to_objfile_sections): Ditto. + * exec.c (bfdsec_to_vmap): Ditto. + (add_to_section_table): Ditto. + (build_section_table): Ditto. + * corelow.c (get_core_register_section): Ditto. + * coffread.c (find_linenos): Ditto. + * elfread.c (elf_interpreter): Delete #if0'd function. + + * mips-tdep.c (mips_dump_tdep): Delete code prinint VX_NUM_REGS. + * config/sparc/tm-vxsparc.h (VX_NUM_REGS): Delete macro. + * config/mips/tm-vxmips.h (VX_NUM_REGS): Delete macro. + * config/m68k/tm-vx68.h (VX_NUM_REGS): Delete macro. + + * arch-utils.h (generic_cannot_extract_struct_value_address): + Delete declaration. + * wince.c (_initialize_wince): Fix multi-line string. + * ia64-tdep.c (floatformat_valid): Convert to ISO C. + 2003-11-05 Elena Zannoni * top.c (execute_command): Fix broken logic for command execution diff --git a/gdb/coffread.c b/gdb/coffread.c index 0b83229989..c2d6148020 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -470,7 +470,7 @@ coff_symfile_init (struct objfile *objfile) mainline code can read the whole thing for efficiency. */ static void -find_linenos (bfd *abfd, sec_ptr asect, void *vpinfo) +find_linenos (bfd *abfd, struct bfd_section *asect, void *vpinfo) { struct coff_symfile_info *info; int size, count; diff --git a/gdb/config/m68k/tm-vx68.h b/gdb/config/m68k/tm-vx68.h index ce1a8590e5..6eaf418943 100644 --- a/gdb/config/m68k/tm-vx68.h +++ b/gdb/config/m68k/tm-vx68.h @@ -72,10 +72,6 @@ #define GET_LONGJMP_TARGET(ADDR) m68k_get_longjmp_target(ADDR) -/* Number of registers in a ptrace_getregs call. */ - -#define VX_NUM_REGS (18) - /* Number of registers in a ptrace_getfpregs call. */ #define VX_SIZE_FPREGS (8 * DEPRECATED_REGISTER_RAW_SIZE (FP0_REGNUM) \ diff --git a/gdb/config/mips/tm-vxmips.h b/gdb/config/mips/tm-vxmips.h index 5475fb5725..5eb1043830 100644 --- a/gdb/config/mips/tm-vxmips.h +++ b/gdb/config/mips/tm-vxmips.h @@ -21,9 +21,3 @@ #include "mips/tm-mips.h" #include "config/tm-vxworks.h" - -/* FIXME: These are almost certainly wrong. */ - -/* Number of registers in a ptrace_getregs call. */ - -#define VX_NUM_REGS (NUM_REGS) diff --git a/gdb/config/sparc/tm-vxsparc.h b/gdb/config/sparc/tm-vxsparc.h index f32f70daf7..95861ecf9f 100644 --- a/gdb/config/sparc/tm-vxsparc.h +++ b/gdb/config/sparc/tm-vxsparc.h @@ -22,12 +22,6 @@ #include "sparc/tm-spc-em.h" #include "config/tm-vxworks.h" -/* FIXME: These are almost certainly wrong. */ - -/* Number of registers in a ptrace_getregs call. */ - -#define VX_NUM_REGS (NUM_REGS) - /* Number of registers in a ptrace_getfpregs call. */ /* #define VX_SIZE_FPREGS (don't know how many) */ diff --git a/gdb/corelow.c b/gdb/corelow.c index b933467579..8fc3e66984 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -432,7 +432,7 @@ get_core_register_section (char *name, int required) { char section_name[100]; - sec_ptr section; + struct bfd_section *section; bfd_size_type size; char *contents; diff --git a/gdb/elfread.c b/gdb/elfread.c index 9ac30aeeb9..75384a5020 100644 --- a/gdb/elfread.c +++ b/gdb/elfread.c @@ -104,35 +104,6 @@ elf_locate_sections (bfd *ignore_abfd, asection *sectp, void *eip) } } -#if 0 /* Currently unused */ - -char * -elf_interpreter (bfd *abfd) -{ - sec_ptr interp_sec; - unsigned size; - char *interp = NULL; - - interp_sec = bfd_get_section_by_name (abfd, ".interp"); - if (interp_sec) - { - size = bfd_section_size (abfd, interp_sec); - interp = alloca (size); - if (bfd_get_section_contents (abfd, interp_sec, interp, (file_ptr) 0, - size)) - { - interp = savestring (interp, size - 1); - } - else - { - interp = NULL; - } - } - return (interp); -} - -#endif - static struct minimal_symbol * record_minimal_symbol_and_info (char *name, CORE_ADDR address, enum minimal_symbol_type ms_type, char *info, /* FIXME, is this really char *? */ diff --git a/gdb/exec.c b/gdb/exec.c index a8ae0c03ac..1c51917a85 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -57,8 +57,6 @@ void (*file_changed_hook) (char *); /* Prototypes for local functions */ -static void add_to_section_table (bfd *, sec_ptr, void *); - static void exec_close (int); static void file_command (char *, int); @@ -67,8 +65,6 @@ static void set_section_command (char *, int); static void exec_files_info (struct target_ops *); -static void bfdsec_to_vmap (bfd *, sec_ptr, void *); - static int ignore (CORE_ADDR, char *); static void init_exec_ops (void); @@ -338,7 +334,8 @@ file_command (char *arg, int from_tty) we cast it back to its proper type. */ static void -add_to_section_table (bfd *abfd, sec_ptr asect, void *table_pp_char) +add_to_section_table (bfd *abfd, struct bfd_section *asect, + void *table_pp_char) { struct section_table **table_pp = (struct section_table **) table_pp_char; flagword aflag; @@ -359,7 +356,7 @@ add_to_section_table (bfd *abfd, sec_ptr asect, void *table_pp_char) Returns 0 if OK, 1 on error. */ int -build_section_table (bfd *some_bfd, struct section_table **start, +build_section_table (struct bfd *some_bfd, struct section_table **start, struct section_table **end) { unsigned count; @@ -377,7 +374,7 @@ build_section_table (bfd *some_bfd, struct section_table **start, } static void -bfdsec_to_vmap (bfd *abfd, sec_ptr sect, void *arg3) +bfdsec_to_vmap (struct bfd *abfd, struct bfd_section *sect, void *arg3) { struct vmap_and_bfd *vmap_bfd = (struct vmap_and_bfd *) arg3; struct vmap *vp; diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c index 7f1c39ee1b..4d0f8a8ec8 100644 --- a/gdb/ia64-tdep.c +++ b/gdb/ia64-tdep.c @@ -315,9 +315,7 @@ ia64_dwarf_reg_to_regnum (int reg) } static int -floatformat_valid (fmt, from) - const struct floatformat *fmt; - const char *from; +floatformat_valid (const struct floatformat *fmt, const char *from) { return 1; } diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 19fdc13412..c0d8b08127 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -6480,11 +6480,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "mips_dump_tdep: VM_MIN_ADDRESS = %ld\n", (long) VM_MIN_ADDRESS); -#ifdef VX_NUM_REGS - fprintf_unfiltered (file, - "mips_dump_tdep: VX_NUM_REGS = %d (used?)\n", - VX_NUM_REGS); -#endif fprintf_unfiltered (file, "mips_dump_tdep: ZERO_REGNUM = %d\n", ZERO_REGNUM); diff --git a/gdb/objfiles.c b/gdb/objfiles.c index 9a181f4f33..23c0927b31 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -60,8 +60,6 @@ static void *map_to_file (int); #endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */ -static void add_to_objfile_sections (bfd *, sec_ptr, void *); - static void objfile_alloc_data (struct objfile *objfile); static void objfile_free_data (struct objfile *objfile); @@ -89,7 +87,8 @@ int mapped_symbol_files; /* Try to use mapped symbol files */ the end of the table (objfile->sections_end). */ static void -add_to_objfile_sections (bfd *abfd, sec_ptr asect, void *objfile_p_char) +add_to_objfile_sections (struct bfd *abfd, struct bfd_section *asect, + void *objfile_p_char) { struct objfile *objfile = (struct objfile *) objfile_p_char; struct obj_section section; diff --git a/gdb/objfiles.h b/gdb/objfiles.h index 6887dcab65..ebc10b3682 100644 --- a/gdb/objfiles.h +++ b/gdb/objfiles.h @@ -178,7 +178,7 @@ struct obj_section addresses. */ CORE_ADDR offset; - sec_ptr the_bfd_section; /* BFD section pointer */ + struct bfd_section *the_bfd_section; /* BFD section pointer */ /* Objfile this section is part of. */ struct objfile *objfile; diff --git a/gdb/pa64solib.c b/gdb/pa64solib.c index 64f1ebbb1d..8a5cae188c 100644 --- a/gdb/pa64solib.c +++ b/gdb/pa64solib.c @@ -109,7 +109,7 @@ typedef struct { CORE_ADDR dld_flags_addr; LONGEST dld_flags; - sec_ptr dyninfo_sect; + struct bfd_section *dyninfo_sect; int have_read_dld_descriptor; int is_valid; CORE_ADDR load_map; diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c index e8bf4a0a41..6f96c176bf 100644 --- a/gdb/rs6000-nat.c +++ b/gdb/rs6000-nat.c @@ -1067,7 +1067,7 @@ xcoff_relocate_symtab (unsigned int pid) void xcoff_relocate_core (struct target_ops *target) { - sec_ptr ldinfo_sec; + struct bfd_section *ldinfo_sec; int offset = 0; LdInfo *ldi; struct vmap *vp; diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index ff35ba998f..a6eb39bb28 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -425,7 +425,7 @@ look_for_base (int fd, CORE_ADDR baseaddr) static CORE_ADDR elf_locate_base (void) { - sec_ptr dyninfo_sect; + struct bfd_section *dyninfo_sect; int dyninfo_sect_size; CORE_ADDR dyninfo_addr; char *buf; diff --git a/gdb/target.h b/gdb/target.h index de09208e06..4d10f02588 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1154,7 +1154,7 @@ struct section_table CORE_ADDR addr; /* Lowest address in section */ CORE_ADDR endaddr; /* 1+highest address in section */ - sec_ptr the_bfd_section; + struct bfd_section *the_bfd_section; bfd *bfd; /* BFD file pointer */ }; diff --git a/gdb/wince.c b/gdb/wince.c index 0e1746dc89..f15bbd4fa0 100644 --- a/gdb/wince.c +++ b/gdb/wince.c @@ -1997,7 +1997,8 @@ _initialize_wince (void) add_show_from_set (add_set_cmd ((char *) "remoteaddhost", class_support, var_boolean, (char *) &remote_add_host, - (char *) "Set whether to add this host to remote stub arguments for\n + (char *) "\ +Set whether to add this host to remote stub arguments for\n\ debugging over a network.", &setlist), &showlist); diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index 243dab81de..6183785db6 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -193,8 +193,6 @@ static void xcoff_symfile_finish (struct objfile *); static void xcoff_symfile_offsets (struct objfile *, struct section_addr_info *addrs); -static void find_linenos (bfd *, sec_ptr, void *); - static char *coff_getfilename (union internal_auxent *, struct objfile *); static void read_symbol (struct internal_syment *, int); @@ -1699,7 +1697,7 @@ gotit: * mainline code can read the whole thing for efficiency. */ static void -find_linenos (bfd *abfd, sec_ptr asect, void *vpinfo) +find_linenos (struct bfd *abfd, struct bfd_section *asect, void *vpinfo) { struct coff_symfile_info *info; int size, count; @@ -2881,7 +2879,7 @@ xcoff_initial_scan (struct objfile *objfile, int mainline) /* Read the .debug section, if present. */ { - sec_ptr secp; + struct bfd_section *secp; bfd_size_type length; char *debugsec = NULL; -- 2.34.1