From mboxrd@z Thu Jan 1 00:00:00 1970 From: Elena Zannoni To: Alexandre Oliva Cc: Elena Zannoni , gdb-patches@sources.redhat.com Subject: Re: GDB CVS won't build on OSF4.0's cc Date: Mon, 11 Jun 2001 06:34:00 -0000 Message-id: <15140.51449.939073.693253@kwikemart.cygnus.com> References: <15134.37007.772051.431723@kwikemart.cygnus.com> X-SW-Source: 2001-06/msg00209.html Alexandre Oliva writes: > On Jun 6, 2001, Elena Zannoni wrote: > > > Alex, no. Sorry, but we are trying to get rid of PTR in the > > gdb sources [as Kevin pointed out in another message]. > > Sorry. > > > Could you 'revert' these changes by changing the definitions to > > use void * and deleting the prototypes when they are not needed (everyone > > of these can go, except for free_elfinfo, I think). > > Fixed as follows. Not tested on all relevant architectures. I'd do > that after next Monday's GCC snapshot, since I've been building GDB > along with GDB lately. Ok to install? Yes, but with the memset calls changes, i.e. remove the casts. Elena > > Index: gdb/ChangeLog > from Alexandre Oliva > > * coffread.c: Remove redundant static declarations. Replace > occurrences of `PTR' with `void *'. > * elfread.c, mdebugread.c, minsyms.c, mipsread.c: Likewise. > > Index: gdb/coffread.c > =================================================================== > RCS file: /cvs/src/src/gdb/coffread.c,v > retrieving revision 1.18 > diff -u -p -r1.18 coffread.c > --- gdb/coffread.c 2001/05/29 10:45:10 1.18 > +++ gdb/coffread.c 2001/06/09 23:02:27 > @@ -192,8 +192,6 @@ static struct symbol *process_coff_symbo > > static void patch_opaque_types (struct symtab *); > > -static void patch_type (struct type *, struct type *); > - > static void enter_linenos (long, int, int, struct objfile *); > > static void free_linetab (void); > @@ -216,32 +214,6 @@ static void read_one_sym (struct coff_sy > struct internal_syment *, union internal_auxent *); > > static void coff_symtab_read (long, unsigned int, struct objfile *); > - > -static void find_linenos (bfd *, sec_ptr, PTR); > - > -static void coff_symfile_init (struct objfile *); > - > -static void coff_new_init (struct objfile *); > - > -static void coff_symfile_read (struct objfile *, int); > - > -static void coff_symfile_finish (struct objfile *); > - > -static void record_minimal_symbol (char *, CORE_ADDR, > - enum minimal_symbol_type, > - struct objfile *); > - > -static void coff_end_symtab (struct objfile *); > - > -static void complete_symtab (char *, CORE_ADDR, unsigned int); > - > -static void coff_start_symtab (char *); > - > -static struct type *coff_alloc_type (int); > - > -static struct type **coff_lookup_type (int); > - > -static void coff_locate_sections (bfd *, asection *, PTR); > > /* We are called once per section from coff_symfile_read. We > need to examine each section we are passed, check to see > @@ -254,7 +226,7 @@ static void coff_locate_sections (bfd *, > -kingdon). */ > > static void > -coff_locate_sections (bfd *abfd, asection *sectp, PTR csip) > +coff_locate_sections (bfd *abfd, asection *sectp, void *csip) > { > register struct coff_symfile_info *csi; > const char *name; > @@ -312,10 +284,8 @@ struct find_targ_sec_arg > asection **resultp; > }; > > -static void find_targ_sec (bfd *, asection *, PTR); > - > static void > -find_targ_sec (bfd *abfd, asection *sect, PTR obj) > +find_targ_sec (bfd *abfd, asection *sect, void *obj) > { > struct find_targ_sec_arg *args = (struct find_targ_sec_arg *) obj; > if (sect->target_index == args->targ_index) > @@ -509,7 +479,8 @@ coff_symfile_init (struct objfile *objfi > objfile->sym_stab_info = (struct dbx_symfile_info *) > xmmalloc (objfile->md, sizeof (struct dbx_symfile_info)); > > - memset ((PTR) objfile->sym_stab_info, 0, sizeof (struct dbx_symfile_info)); > + memset ((void *) objfile->sym_stab_info, 0, > + sizeof (struct dbx_symfile_info)); > > /* Allocate struct to keep track of the symfile */ > objfile->sym_private = xmmalloc (objfile->md, > @@ -531,7 +502,7 @@ coff_symfile_init (struct objfile *objfi > > /* ARGSUSED */ > static void > -find_linenos (bfd *abfd, sec_ptr asect, PTR vpinfo) > +find_linenos (bfd *abfd, sec_ptr asect, void *vpinfo) > { > struct coff_symfile_info *info; > int size, count; > @@ -625,7 +596,7 @@ coff_symfile_read (struct objfile *objfi > /* Read the line number table, all at once. */ > info->min_lineno_offset = 0; > info->max_lineno_offset = 0; > - bfd_map_over_sections (abfd, find_linenos, (PTR) info); > + bfd_map_over_sections (abfd, find_linenos, (void *) info); > > make_cleanup (free_linetab_cleanup, 0 /*ignore*/); > val = init_lineno (abfd, info->min_lineno_offset, > @@ -662,7 +633,7 @@ coff_symfile_read (struct objfile *objfi > > install_minimal_symbols (objfile); > > - bfd_map_over_sections (abfd, coff_locate_sections, (PTR) info); > + bfd_map_over_sections (abfd, coff_locate_sections, (void *) info); > > if (info->stabsects) > { > Index: gdb/elfread.c > =================================================================== > RCS file: /cvs/src/src/gdb/elfread.c,v > retrieving revision 1.16 > diff -u -p -r1.16 elfread.c > --- gdb/elfread.c 2001/05/29 10:45:10 1.16 > +++ gdb/elfread.c 2001/06/09 23:02:27 > @@ -66,30 +66,8 @@ struct complaint stab_info_mismatch_comp > struct complaint stab_info_questionable_complaint = > {"elf/stab section information questionable for %s", 0, 0}; > > -static void elf_symfile_init (struct objfile *); > +static void free_elfinfo (void *); > > -static void elf_new_init (struct objfile *); > - > -static void elf_symfile_read (struct objfile *, int); > - > -static void elf_symfile_finish (struct objfile *); > - > -static void elf_symtab_read (struct objfile *, int); > - > -static void free_elfinfo (PTR); > - > -static struct minimal_symbol *record_minimal_symbol_and_info (char *, > - CORE_ADDR, > - enum > - minimal_symbol_type, > - char *, > - asection * > - bfd_section, > - struct objfile > - *); > - > -static void elf_locate_sections (bfd *, asection *, PTR); > - > /* We are called once per section from elf_symfile_read. We > need to examine each section we are passed, check to see > if it is something we are interested in processing, and > @@ -110,7 +88,7 @@ static void elf_locate_sections (bfd *, > -kingdon). */ > > static void > -elf_locate_sections (bfd *ignore_abfd, asection *sectp, PTR eip) > +elf_locate_sections (bfd *ignore_abfd, asection *sectp, void *eip) > { > register struct elfinfo *ei; > > @@ -445,7 +423,8 @@ elf_symtab_read (struct objfile *objfile > { > sectinfo = (struct stab_section_info *) > xmmalloc (objfile->md, sizeof (*sectinfo)); > - memset ((PTR) sectinfo, 0, sizeof (*sectinfo)); > + memset ((void *) sectinfo, 0, > + sizeof (*sectinfo)); > if (filesym == NULL) > { > complain (§ion_info_complaint, > @@ -513,7 +492,7 @@ elf_symtab_read (struct objfile *objfile > size = ((elf_symbol_type *) sym)->internal_elf_sym.st_size; > msym = record_minimal_symbol_and_info > ((char *) sym->name, symaddr, > - ms_type, (PTR) size, sym->section, objfile); > + ms_type, (void *) size, sym->section, objfile); > #ifdef SOFUN_ADDRESS_MAYBE_MISSING > if (msym != NULL) > msym->filename = filesymname; > @@ -576,7 +555,7 @@ elf_symfile_read (struct objfile *objfil > objfile->sym_stab_info = (struct dbx_symfile_info *) > xmmalloc (objfile->md, sizeof (struct dbx_symfile_info)); > memset ((char *) objfile->sym_stab_info, 0, sizeof (struct dbx_symfile_info)); > - make_cleanup (free_elfinfo, (PTR) objfile); > + make_cleanup (free_elfinfo, (void *) objfile); > > /* Process the normal ELF symbol table first. This may write some > chain of info into the dbx_symfile_info in objfile->sym_stab_info, > @@ -601,7 +580,7 @@ elf_symfile_read (struct objfile *objfil > } > > /* We first have to find them... */ > - bfd_map_over_sections (abfd, elf_locate_sections, (PTR) & ei); > + bfd_map_over_sections (abfd, elf_locate_sections, (void *) & ei); > > /* ELF debugging information is inserted into the psymtab in the > order of least informative first - most informative last. Since > @@ -668,7 +647,7 @@ elf_symfile_read (struct objfile *objfil > stab_section_info's, that might be dangling from it. */ > > static void > -free_elfinfo (PTR objp) > +free_elfinfo (void *objp) > { > struct objfile *objfile = (struct objfile *) objp; > struct dbx_symfile_info *dbxinfo = objfile->sym_stab_info; > Index: gdb/mdebugread.c > =================================================================== > RCS file: /cvs/src/src/gdb/mdebugread.c,v > retrieving revision 1.13 > diff -u -p -r1.13 mdebugread.c > --- gdb/mdebugread.c 2001/05/29 10:45:10 1.13 > +++ gdb/mdebugread.c 2001/06/09 23:02:27 > @@ -325,30 +325,15 @@ static int found_ecoff_debugging_info; > > /* Forward declarations */ > > -static void add_pending (FDR *, char *, struct type *); > +static int upgrade_type (int, struct type **, int, union aux_ext *, > + int, char *); > > -static struct mdebug_pending *is_pending_symbol (FDR *, char *); > - > -static void pop_parse_stack (void); > - > -static void push_parse_stack (void); > - > -static char *fdr_name (FDR *); > - > -static void mdebug_psymtab_to_symtab (struct partial_symtab *); > - > -static int > -upgrade_type (int, struct type **, int, union aux_ext *, int, char *); > - > static void parse_partial_symbols (struct objfile *); > > -static FDR * get_rfd (int, int); > - > static int has_opaque_xref (FDR *, SYMR *); > > -static int > -cross_ref (int, union aux_ext *, struct type **, enum type_code, > - char **, int, char *); > +static int cross_ref (int, union aux_ext *, struct type **, enum type_code, > + char **, int, char *); > > static struct symbol *new_symbol (char *); > > @@ -362,10 +347,6 @@ static struct linetable *new_linetable ( > > static struct blockvector *new_bvect (int); > > -static int > -parse_symbol (SYMR *, union aux_ext *, char *, int, struct section_offsets *, > - struct objfile *); > - > static struct type *parse_type (int, union aux_ext *, unsigned int, int *, > int, char *); > > @@ -374,12 +355,8 @@ static struct symbol *mylookup_symbol (c > > static struct block *shrink_block (struct block *, struct symtab *); > > -static PTR xzalloc (unsigned int); > - > static void sort_blocks (struct symtab *); > > -static int compare_blocks (const PTR, const PTR); > - > static struct partial_symtab *new_psymtab (char *, struct objfile *); > > static void psymtab_to_symtab_1 (struct partial_symtab *, char *); > @@ -392,8 +369,8 @@ static int add_line (struct linetable *, > > static struct linetable *shrink_linetable (struct linetable *); > > -static void > -handle_psymbol_enumerators (struct objfile *, FDR *, int, CORE_ADDR); > +static void handle_psymbol_enumerators (struct objfile *, FDR *, int, > + CORE_ADDR); > > static char *mdebug_next_symbol_text (struct objfile *); > > @@ -403,10 +380,10 @@ CORE_ADDR sigtramp_address, sigtramp_end > > /* Allocate zeroed memory */ > > -static PTR > +static void * > xzalloc (unsigned int size) > { > - PTR p = xmalloc (size); > + void *p = xmalloc (size); > > memset (p, 0, size); > return p; > @@ -678,7 +655,7 @@ parse_symbol (SYMR *sh, union aux_ext *a > struct section_offsets *section_offsets, struct objfile *objfile) > { > const bfd_size_type external_sym_size = debug_swap->external_sym_size; > - void (*const swap_sym_in) (bfd *, PTR, SYMR *) = debug_swap->swap_sym_in; > + void (*const swap_sym_in) (bfd *, void *, SYMR *) = debug_swap->swap_sym_in; > char *name; > struct symbol *s; > struct block *b; > @@ -1117,7 +1094,7 @@ parse_symbol (SYMR *sh, union aux_ext *a > enum_sym = ((struct symbol *) > obstack_alloc (¤t_objfile->symbol_obstack, > sizeof (struct symbol))); > - memset ((PTR) enum_sym, 0, sizeof (struct symbol)); > + memset ((void *) enum_sym, 0, sizeof (struct symbol)); > SYMBOL_NAME (enum_sym) = > obsavestring (f->name, strlen (f->name), > ¤t_objfile->symbol_obstack); > @@ -1215,7 +1192,7 @@ parse_symbol (SYMR *sh, union aux_ext *a > e = ((struct mips_extra_func_info *) > obstack_alloc (¤t_objfile->symbol_obstack, > sizeof (struct mips_extra_func_info))); > - memset ((PTR) e, 0, sizeof (struct mips_extra_func_info)); > + memset ((void *) e, 0, sizeof (struct mips_extra_func_info)); > SYMBOL_VALUE (s) = (long) e; > e->numargs = top_stack->numargs; > e->pdr.framereg = -1; > @@ -2209,9 +2186,9 @@ parse_partial_symbols (struct objfile *o > const bfd_size_type external_sym_size = debug_swap->external_sym_size; > const bfd_size_type external_rfd_size = debug_swap->external_rfd_size; > const bfd_size_type external_ext_size = debug_swap->external_ext_size; > - void (*const swap_ext_in) (bfd *, PTR, EXTR *) = debug_swap->swap_ext_in; > - void (*const swap_sym_in) (bfd *, PTR, SYMR *) = debug_swap->swap_sym_in; > - void (*const swap_rfd_in) (bfd *, PTR, RFDT *) = debug_swap->swap_rfd_in; > + void (*const swap_ext_in) (bfd *, void *, EXTR *) = debug_swap->swap_ext_in; > + void (*const swap_sym_in) (bfd *, void *, SYMR *) = debug_swap->swap_sym_in; > + void (*const swap_rfd_in) (bfd *, void *, RFDT *) = debug_swap->swap_rfd_in; > int f_idx, s_idx; > HDRR *hdr = &debug_info->symbolic_header; > /* Running pointers */ > @@ -2298,7 +2275,7 @@ parse_partial_symbols (struct objfile *o > ((struct mdebug_pending **) > obstack_alloc (&objfile->psymbol_obstack, > hdr->ifdMax * sizeof (struct mdebug_pending *))); > - memset ((PTR) pending_list, 0, > + memset ((void *) pending_list, 0, > hdr->ifdMax * sizeof (struct mdebug_pending *)); > > /* Pass 0 over external syms: swap them in. */ > @@ -2501,7 +2478,7 @@ parse_partial_symbols (struct objfile *o > pst->read_symtab_private = ((char *) > obstack_alloc (&objfile->psymbol_obstack, > sizeof (struct symloc))); > - memset ((PTR) pst->read_symtab_private, 0, sizeof (struct symloc)); > + memset ((void *) pst->read_symtab_private, 0, sizeof (struct symloc)); > > save_pst = pst; > FDR_IDX (pst) = f_idx; > @@ -3116,7 +3093,7 @@ handle_psymbol_enumerators (struct objfi > CORE_ADDR svalue) > { > const bfd_size_type external_sym_size = debug_swap->external_sym_size; > - void (*const swap_sym_in) (bfd *, PTR, SYMR *) = debug_swap->swap_sym_in; > + void (*const swap_sym_in) (bfd *, void *, SYMR *) = debug_swap->swap_sym_in; > char *ext_sym = ((char *) debug_info->external_sym > + ((fh->isymBase + cur_sdx + 1) * external_sym_size)); > SYMR sh; > @@ -3207,8 +3184,8 @@ psymtab_to_symtab_1 (struct partial_symt > { > bfd_size_type external_sym_size; > bfd_size_type external_pdr_size; > - void (*swap_sym_in) (bfd *, PTR, SYMR *); > - void (*swap_pdr_in) (bfd *, PTR, PDR *); > + void (*swap_sym_in) (bfd *, void *, SYMR *); > + void (*swap_pdr_in) (bfd *, void *, PDR *); > int i; > struct symtab *st; > FDR *fh; > @@ -3338,7 +3315,7 @@ psymtab_to_symtab_1 (struct partial_symt > sizeof (struct mips_extra_func_info))); > struct symbol *s = new_symbol (MIPS_EFI_SYMBOL_NAME); > > - memset ((PTR) e, 0, sizeof (struct mips_extra_func_info)); > + memset ((void *) e, 0, sizeof (struct mips_extra_func_info)); > SYMBOL_NAMESPACE (s) = LABEL_NAMESPACE; > SYMBOL_CLASS (s) = LOC_CONST; > SYMBOL_TYPE (s) = mdebug_type_void; > @@ -3887,7 +3864,7 @@ add_block (struct block *b, struct symta > { > struct blockvector *bv = BLOCKVECTOR (s); > > - bv = (struct blockvector *) xrealloc ((PTR) bv, > + bv = (struct blockvector *) xrealloc ((void *) bv, > (sizeof (struct blockvector) > + BLOCKVECTOR_NBLOCKS (bv) > * sizeof (bv->block))); > @@ -3935,7 +3912,7 @@ add_line (struct linetable *lt, int line > /* Blocks with a smaller low bound should come first */ > > static int > -compare_blocks (const PTR arg1, const PTR arg2) > +compare_blocks (const void *arg1, const void *arg2) > { > register int addr_diff; > struct block **b1 = (struct block **) arg1; > @@ -4037,7 +4014,7 @@ new_psymtab (char *name, struct objfile > psymtab->read_symtab_private = ((char *) > obstack_alloc (&objfile->psymbol_obstack, > sizeof (struct symloc))); > - memset ((PTR) psymtab->read_symtab_private, 0, sizeof (struct symloc)); > + memset ((void *) psymtab->read_symtab_private, 0, sizeof (struct symloc)); > CUR_BFD (psymtab) = cur_bfd; > DEBUG_SWAP (psymtab) = debug_swap; > DEBUG_INFO (psymtab) = debug_info; > @@ -4074,7 +4051,7 @@ static struct linetable * > shrink_linetable (struct linetable *lt) > { > > - return (struct linetable *) xrealloc ((PTR) lt, > + return (struct linetable *) xrealloc ((void *) lt, > (sizeof (struct linetable) > + ((lt->nitems - 1) > * sizeof (lt->item)))); > @@ -4118,7 +4095,7 @@ shrink_block (struct block *b, struct sy > > /* Just reallocate it and fix references to the old one */ > > - new = (struct block *) xrealloc ((PTR) b, > + new = (struct block *) xrealloc ((void *) b, > (sizeof (struct block) > + ((BLOCK_NSYMS (b) - 1) > * sizeof (struct symbol *)))); > @@ -4144,7 +4121,7 @@ new_symbol (char *name) > obstack_alloc (¤t_objfile->symbol_obstack, > sizeof (struct symbol))); > > - memset ((PTR) s, 0, sizeof (*s)); > + memset ((void *) s, 0, sizeof (*s)); > SYMBOL_NAME (s) = obsavestring (name, strlen (name), > ¤t_objfile->symbol_obstack); > SYMBOL_LANGUAGE (s) = psymtab_language; > Index: gdb/minsyms.c > =================================================================== > RCS file: /cvs/src/src/gdb/minsyms.c,v > retrieving revision 1.17 > diff -u -p -r1.17 minsyms.c > --- gdb/minsyms.c 2001/05/29 10:45:10 1.17 > +++ gdb/minsyms.c 2001/06/09 23:02:27 > @@ -75,16 +75,6 @@ static int msym_bunch_index; > > static int msym_count; > > -/* Prototypes for local functions. */ > - > -static int compare_minimal_symbols (const PTR, const PTR); > - > -static int > -compact_minimal_symbols (struct minimal_symbol *, int, struct objfile *); > - > -static void add_minsym_to_demangled_hash_table (struct minimal_symbol *sym, > - struct minimal_symbol **table); > - > /* Compute a hash code based using the same criteria as `strcmp_iw'. */ > > unsigned int > @@ -686,7 +676,7 @@ prim_record_minimal_symbol_and_info (con > Within groups with the same address, sort by name. */ > > static int > -compare_minimal_symbols (const PTR fn1p, const PTR fn2p) > +compare_minimal_symbols (const void *fn1p, const void *fn2p) > { > register const struct minimal_symbol *fn1; > register const struct minimal_symbol *fn2; > Index: gdb/mipsread.c > =================================================================== > RCS file: /cvs/src/src/gdb/mipsread.c,v > retrieving revision 1.9 > diff -u -p -r1.9 mipsread.c > --- gdb/mipsread.c 2001/05/29 10:45:10 1.9 > +++ gdb/mipsread.c 2001/06/09 23:02:27 > @@ -185,15 +185,13 @@ struct alphacoff_dynsecinfo > asection *got_sect; /* Section pointer for .got section */ > }; > > -static void alphacoff_locate_sections (bfd *, asection *, PTR); > - > /* We are called once per section from read_alphacoff_dynamic_symtab. > We need to examine each section we are passed, check to see > if it is something we are interested in processing, and > if so, stash away some access information for the section. */ > > static void > -alphacoff_locate_sections (bfd *ignore_abfd, asection *sectp, PTR sip) > +alphacoff_locate_sections (bfd *ignore_abfd, asection *sectp, void *sip) > { > register struct alphacoff_dynsecinfo *si; > > @@ -252,7 +250,7 @@ read_alphacoff_dynamic_symtab (struct se > > /* Locate the dynamic symbols sections and read them in. */ > memset ((char *) &si, 0, sizeof (si)); > - bfd_map_over_sections (abfd, alphacoff_locate_sections, (PTR) & si); > + bfd_map_over_sections (abfd, alphacoff_locate_sections, (void *) & si); > if (si.sym_sect == NULL > || si.str_sect == NULL > || si.dyninfo_sect == NULL > > -- > Alexandre Oliva Enjoy Guarana', see http://www.ic.unicamp.br/~oliva/ > Red Hat GCC Developer aoliva@{cygnus.com, redhat.com} > CS PhD student at IC-Unicamp oliva@{lsd.ic.unicamp.br, gnu.org} > Free Software Evangelist *Please* write to mailing lists, not to me