diff options
Diffstat (limited to 'contrib/gdb/gdb/mdebugread.c')
| -rw-r--r-- | contrib/gdb/gdb/mdebugread.c | 2086 |
1 files changed, 1289 insertions, 797 deletions
diff --git a/contrib/gdb/gdb/mdebugread.c b/contrib/gdb/gdb/mdebugread.c index 1064490..c974c9e 100644 --- a/contrib/gdb/gdb/mdebugread.c +++ b/contrib/gdb/gdb/mdebugread.c @@ -1,25 +1,27 @@ /* Read a symbol table in ECOFF format (Third-Eye). - Copyright 1986, 87, 89, 90, 91, 92, 93, 94, 95, 96, 97, 1998 + Copyright 1986, 1987, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, + 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. Original version contributed by Alessandro Forin (af@cs.cmu.edu) at CMU. Major work by Per Bothner, John Gilmore and Ian Lance Taylor at Cygnus Support. -This file is part of GDB. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* This module provides the function mdebug_build_psymtabs. It reads ECOFF debugging information into partial symbol tables. The @@ -56,13 +58,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef MIPS_EFI_SYMBOL_NAME #define MIPS_EFI_SYMBOL_NAME "__GDB_EFI_INFO__" -extern void ecoff_relocate_efi PARAMS ((struct symbol *, CORE_ADDR)); +extern void ecoff_relocate_efi (struct symbol *, CORE_ADDR); #include "coff/sym.h" #include "coff/symconst.h" -typedef struct mips_extra_func_info { - long numargs; - PDR pdr; -} *mips_extra_func_info_t; +typedef struct mips_extra_func_info + { + long numargs; + PDR pdr; + } + *mips_extra_func_info_t; #ifndef RA_REGNUM #define RA_REGNUM 0 #endif @@ -75,8 +79,6 @@ typedef struct mips_extra_func_info { #include "gdb_stat.h" #include "gdb_string.h" -#include "gdb-stabs.h" - #include "bfd.h" #include "coff/ecoff.h" /* COFF-like aspects of ecoff files */ @@ -86,13 +88,9 @@ typedef struct mips_extra_func_info { #include "aout/stab_gnu.h" /* STABS information */ #include "expression.h" -#include "language.h" /* Needed inside partial-stab.h */ - +#include "language.h" /* For local_hex_string() */ -/* Provide a default mapping from a ecoff register number to a gdb REGNUM. */ -#ifndef ECOFF_REG_TO_REGNUM -#define ECOFF_REG_TO_REGNUM(num) (num) -#endif +extern void _initialize_mdebugread (void); /* Provide a way to test if we have both ECOFF and ELF symbol tables. We use this define in order to know whether we should override a @@ -100,28 +98,35 @@ typedef struct mips_extra_func_info { case the symbol's ELF section could not be represented in ECOFF. */ #define ECOFF_IN_ELF(bfd) (bfd_get_flavour (bfd) == bfd_target_elf_flavour \ && bfd_get_section_by_name (bfd, ".mdebug") != NULL) - + /* We put a pointer to this structure in the read_symtab_private field of the psymtab. */ struct symloc -{ - /* Index of the FDR that this psymtab represents. */ - int fdr_idx; - /* The BFD that the psymtab was created from. */ - bfd *cur_bfd; - const struct ecoff_debug_swap *debug_swap; - struct ecoff_debug_info *debug_info; - struct mdebug_pending **pending_list; - /* Pointer to external symbols for this file. */ - EXTR *extern_tab; - /* Size of extern_tab. */ - int extern_count; - enum language pst_language; -}; + { + /* Our running best guess as to the range of text addresses for + this psymtab. After we've read everything in, we use this to + build pst->text_addrs. */ + CORE_ADDR textlow, texthigh; + + /* Index of the FDR that this psymtab represents. */ + int fdr_idx; + /* The BFD that the psymtab was created from. */ + bfd *cur_bfd; + const struct ecoff_debug_swap *debug_swap; + struct ecoff_debug_info *debug_info; + struct mdebug_pending **pending_list; + /* Pointer to external symbols for this file. */ + EXTR *extern_tab; + /* Size of extern_tab. */ + int extern_count; + enum language pst_language; + }; #define PST_PRIVATE(p) ((struct symloc *)(p)->read_symtab_private) +#define TEXTLOW(p) (PST_PRIVATE(p)->textlow) +#define TEXTHIGH(p) (PST_PRIVATE(p)->texthigh) #define FDR_IDX(p) (PST_PRIVATE(p)->fdr_idx) #define CUR_BFD(p) (PST_PRIVATE(p)->cur_bfd) #define DEBUG_SWAP(p) (PST_PRIVATE(p)->debug_swap) @@ -138,14 +143,10 @@ struct symloc || (sc) == scPData \ || (sc) == scXData) #define SC_IS_COMMON(sc) ((sc) == scCommon || (sc) == scSCommon) -#define SC_IS_BSS(sc) ((sc) == scBss || (sc) == scSBss) +#define SC_IS_BSS(sc) ((sc) == scBss) +#define SC_IS_SBSS(sc) ((sc) == scSBss) #define SC_IS_UNDEF(sc) ((sc) == scUndefined || (sc) == scSUndefined) - -/* Things we import explicitly from other modules */ - -extern int info_verbose; - /* Various complaints about symbol reading that don't abort the process */ static struct complaint bad_file_number_complaint = @@ -327,104 +328,54 @@ static int found_ecoff_debugging_info; /* Forward declarations */ -static void -add_pending PARAMS ((FDR *, char *, struct type *)); +static int upgrade_type (int, struct type **, int, union aux_ext *, + int, char *); -static struct mdebug_pending * -is_pending_symbol PARAMS ((FDR *, char *)); +static void parse_partial_symbols (struct objfile *); -static void -pop_parse_stack PARAMS ((void)); +static int has_opaque_xref (FDR *, SYMR *); -static void -push_parse_stack PARAMS ((void)); +static int cross_ref (int, union aux_ext *, struct type **, enum type_code, + char **, int, char *); -static char * -fdr_name PARAMS ((FDR *)); +static struct symbol *new_symbol (char *); -static void -mdebug_psymtab_to_symtab PARAMS ((struct partial_symtab *)); +static struct type *new_type (char *); -static int -upgrade_type PARAMS ((int, struct type **, int, union aux_ext *, int, char *)); +static struct block *new_block (int); -static void -parse_partial_symbols PARAMS ((struct objfile *, - struct section_offsets *)); +static struct symtab *new_symtab (char *, int, int, struct objfile *); -static FDR -*get_rfd PARAMS ((int, int)); +static struct linetable *new_linetable (int); -static int -has_opaque_xref PARAMS ((FDR *, SYMR *)); +static struct blockvector *new_bvect (int); -static int -cross_ref PARAMS ((int, union aux_ext *, struct type **, enum type_code, - char **, int, char *)); +static struct type *parse_type (int, union aux_ext *, unsigned int, int *, + int, char *); -static struct symbol * -new_symbol PARAMS ((char *)); +static struct symbol *mylookup_symbol (char *, struct block *, namespace_enum, + enum address_class); -static struct type * -new_type PARAMS ((char *)); +static struct block *shrink_block (struct block *, struct symtab *); -static struct block * -new_block PARAMS ((int)); +static void sort_blocks (struct symtab *); -static struct symtab * -new_symtab PARAMS ((char *, int, int, struct objfile *)); +static struct partial_symtab *new_psymtab (char *, struct objfile *); -static struct linetable * -new_linetable PARAMS ((int)); +static void psymtab_to_symtab_1 (struct partial_symtab *, char *); -static struct blockvector * -new_bvect PARAMS ((int)); +static void add_block (struct block *, struct symtab *); -static int -parse_symbol PARAMS ((SYMR *, union aux_ext *, char *, int, struct section_offsets *)); - -static struct type * -parse_type PARAMS ((int, union aux_ext *, unsigned int, int *, int, char *)); - -static struct symbol * -mylookup_symbol PARAMS ((char *, struct block *, namespace_enum, - enum address_class)); - -static struct block * -shrink_block PARAMS ((struct block *, struct symtab *)); +static void add_symbol (struct symbol *, struct block *); -static PTR -xzalloc PARAMS ((unsigned int)); +static int add_line (struct linetable *, int, CORE_ADDR, int); -static void -sort_blocks PARAMS ((struct symtab *)); +static struct linetable *shrink_linetable (struct linetable *); -static int -compare_blocks PARAMS ((const void *, const void *)); - -static struct partial_symtab * -new_psymtab PARAMS ((char *, struct objfile *, struct section_offsets *)); - -static void -psymtab_to_symtab_1 PARAMS ((struct partial_symtab *, char *)); - -static void -add_block PARAMS ((struct block *, struct symtab *)); +static void handle_psymbol_enumerators (struct objfile *, FDR *, int, + CORE_ADDR); -static void -add_symbol PARAMS ((struct symbol *, struct block *)); - -static int -add_line PARAMS ((struct linetable *, int, CORE_ADDR, int)); - -static struct linetable * -shrink_linetable PARAMS ((struct linetable *)); - -static void -handle_psymbol_enumerators PARAMS ((struct objfile *, FDR *, int, CORE_ADDR)); - -static char * -mdebug_next_symbol_text PARAMS ((struct objfile *)); +static char *mdebug_next_symbol_text (struct objfile *); /* Address bounds for the signal trampoline in inferior, if any */ @@ -432,11 +383,10 @@ CORE_ADDR sigtramp_address, sigtramp_end; /* Allocate zeroed memory */ -static PTR -xzalloc (size) - unsigned int size; +static void * +xzalloc (unsigned int size) { - PTR p = xmalloc (size); + void *p = xmalloc (size); memset (p, 0, size); return p; @@ -448,8 +398,7 @@ xzalloc (size) and reorders the symtab list at the end */ static void -mdebug_psymtab_to_symtab (pst) - struct partial_symtab *pst; +mdebug_psymtab_to_symtab (struct partial_symtab *pst) { if (!pst) @@ -478,8 +427,7 @@ mdebug_psymtab_to_symtab (pst) /* Find a file descriptor given its index RF relative to a file CF */ static FDR * -get_rfd (cf, rf) - int cf, rf; +get_rfd (int cf, int rf) { FDR *fdrs; register FDR *f; @@ -491,18 +439,17 @@ get_rfd (cf, rf) if (f->rfdBase == 0) return fdrs + rf; (*debug_swap->swap_rfd_in) (cur_bfd, - ((char *) debug_info->external_rfd - + ((f->rfdBase + rf) - * debug_swap->external_rfd_size)), - &rfd); + ((char *) debug_info->external_rfd + + ((f->rfdBase + rf) + * debug_swap->external_rfd_size)), + &rfd); return fdrs + rfd; } /* Return a safer print NAME for a file descriptor */ static char * -fdr_name (f) - FDR *f; +fdr_name (FDR *f) { if (f->rss == -1) return "<stripped file>"; @@ -516,16 +463,19 @@ fdr_name (f) different sections are relocated via the SECTION_OFFSETS. */ void -mdebug_build_psymtabs (objfile, swap, info, section_offsets) - struct objfile *objfile; - const struct ecoff_debug_swap *swap; - struct ecoff_debug_info *info; - struct section_offsets *section_offsets; +mdebug_build_psymtabs (struct objfile *objfile, + const struct ecoff_debug_swap *swap, + struct ecoff_debug_info *info) { cur_bfd = objfile->obfd; debug_swap = swap; debug_info = info; + stabsread_new_init (); + buildsym_new_init (); + free_header_files (); + init_header_files (); + /* Make sure all the FDR information is swapped in. */ if (info->fdr == (FDR *) NULL) { @@ -544,7 +494,20 @@ mdebug_build_psymtabs (objfile, swap, info, section_offsets) (*swap->swap_fdr_in) (objfile->obfd, fdr_src, fdr_ptr); } - parse_partial_symbols (objfile, section_offsets); + parse_partial_symbols (objfile); + + /* Take the text ranges the partial symbol scanner computed for each + of the psymtabs and convert it into the canonical form for + psymtabs. */ + { + struct partial_symtab *p; + + ALL_OBJFILE_PSYMTABS (objfile, p) + { + p->textlow = TEXTLOW (p); + p->texthigh = TEXTHIGH (p); + } + } #if 0 /* Check to make sure file was compiled with -g. If not, warn the @@ -553,7 +516,7 @@ mdebug_build_psymtabs (objfile, swap, info, section_offsets) { if (max_gdbinfo == 0) printf_unfiltered ("\n%s not compiled with -g, debugging support is limited.\n", - objfile->name); + objfile->name); printf_unfiltered ("You should compile with -g2 or -g3 for best debugging support.\n"); gdb_flush (gdb_stdout); } @@ -578,25 +541,25 @@ struct pst_map after use. */ static struct parse_stack -{ - struct parse_stack *next, *prev; - struct symtab *cur_st; /* Current symtab. */ - struct block *cur_block; /* Block in it. */ - - /* What are we parsing. stFile, or stBlock are for files and - blocks. stProc or stStaticProc means we have seen the start of a - procedure, but not the start of the block within in. When we see - the start of that block, we change it to stNil, without pushing a - new block, i.e. stNil means both a procedure and a block. */ - - int blocktype; - - int maxsyms; /* Max symbols in this block. */ - struct type *cur_type; /* Type we parse fields for. */ - int cur_field; /* Field number in cur_type. */ - CORE_ADDR procadr; /* Start addres of this procedure */ - int numargs; /* Its argument count */ -} + { + struct parse_stack *next, *prev; + struct symtab *cur_st; /* Current symtab. */ + struct block *cur_block; /* Block in it. */ + + /* What are we parsing. stFile, or stBlock are for files and + blocks. stProc or stStaticProc means we have seen the start of a + procedure, but not the start of the block within in. When we see + the start of that block, we change it to stNil, without pushing a + new block, i.e. stNil means both a procedure and a block. */ + + int blocktype; + + int maxsyms; /* Max symbols in this block. */ + struct type *cur_type; /* Type we parse fields for. */ + int cur_field; /* Field number in cur_type. */ + CORE_ADDR procadr; /* Start addres of this procedure */ + int numargs; /* Its argument count */ + } *top_stack; /* Top stack ptr */ @@ -604,7 +567,7 @@ static struct parse_stack /* Enter a new lexical context */ static void -push_parse_stack () +push_parse_stack (void) { struct parse_stack *new; @@ -629,7 +592,7 @@ push_parse_stack () /* Exit a lexical context */ static void -pop_parse_stack () +pop_parse_stack (void) { if (!top_stack) return; @@ -663,9 +626,7 @@ static struct mdebug_pending **pending_list; /* Check whether we already saw symbol SH in file FH */ static struct mdebug_pending * -is_pending_symbol (fh, sh) - FDR *fh; - char *sh; +is_pending_symbol (FDR *fh, char *sh) { int f_idx = fh - debug_info->fdr; register struct mdebug_pending *p; @@ -680,10 +641,7 @@ is_pending_symbol (fh, sh) /* Add a new symbol SH of type T */ static void -add_pending (fh, sh, t) - FDR *fh; - char *sh; - struct type *t; +add_pending (FDR *fh, char *sh, struct type *t) { int f_idx = fh - debug_info->fdr; struct mdebug_pending *p = is_pending_symbol (fh, sh); @@ -714,16 +672,11 @@ add_pending (fh, sh, t) SYMR's handled (normally one). */ static int -parse_symbol (sh, ax, ext_sh, bigend, section_offsets) - SYMR *sh; - union aux_ext *ax; - char *ext_sh; - int bigend; - struct section_offsets *section_offsets; +parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, + 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) PARAMS ((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; @@ -746,23 +699,23 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) case scText: case scRConst: /* Do not relocate relative values. - The value of a stEnd symbol is the displacement from the - corresponding start symbol value. - The value of a stBlock symbol is the displacement from the - procedure address. */ + The value of a stEnd symbol is the displacement from the + corresponding start symbol value. + The value of a stBlock symbol is the displacement from the + procedure address. */ if (sh->st != stEnd && sh->st != stBlock) - sh->value += ANOFFSET (section_offsets, SECT_OFF_TEXT); + sh->value += ANOFFSET (section_offsets, SECT_OFF_TEXT (objfile)); break; case scData: case scSData: case scRData: case scPData: case scXData: - sh->value += ANOFFSET (section_offsets, SECT_OFF_DATA); + sh->value += ANOFFSET (section_offsets, SECT_OFF_DATA (objfile)); break; case scBss: case scSBss: - sh->value += ANOFFSET (section_offsets, SECT_OFF_BSS); + sh->value += ANOFFSET (section_offsets, SECT_OFF_BSS (objfile)); break; } @@ -783,7 +736,7 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) class = LOC_STATIC; b = top_stack->cur_block; s = new_symbol (name); - if (SC_IS_COMMON(sh->sc)) + if (SC_IS_COMMON (sh->sc)) { /* It is a FORTRAN common block. At least for SGI Fortran the address is not in the symbol; we need to fix it later in @@ -814,7 +767,7 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) add_symbol (s, b); /* Type could be missing if file is compiled without debugging info. */ - if (SC_IS_UNDEF(sh->sc) + if (SC_IS_UNDEF (sh->sc) || sh->sc == scNil || sh->index == indexNil) SYMBOL_TYPE (s) = nodebug_var_symbol_type; else @@ -837,21 +790,21 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) { case scRegister: /* Pass by value in register. */ - SYMBOL_CLASS(s) = LOC_REGPARM; + SYMBOL_CLASS (s) = LOC_REGPARM; svalue = ECOFF_REG_TO_REGNUM (svalue); break; case scVar: /* Pass by reference on stack. */ - SYMBOL_CLASS(s) = LOC_REF_ARG; + SYMBOL_CLASS (s) = LOC_REF_ARG; break; case scVarRegister: /* Pass by reference in register. */ - SYMBOL_CLASS(s) = LOC_REGPARM_ADDR; + SYMBOL_CLASS (s) = LOC_REGPARM_ADDR; svalue = ECOFF_REG_TO_REGNUM (svalue); break; default: /* Pass by value on stack. */ - SYMBOL_CLASS(s) = LOC_ARG; + SYMBOL_CLASS (s) = LOC_ARG; break; } SYMBOL_VALUE (s) = svalue; @@ -874,23 +827,23 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) SYMBOL_NAMESPACE (s) = VAR_NAMESPACE; SYMBOL_CLASS (s) = LOC_BLOCK; /* Type of the return value */ - if (SC_IS_UNDEF(sh->sc) || sh->sc == scNil) + if (SC_IS_UNDEF (sh->sc) || sh->sc == scNil) t = mdebug_type_int; else { t = parse_type (cur_fd, ax, sh->index + 1, 0, bigend, name); - if (STREQ(name, "malloc") && t->code == TYPE_CODE_VOID) + if (STREQ (name, "malloc") && t->code == TYPE_CODE_VOID) { /* I don't know why, but, at least under Alpha GNU/Linux, - when linking against a malloc without debugging - symbols, its read as a function returning void---this - is bad because it means we cannot call functions with - string arguments interactively; i.e., "call - printf("howdy\n")" would fail with the error message - "program has no memory available". To avoid this, we - patch up the type and make it void* - instead. (davidm@azstarnet.com) - */ + when linking against a malloc without debugging + symbols, its read as a function returning void---this + is bad because it means we cannot call functions with + string arguments interactively; i.e., "call + printf("howdy\n")" would fail with the error message + "program has no memory available". To avoid this, we + patch up the type and make it void* + instead. (davidm@azstarnet.com) + */ t = make_pointer_type (t, NULL); } } @@ -923,7 +876,7 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) add_block (b, top_stack->cur_st); /* Not if we only have partial info */ - if (SC_IS_UNDEF(sh->sc) || sh->sc == scNil) + if (SC_IS_UNDEF (sh->sc) || sh->sc == scNil) break; push_parse_stack (); @@ -936,7 +889,7 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) break; /* Beginning of code for structure, union, and enum definitions. - They all share a common set of local variables, defined here. */ + They all share a common set of local variables, defined here. */ { enum type_code type_code; char *ext_tsym; @@ -957,7 +910,7 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) goto structured_common; case stBlock: /* Either a lexical block, or some type */ - if (sh->sc != scInfo && !SC_IS_COMMON(sh->sc)) + if (sh->sc != scInfo && !SC_IS_COMMON (sh->sc)) goto case_stBlock_code; /* Lexical block */ type_code = TYPE_CODE_UNDEF; /* We have a type. */ @@ -988,26 +941,28 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) case stMember: if (nfields == 0 && type_code == TYPE_CODE_UNDEF) - /* If the type of the member is Nil (or Void), - without qualifiers, assume the tag is an - enumeration. - Alpha cc -migrate enums are recognized by a zero - index and a zero symbol value. - DU 4.0 cc enums are recognized by a member type of - btEnum without qualifiers and a zero symbol value. */ - if (tsym.index == indexNil - || (tsym.index == 0 && sh->value == 0)) - type_code = TYPE_CODE_ENUM; - else - { - (*debug_swap->swap_tir_in) (bigend, - &ax[tsym.index].a_ti, - &tir); - if ((tir.bt == btNil || tir.bt == btVoid - || (tir.bt == btEnum && sh->value == 0)) - && tir.tq0 == tqNil) - type_code = TYPE_CODE_ENUM; - } + { + /* If the type of the member is Nil (or Void), + without qualifiers, assume the tag is an + enumeration. + Alpha cc -migrate enums are recognized by a zero + index and a zero symbol value. + DU 4.0 cc enums are recognized by a member type of + btEnum without qualifiers and a zero symbol value. */ + if (tsym.index == indexNil + || (tsym.index == 0 && sh->value == 0)) + type_code = TYPE_CODE_ENUM; + else + { + (*debug_swap->swap_tir_in) (bigend, + &ax[tsym.index].a_ti, + &tir); + if ((tir.bt == btNil || tir.bt == btVoid + || (tir.bt == btEnum && sh->value == 0)) + && tir.tq0 == tqNil) + type_code = TYPE_CODE_ENUM; + } + } nfields++; if (tsym.value > max_value) max_value = tsym.value; @@ -1021,14 +976,14 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) #if 0 /* This is a no-op; is it trying to tell us something we should be checking? */ - if (tsym.sc == scVariant); /*UNIMPLEMENTED*/ + if (tsym.sc == scVariant); /*UNIMPLEMENTED */ #endif if (tsym.index != 0) { /* This is something like a struct within a - struct. Skip over the fields of the inner - struct. The -1 is because the for loop will - increment ext_tsym. */ + struct. Skip over the fields of the inner + struct. The -1 is because the for loop will + increment ext_tsym. */ ext_tsym = ((char *) debug_info->external_sym + ((cur_fdr->isymBase + tsym.index - 1) * external_sym_size)); @@ -1090,10 +1045,12 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) here.) */ if (type_code == TYPE_CODE_UNDEF) - if (nfields > 1 && max_value == 0) - type_code = TYPE_CODE_UNION; - else - type_code = TYPE_CODE_STRUCT; + { + if (nfields > 1 && max_value == 0) + type_code = TYPE_CODE_UNION; + else + type_code = TYPE_CODE_STRUCT; + } /* Create a new type or use the pending type. */ pend = is_pending_symbol (cur_fdr, ext_sh); @@ -1158,7 +1115,7 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) enum_sym = ((struct symbol *) obstack_alloc (¤t_objfile->symbol_obstack, sizeof (struct symbol))); - memset ((PTR) enum_sym, 0, sizeof (struct symbol)); + memset (enum_sym, 0, sizeof (struct symbol)); SYMBOL_NAME (enum_sym) = obsavestring (f->name, strlen (f->name), ¤t_objfile->symbol_obstack); @@ -1208,12 +1165,12 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) case_stBlock_code: found_ecoff_debugging_info = 1; /* beginnning of (code) block. Value of symbol - is the displacement from procedure start */ + is the displacement from procedure start */ push_parse_stack (); /* Do not start a new block if this is the outermost block of a - procedure. This allows the LOC_BLOCK symbol to point to the - block with the local variables, so funcname::var works. */ + procedure. This allows the LOC_BLOCK symbol to point to the + block with the local variables, so funcname::var works. */ if (top_stack->blocktype == stProc || top_stack->blocktype == stStaticProc) { @@ -1230,7 +1187,7 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) break; case stEnd: /* end (of anything) */ - if (sh->sc == scInfo || SC_IS_COMMON(sh->sc)) + if (sh->sc == scInfo || SC_IS_COMMON (sh->sc)) { /* Finished with type */ top_stack->cur_type = 0; @@ -1256,7 +1213,7 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) 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 (e, 0, sizeof (struct mips_extra_func_info)); SYMBOL_VALUE (s) = (long) e; e->numargs = top_stack->numargs; e->pdr.framereg = -1; @@ -1282,7 +1239,7 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) if (TYPE_NFIELDS (ftype) <= 0) { /* No parameter type information is recorded with the function's - type. Set that from the type of the parameter symbols. */ + type. Set that from the type of the parameter symbols. */ int nparams = top_stack->numargs; int iparams; struct symbol *sym; @@ -1292,7 +1249,7 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) TYPE_NFIELDS (ftype) = nparams; TYPE_FIELDS (ftype) = (struct field *) TYPE_ALLOC (ftype, nparams * sizeof (struct field)); - + for (i = iparams = 0; iparams < nparams; i++) { sym = BLOCK_SYM (b, i); @@ -1303,6 +1260,7 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) case LOC_REGPARM: case LOC_REGPARM_ADDR: TYPE_FIELD_TYPE (ftype, iparams) = SYMBOL_TYPE (sym); + TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0; iparams++; break; default: @@ -1349,14 +1307,14 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) case stIndirect: /* forward declaration on Irix5 */ /* Forward declarations from Irix5 cc are handled by cross_ref, - skip them. */ + skip them. */ break; case stTypedef: /* type definition */ found_ecoff_debugging_info = 1; /* Typedefs for forward declarations and opaque structs from alpha cc - are handled by cross_ref, skip them. */ + are handled by cross_ref, skip them. */ if (sh->iss == 0) break; @@ -1364,30 +1322,30 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) pend = is_pending_symbol (cur_fdr, ext_sh); if (pend == (struct mdebug_pending *) NULL) { - t = parse_type (cur_fd, ax, sh->index, (int *)NULL, bigend, name); + t = parse_type (cur_fd, ax, sh->index, (int *) NULL, bigend, name); add_pending (cur_fdr, ext_sh, t); } else t = pend->t; /* mips cc puts out a typedef with the name of the struct for forward - declarations. These should not go into the symbol table and - TYPE_NAME should not be set for them. - They can't be distinguished from an intentional typedef to - the same name however: - x.h: - struct x { int ix; int jx; }; - struct xx; - x.c: - typedef struct x x; - struct xx {int ixx; int jxx; }; - generates a cross referencing stTypedef for x and xx. - The user visible effect of this is that the type of a pointer - to struct foo sometimes is given as `foo *' instead of `struct foo *'. - The problem is fixed with alpha cc and Irix5 cc. */ + declarations. These should not go into the symbol table and + TYPE_NAME should not be set for them. + They can't be distinguished from an intentional typedef to + the same name however: + x.h: + struct x { int ix; int jx; }; + struct xx; + x.c: + typedef struct x x; + struct xx {int ixx; int jxx; }; + generates a cross referencing stTypedef for x and xx. + The user visible effect of this is that the type of a pointer + to struct foo sometimes is given as `foo *' instead of `struct foo *'. + The problem is fixed with alpha cc and Irix5 cc. */ /* However if the typedef cross references to an opaque aggregate, it - is safe to omit it from the symbol table. */ + is safe to omit it from the symbol table. */ if (has_opaque_xref (cur_fdr, sh)) break; @@ -1401,30 +1359,30 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) /* Incomplete definitions of structs should not get a name. */ if (TYPE_NAME (SYMBOL_TYPE (s)) == NULL && (TYPE_NFIELDS (SYMBOL_TYPE (s)) != 0 - || (TYPE_CODE (SYMBOL_TYPE (s)) != TYPE_CODE_STRUCT + || (TYPE_CODE (SYMBOL_TYPE (s)) != TYPE_CODE_STRUCT && TYPE_CODE (SYMBOL_TYPE (s)) != TYPE_CODE_UNION))) { if (TYPE_CODE (SYMBOL_TYPE (s)) == TYPE_CODE_PTR || TYPE_CODE (SYMBOL_TYPE (s)) == TYPE_CODE_FUNC) { /* If we are giving a name to a type such as "pointer to - foo" or "function returning foo", we better not set - the TYPE_NAME. If the program contains "typedef char - *caddr_t;", we don't want all variables of type char - * to print as caddr_t. This is not just a - consequence of GDB's type management; CC and GCC (at - least through version 2.4) both output variables of - either type char * or caddr_t with the type - refering to the stTypedef symbol for caddr_t. If a future - compiler cleans this up it GDB is not ready for it - yet, but if it becomes ready we somehow need to - disable this check (without breaking the PCC/GCC2.4 - case). - - Sigh. - - Fortunately, this check seems not to be necessary - for anything except pointers or functions. */ + foo" or "function returning foo", we better not set + the TYPE_NAME. If the program contains "typedef char + *caddr_t;", we don't want all variables of type char + * to print as caddr_t. This is not just a + consequence of GDB's type management; CC and GCC (at + least through version 2.4) both output variables of + either type char * or caddr_t with the type + refering to the stTypedef symbol for caddr_t. If a future + compiler cleans this up it GDB is not ready for it + yet, but if it becomes ready we somehow need to + disable this check (without breaking the PCC/GCC2.4 + case). + + Sigh. + + Fortunately, this check seems not to be necessary + for anything except pointers or functions. */ } else TYPE_NAME (SYMBOL_TYPE (s)) = SYMBOL_NAME (s); @@ -1457,53 +1415,48 @@ parse_symbol (sh, ax, ext_sh, bigend, section_offsets) they are big-endian or little-endian (from fh->fBigendian). */ static struct type * -parse_type (fd, ax, aux_index, bs, bigend, sym_name) - int fd; - union aux_ext *ax; - unsigned int aux_index; - int *bs; - int bigend; - char *sym_name; +parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, + int bigend, char *sym_name) { /* Null entries in this map are treated specially */ static struct type **map_bt[] = { - &mdebug_type_void, /* btNil */ - &mdebug_type_adr_32, /* btAdr */ - &mdebug_type_char, /* btChar */ - &mdebug_type_unsigned_char, /* btUChar */ - &mdebug_type_short, /* btShort */ + &mdebug_type_void, /* btNil */ + &mdebug_type_adr_32, /* btAdr */ + &mdebug_type_char, /* btChar */ + &mdebug_type_unsigned_char, /* btUChar */ + &mdebug_type_short, /* btShort */ &mdebug_type_unsigned_short, /* btUShort */ - &mdebug_type_int_32, /* btInt */ + &mdebug_type_int_32, /* btInt */ &mdebug_type_unsigned_int_32, /* btUInt */ - &mdebug_type_long_32, /* btLong */ + &mdebug_type_long_32, /* btLong */ &mdebug_type_unsigned_long_32, /* btULong */ - &mdebug_type_float, /* btFloat */ - &mdebug_type_double, /* btDouble */ - 0, /* btStruct */ - 0, /* btUnion */ - 0, /* btEnum */ - 0, /* btTypedef */ - 0, /* btRange */ - 0, /* btSet */ - &mdebug_type_complex, /* btComplex */ + &mdebug_type_float, /* btFloat */ + &mdebug_type_double, /* btDouble */ + 0, /* btStruct */ + 0, /* btUnion */ + 0, /* btEnum */ + 0, /* btTypedef */ + 0, /* btRange */ + 0, /* btSet */ + &mdebug_type_complex, /* btComplex */ &mdebug_type_double_complex, /* btDComplex */ - 0, /* btIndirect */ - &mdebug_type_fixed_dec, /* btFixedDec */ - &mdebug_type_float_dec, /* btFloatDec */ - &mdebug_type_string, /* btString */ - 0, /* btBit */ - 0, /* btPicture */ - &mdebug_type_void, /* btVoid */ - 0, /* DEC C++: Pointer to member */ - 0, /* DEC C++: Virtual function table */ - 0, /* DEC C++: Class (Record) */ - &mdebug_type_long_64, /* btLong64 */ + 0, /* btIndirect */ + &mdebug_type_fixed_dec, /* btFixedDec */ + &mdebug_type_float_dec, /* btFloatDec */ + &mdebug_type_string, /* btString */ + 0, /* btBit */ + 0, /* btPicture */ + &mdebug_type_void, /* btVoid */ + 0, /* DEC C++: Pointer to member */ + 0, /* DEC C++: Virtual function table */ + 0, /* DEC C++: Class (Record) */ + &mdebug_type_long_64, /* btLong64 */ &mdebug_type_unsigned_long_64, /* btULong64 */ - &mdebug_type_long_long_64, /* btLongLong64 */ - &mdebug_type_unsigned_long_long_64, /* btULongLong64 */ - &mdebug_type_adr_64, /* btAdr64 */ - &mdebug_type_int_64, /* btInt64 */ + &mdebug_type_long_long_64, /* btLongLong64 */ + &mdebug_type_unsigned_long_long_64, /* btULongLong64 */ + &mdebug_type_adr_64, /* btAdr64 */ + &mdebug_type_int_64, /* btInt64 */ &mdebug_type_unsigned_int_64, /* btUInt64 */ }; @@ -1579,8 +1532,8 @@ parse_type (fd, ax, aux_index, bs, bigend, sym_name) int width = AUX_GET_WIDTH (bigend, ax); /* Inhibit core dumps with some cfront generated objects that - corrupt the TIR. */ - if (bs == (int *)NULL) + corrupt the TIR. */ + if (bs == (int *) NULL) { /* Alpha cc -migrate encodes char and unsigned char types as short and unsigned short types with a field width of 8. @@ -1595,7 +1548,7 @@ parse_type (fd, ax, aux_index, bs, bigend, sym_name) complain (&bad_fbitfield_complaint, sym_name); } else - *bs = width; + *bs = width; ax++; } @@ -1626,7 +1579,7 @@ parse_type (fd, ax, aux_index, bs, bigend, sym_name) xref_fh = get_rfd (fd, rf); xref_fd = xref_fh - debug_info->fdr; tp = parse_type (xref_fd, debug_info->external_aux + xref_fh->iauxBase, - rn->index, (int *) NULL, xref_fh->fBigendian, sym_name); + rn->index, (int *) NULL, xref_fh->fBigendian, sym_name); } /* All these types really point to some (common) MIPS type @@ -1636,8 +1589,8 @@ parse_type (fd, ax, aux_index, bs, bigend, sym_name) t->bt == btUnion || t->bt == btEnum || - /* btSet (I think) implies that the name is a tag name, not a typedef - name. This apparently is a MIPS extension for C sets. */ + /* btSet (I think) implies that the name is a tag name, not a typedef + name. This apparently is a MIPS extension for C sets. */ t->bt == btSet) { char *name; @@ -1648,14 +1601,14 @@ parse_type (fd, ax, aux_index, bs, bigend, sym_name) tp = init_type (type_code, 0, 0, (char *) NULL, current_objfile); /* DEC c89 produces cross references to qualified aggregate types, - dereference them. */ + dereference them. */ while (TYPE_CODE (tp) == TYPE_CODE_PTR || TYPE_CODE (tp) == TYPE_CODE_ARRAY) tp = tp->target_type; /* Make sure that TYPE_CODE(tp) has an expected type code. - Any type may be returned from cross_ref if file indirect entries - are corrupted. */ + Any type may be returned from cross_ref if file indirect entries + are corrupted. */ if (TYPE_CODE (tp) != TYPE_CODE_STRUCT && TYPE_CODE (tp) != TYPE_CODE_UNION && TYPE_CODE (tp) != TYPE_CODE_ENUM) @@ -1683,13 +1636,13 @@ parse_type (fd, ax, aux_index, bs, bigend, sym_name) } /* Do not set the tag name if it is a compiler generated tag name - (.Fxx or .xxfake or empty) for unnamed struct/union/enums. */ + (.Fxx or .xxfake or empty) for unnamed struct/union/enums. */ if (name[0] == '.' || name[0] == '\0') TYPE_TAG_NAME (tp) = NULL; else if (TYPE_TAG_NAME (tp) == NULL || !STREQ (TYPE_TAG_NAME (tp), name)) TYPE_TAG_NAME (tp) = obsavestring (name, strlen (name), - ¤t_objfile->type_obstack); + ¤t_objfile->type_obstack); } } @@ -1707,8 +1660,8 @@ parse_type (fd, ax, aux_index, bs, bigend, sym_name) tp = init_type (type_code, 0, 0, (char *) NULL, current_objfile); /* Make sure that TYPE_CODE(tp) has an expected type code. - Any type may be returned from cross_ref if file indirect entries - are corrupted. */ + Any type may be returned from cross_ref if file indirect entries + are corrupted. */ if (TYPE_CODE (tp) != TYPE_CODE_RANGE) { complain (&unexpected_type_code_complaint, sym_name); @@ -1747,11 +1700,11 @@ parse_type (fd, ax, aux_index, bs, bigend, sym_name) TYPE_FIELDS (tp) = ((struct field *) TYPE_ALLOC (tp, 2 * sizeof (struct field))); TYPE_FIELD_NAME (tp, 0) = obsavestring ("Low", strlen ("Low"), - ¤t_objfile->type_obstack); + ¤t_objfile->type_obstack); TYPE_FIELD_BITPOS (tp, 0) = AUX_GET_DNLOW (bigend, ax); ax++; TYPE_FIELD_NAME (tp, 1) = obsavestring ("High", strlen ("High"), - ¤t_objfile->type_obstack); + ¤t_objfile->type_obstack); TYPE_FIELD_BITPOS (tp, 1) = AUX_GET_DNHIGH (bigend, ax); ax++; } @@ -1786,7 +1739,7 @@ parse_type (fd, ax, aux_index, bs, bigend, sym_name) /* Complain for illegal continuations due to corrupt aux entries. */ if (t->continued) complain (&bad_continued_complaint, sym_name); - + return tp; } @@ -1798,13 +1751,8 @@ parse_type (fd, ax, aux_index, bs, bigend, sym_name) Returns the number of aux symbols we parsed. */ static int -upgrade_type (fd, tpp, tq, ax, bigend, sym_name) - int fd; - struct type **tpp; - int tq; - union aux_ext *ax; - int bigend; - char *sym_name; +upgrade_type (int fd, struct type **tpp, int tq, union aux_ext *ax, int bigend, + char *sym_name) { int off; struct type *t; @@ -1849,7 +1797,7 @@ upgrade_type (fd, tpp, tq, ax, bigend, sym_name) id, (int *) NULL, bigend, sym_name); /* The bounds type should be an integer type, but might be anything - else due to corrupt aux entries. */ + else due to corrupt aux entries. */ if (TYPE_CODE (indx) != TYPE_CODE_INT) { complain (&array_index_type_complaint, sym_name); @@ -1870,21 +1818,21 @@ upgrade_type (fd, tpp, tq, ax, bigend, sym_name) t = create_array_type ((struct type *) NULL, *tpp, range); /* We used to fill in the supplied array element bitsize - here if the TYPE_LENGTH of the target type was zero. - This happens for a `pointer to an array of anonymous structs', - but in this case the array element bitsize is also zero, - so nothing is gained. - And we used to check the TYPE_LENGTH of the target type against - the supplied array element bitsize. - gcc causes a mismatch for `pointer to array of object', - since the sdb directives it uses do not have a way of - specifying the bitsize, but it does no harm (the - TYPE_LENGTH should be correct) and we should be able to - ignore the erroneous bitsize from the auxiliary entry safely. - dbx seems to ignore it too. */ + here if the TYPE_LENGTH of the target type was zero. + This happens for a `pointer to an array of anonymous structs', + but in this case the array element bitsize is also zero, + so nothing is gained. + And we used to check the TYPE_LENGTH of the target type against + the supplied array element bitsize. + gcc causes a mismatch for `pointer to array of object', + since the sdb directives it uses do not have a way of + specifying the bitsize, but it does no harm (the + TYPE_LENGTH should be correct) and we should be able to + ignore the erroneous bitsize from the auxiliary entry safely. + dbx seems to ignore it too. */ /* TYPE_FLAG_TARGET_STUB now takes care of the zero TYPE_LENGTH - problem. */ + problem. */ if (TYPE_LENGTH (*tpp) == 0) { TYPE_FLAGS (t) |= TYPE_FLAG_TARGET_STUB; @@ -1919,14 +1867,11 @@ upgrade_type (fd, tpp, tq, ax, bigend, sym_name) to look for the function which contains the MIPS_EFI_SYMBOL_NAME symbol in question, or NULL to use top_stack->cur_block. */ -static void parse_procedure PARAMS ((PDR *, struct symtab *, - struct partial_symtab *)); +static void parse_procedure (PDR *, struct symtab *, struct partial_symtab *); static void -parse_procedure (pr, search_symtab, pst) - PDR *pr; - struct symtab *search_symtab; - struct partial_symtab *pst; +parse_procedure (PDR *pr, struct symtab *search_symtab, + struct partial_symtab *pst) { struct symbol *s, *i; struct block *b; @@ -1947,7 +1892,7 @@ parse_procedure (pr, search_symtab, pst) { /* external */ EXTR she; - + (*debug_swap->swap_ext_in) (cur_bfd, ((char *) debug_info->external_ext + (pr->isym @@ -1973,12 +1918,12 @@ parse_procedure (pr, search_symtab, pst) { #if 0 /* This loses both in the case mentioned (want a static, find a global), - but also if we are looking up a non-mangled name which happens to - match the name of a mangled function. */ + but also if we are looking up a non-mangled name which happens to + match the name of a mangled function. */ /* We have to save the cur_fdr across the call to lookup_symbol. - If the pdr is for a static function and if a global function with - the same name exists, lookup_symbol will eventually read in the symtab - for the global function and clobber cur_fdr. */ + If the pdr is for a static function and if a global function with + the same name exists, lookup_symbol will eventually read in the symtab + for the global function and clobber cur_fdr. */ FDR *save_cur_fdr = cur_fdr; s = lookup_symbol (sh_name, NULL, VAR_NAMESPACE, 0, NULL); cur_fdr = save_cur_fdr; @@ -2017,7 +1962,7 @@ parse_procedure (pr, search_symtab, pst) BLOCK_FUNCTION (b) = s; BLOCK_START (b) = pr->adr; /* BOUND used to be the end of procedure's text, but the - argument is no longer passed in. */ + argument is no longer passed in. */ BLOCK_END (b) = bound; BLOCK_SUPERBLOCK (b) = top_stack->cur_block; add_block (b, top_stack->cur_st); @@ -2033,19 +1978,19 @@ parse_procedure (pr, search_symtab, pst) e->pdr.isym = (long) s; /* GDB expects the absolute function start address for the - procedure descriptor in e->pdr.adr. - As the address in the procedure descriptor is usually relative, - we would have to relocate e->pdr.adr with cur_fdr->adr and - ANOFFSET (pst->section_offsets, SECT_OFF_TEXT). - Unfortunately cur_fdr->adr and e->pdr.adr are both absolute - in shared libraries on some systems, and on other systems - e->pdr.adr is sometimes offset by a bogus value. - To work around these problems, we replace e->pdr.adr with - the start address of the function. */ + procedure descriptor in e->pdr.adr. + As the address in the procedure descriptor is usually relative, + we would have to relocate e->pdr.adr with cur_fdr->adr and + ANOFFSET (pst->section_offsets, SECT_OFF_TEXT (pst->objfile)). + Unfortunately cur_fdr->adr and e->pdr.adr are both absolute + in shared libraries on some systems, and on other systems + e->pdr.adr is sometimes offset by a bogus value. + To work around these problems, we replace e->pdr.adr with + the start address of the function. */ e->pdr.adr = BLOCK_START (b); /* Correct incorrect setjmp procedure descriptor from the library - to make backtrace through setjmp work. */ + to make backtrace through setjmp work. */ if (e->pdr.pcreg == 0 && STREQ (sh_name, "setjmp")) { complain (&bad_setjmp_pdr_complaint, 0); @@ -2069,7 +2014,7 @@ parse_procedure (pr, search_symtab, pst) To work around these problems, the return value type of a TYPE_CODE_VOID function is adjusted accordingly if no debugging info was found in the compilation unit. */ - + if (processing_gcc_compilation == 0 && found_ecoff_debugging_info == 0 && TYPE_CODE (TYPE_TARGET_TYPE (SYMBOL_TYPE (s))) == TYPE_CODE_VOID) @@ -2079,14 +2024,12 @@ parse_procedure (pr, search_symtab, pst) /* Relocate the extra function info pointed to by the symbol table. */ void -ecoff_relocate_efi (sym, delta) - struct symbol *sym; - CORE_ADDR delta; +ecoff_relocate_efi (struct symbol *sym, CORE_ADDR delta) { struct mips_extra_func_info *e; e = (struct mips_extra_func_info *) SYMBOL_VALUE (sym); - + e->pdr.adr += delta; } @@ -2096,13 +2039,12 @@ ecoff_relocate_efi (sym, delta) This routine clobbers top_stack->cur_block and ->cur_st. */ -static void parse_external PARAMS ((EXTR *, int, struct section_offsets *)); +static void parse_external (EXTR *, int, struct section_offsets *, + struct objfile *); static void -parse_external (es, bigend, section_offsets) - EXTR *es; - int bigend; - struct section_offsets *section_offsets; +parse_external (EXTR *es, int bigend, struct section_offsets *section_offsets, + struct objfile *objfile) { union aux_ext *ax; @@ -2119,7 +2061,7 @@ parse_external (es, bigend, section_offsets) } /* Reading .o files */ - if (SC_IS_UNDEF(es->asym.sc) || es->asym.sc == scNil) + if (SC_IS_UNDEF (es->asym.sc) || es->asym.sc == scNil) { char *what; switch (es->asym.st) @@ -2159,25 +2101,25 @@ parse_external (es, bigend, section_offsets) case stProc: case stStaticProc: /* There is no need to parse the external procedure symbols. - If they are from objects compiled without -g, their index will - be indexNil, and the symbol definition from the minimal symbol - is preferrable (yielding a function returning int instead of int). - If the index points to a local procedure symbol, the local - symbol already provides the correct type. - Note that the index of the external procedure symbol points - to the local procedure symbol in the local symbol table, and - _not_ to the auxiliary symbol info. */ + If they are from objects compiled without -g, their index will + be indexNil, and the symbol definition from the minimal symbol + is preferrable (yielding a function returning int instead of int). + If the index points to a local procedure symbol, the local + symbol already provides the correct type. + Note that the index of the external procedure symbol points + to the local procedure symbol in the local symbol table, and + _not_ to the auxiliary symbol info. */ break; case stGlobal: case stLabel: /* Global common symbols are resolved by the runtime loader, - ignore them. */ - if (SC_IS_COMMON(es->asym.sc)) + ignore them. */ + if (SC_IS_COMMON (es->asym.sc)) break; /* Note that the case of a symbol with indexNil must be handled - anyways by parse_symbol(). */ - parse_symbol (&es->asym, ax, (char *) NULL, bigend, section_offsets); + anyways by parse_symbol(). */ + parse_symbol (&es->asym, ax, (char *) NULL, bigend, section_offsets, objfile); break; default: break; @@ -2190,17 +2132,12 @@ parse_external (es, bigend, section_offsets) numbers can go back and forth, apparently we can live with that and do not need to reorder our linetables */ -static void parse_lines PARAMS ((FDR *, PDR *, struct linetable *, int, - struct partial_symtab *, CORE_ADDR)); +static void parse_lines (FDR *, PDR *, struct linetable *, int, + struct partial_symtab *, CORE_ADDR); static void -parse_lines (fh, pr, lt, maxlines, pst, lowest_pdr_addr) - FDR *fh; - PDR *pr; - struct linetable *lt; - int maxlines; - struct partial_symtab *pst; - CORE_ADDR lowest_pdr_addr; +parse_lines (FDR *fh, PDR *pr, struct linetable *lt, int maxlines, + struct partial_symtab *pst, CORE_ADDR lowest_pdr_addr) { unsigned char *base; int j, k; @@ -2223,18 +2160,18 @@ parse_lines (fh, pr, lt, maxlines, pst, lowest_pdr_addr) continue; /* Determine start and end address of compressed line bytes for - this procedure. */ + this procedure. */ base = debug_info->line + fh->cbLineOffset; if (j != (fh->cpd - 1)) - halt = base + pr[1].cbLineOffset; + halt = base + pr[1].cbLineOffset; else - halt = base + fh->cbLine; + halt = base + fh->cbLine; base += pr->cbLineOffset; - adr = pst->textlow + pr->adr - lowest_pdr_addr; + adr = TEXTLOW (pst) + pr->adr - lowest_pdr_addr; l = adr >> 2; /* in words */ - for (lineno = pr->lnLow; base < halt; ) + for (lineno = pr->lnLow; base < halt;) { count = *base & 0x0f; delta = *base++ >> 4; @@ -2266,19 +2203,14 @@ parse_lines (fh, pr, lt, maxlines, pst, lowest_pdr_addr) into a partial_symtab. */ static void -parse_partial_symbols (objfile, section_offsets) - struct objfile *objfile; - struct section_offsets *section_offsets; +parse_partial_symbols (struct objfile *objfile) { 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) PARAMS ((bfd *, PTR, EXTR *)) - = debug_swap->swap_ext_in; - void (* const swap_sym_in) PARAMS ((bfd *, PTR, SYMR *)) - = debug_swap->swap_sym_in; - void (* const swap_rfd_in) PARAMS ((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 */ @@ -2352,10 +2284,10 @@ parse_partial_symbols (objfile, section_offsets) Minor hack: -O3 images might claim some global data belongs to FDR -1. We`ll go along with that */ fdr_to_pst = (struct pst_map *) xzalloc ((hdr->ifdMax + 1) * sizeof *fdr_to_pst); - old_chain = make_cleanup (free, fdr_to_pst); + old_chain = make_cleanup (xfree, fdr_to_pst); fdr_to_pst++; { - struct partial_symtab *pst = new_psymtab ("", objfile, section_offsets); + struct partial_symtab *pst = new_psymtab ("", objfile); fdr_to_pst[-1].pst = pst; FDR_IDX (pst) = -1; } @@ -2365,12 +2297,12 @@ parse_partial_symbols (objfile, section_offsets) ((struct mdebug_pending **) obstack_alloc (&objfile->psymbol_obstack, hdr->ifdMax * sizeof (struct mdebug_pending *))); - memset ((PTR) pending_list, 0, + memset (pending_list, 0, hdr->ifdMax * sizeof (struct mdebug_pending *)); /* Pass 0 over external syms: swap them in. */ ext_block = (EXTR *) xmalloc (hdr->iextMax * sizeof (EXTR)); - make_cleanup (free, ext_block); + make_cleanup (xfree, ext_block); ext_out = (char *) debug_info->external_ext; ext_out_end = ext_out + hdr->iextMax * external_ext_size; @@ -2416,124 +2348,170 @@ parse_partial_symbols (objfile, section_offsets) To fix this, either : 1) don't create the duplicate symbol - (assumes ECOFF symtab is a subset of the ELF symtab; - assumes no side-effects result from ignoring ECOFF symbol) + (assumes ECOFF symtab is a subset of the ELF symtab; + assumes no side-effects result from ignoring ECOFF symbol) 2) create it, only if lookup for existing symbol in ELF's minimal - symbols fails - (inefficient; - assumes no side-effects result from ignoring ECOFF symbol) + symbols fails + (inefficient; + assumes no side-effects result from ignoring ECOFF symbol) 3) create it, but lookup ELF's minimal symbol and use it's section - during relocation, then modify "uniqify" phase to merge and - eliminate the duplicate symbol - (highly inefficient) + during relocation, then modify "uniqify" phase to merge and + eliminate the duplicate symbol + (highly inefficient) I've implemented #1 here... Skip the creation of the minimal symbols based on the ECOFF symbol table. */ - /* Pass 2 over external syms: fill in external symbols */ - ext_in = ext_block; - ext_in_end = ext_in + hdr->iextMax; - for (; ext_in < ext_in_end; ext_in++) - { - enum minimal_symbol_type ms_type = mst_text; - CORE_ADDR svalue = ext_in->asym.value; + /* Pass 2 over external syms: fill in external symbols */ + ext_in = ext_block; + ext_in_end = ext_in + hdr->iextMax; + for (; ext_in < ext_in_end; ext_in++) + { + enum minimal_symbol_type ms_type = mst_text; + CORE_ADDR svalue = ext_in->asym.value; - /* The Irix 5 native tools seem to sometimes generate bogus - external symbols. */ - if (ext_in->ifd < -1 || ext_in->ifd >= hdr->ifdMax) - { - complain (&bad_ext_ifd_complaint, ext_in->ifd, hdr->ifdMax); - continue; - } - if (ext_in->asym.iss < 0 || ext_in->asym.iss >= hdr->issExtMax) - { - complain (&bad_ext_iss_complaint, ext_in->asym.iss, - hdr->issExtMax); - continue; - } + /* The Irix 5 native tools seem to sometimes generate bogus + external symbols. */ + if (ext_in->ifd < -1 || ext_in->ifd >= hdr->ifdMax) + { + complain (&bad_ext_ifd_complaint, ext_in->ifd, hdr->ifdMax); + continue; + } + if (ext_in->asym.iss < 0 || ext_in->asym.iss >= hdr->issExtMax) + { + complain (&bad_ext_iss_complaint, ext_in->asym.iss, + hdr->issExtMax); + continue; + } - extern_tab[fdr_to_pst[ext_in->ifd].globals_offset - + fdr_to_pst[ext_in->ifd].n_globals++] = *ext_in; + extern_tab[fdr_to_pst[ext_in->ifd].globals_offset + + fdr_to_pst[ext_in->ifd].n_globals++] = *ext_in; - if (SC_IS_UNDEF(ext_in->asym.sc) || ext_in->asym.sc == scNil) - continue; + if (SC_IS_UNDEF (ext_in->asym.sc) || ext_in->asym.sc == scNil) + continue; - - /* Pass 3 over files, over local syms: fill in static symbols */ - name = debug_info->ssext + ext_in->asym.iss; - /* Process ECOFF Symbol Types and Storage Classes */ - switch (ext_in->asym.st) - { - case stProc: - /* Beginnning of Procedure */ - svalue += ANOFFSET (section_offsets, SECT_OFF_TEXT); - break; - case stStaticProc: - /* Load time only static procs */ - ms_type = mst_file_text; - svalue += ANOFFSET (section_offsets, SECT_OFF_TEXT); - break; - case stGlobal: - /* External symbol */ - if (SC_IS_COMMON (ext_in->asym.sc)) - { - /* The value of a common symbol is its size, not its address. - Ignore it. */ - continue; - } - else if (SC_IS_DATA (ext_in->asym.sc)) - { - ms_type = mst_data; - svalue += ANOFFSET (section_offsets, SECT_OFF_DATA); - } - else if (SC_IS_BSS (ext_in->asym.sc)) - { - ms_type = mst_bss; - svalue += ANOFFSET (section_offsets, SECT_OFF_BSS); - } - else - ms_type = mst_abs; - break; - case stLabel: - /* Label */ - if (SC_IS_TEXT (ext_in->asym.sc)) - { - ms_type = mst_file_text; - svalue += ANOFFSET (section_offsets, SECT_OFF_TEXT); - } - else if (SC_IS_DATA (ext_in->asym.sc)) - { - ms_type = mst_file_data; - svalue += ANOFFSET (section_offsets, SECT_OFF_DATA); - } - else if (SC_IS_BSS (ext_in->asym.sc)) - { - ms_type = mst_file_bss; - svalue += ANOFFSET (section_offsets, SECT_OFF_BSS); - } - else - ms_type = mst_abs; - break; - case stLocal: - case stNil: - /* The alpha has the section start addresses in stLocal symbols - whose name starts with a `.'. Skip those but complain for all - other stLocal symbols. - Irix6 puts the section start addresses in stNil symbols, skip - those too.*/ - if (name[0] == '.') + /* Pass 3 over files, over local syms: fill in static symbols */ + name = debug_info->ssext + ext_in->asym.iss; + + /* Process ECOFF Symbol Types and Storage Classes */ + switch (ext_in->asym.st) + { + case stProc: + /* Beginnning of Procedure */ + svalue += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); + break; + case stStaticProc: + /* Load time only static procs */ + ms_type = mst_file_text; + svalue += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); + break; + case stGlobal: + /* External symbol */ + if (SC_IS_COMMON (ext_in->asym.sc)) + { + /* The value of a common symbol is its size, not its address. + Ignore it. */ continue; - /* Fall through. */ - default: - ms_type = mst_unknown; - complain (&unknown_ext_complaint, name); - } - if (!ECOFF_IN_ELF(cur_bfd)) - prim_record_minimal_symbol (name, svalue, ms_type, objfile); - } + } + else if (SC_IS_DATA (ext_in->asym.sc)) + { + ms_type = mst_data; + svalue += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile)); + } + else if (SC_IS_BSS (ext_in->asym.sc)) + { + ms_type = mst_bss; + svalue += ANOFFSET (objfile->section_offsets, SECT_OFF_BSS (objfile)); + } + else if (SC_IS_SBSS (ext_in->asym.sc)) + { + ms_type = mst_bss; + svalue += ANOFFSET (objfile->section_offsets, + get_section_index (objfile, ".sbss")); + } + else + ms_type = mst_abs; + break; + case stLabel: + /* Label */ + + /* On certain platforms, some extra label symbols can be + generated by the linker. One possible usage for this kind + of symbols is to represent the address of the begining of a + given section. For instance, on Tru64 5.1, the address of + the _ftext label is the start address of the .text section. + + The storage class of these symbols is usually directly + related to the section to which the symbol refers. For + instance, on Tru64 5.1, the storage class for the _fdata + label is scData, refering to the .data section. + + It is actually possible that the section associated to the + storage class of the label does not exist. On True64 5.1 + for instance, the libm.so shared library does not contain + any .data section, although it contains a _fpdata label + which storage class is scData... Since these symbols are + usually useless for the debugger user anyway, we just + discard these symbols. + */ + + if (SC_IS_TEXT (ext_in->asym.sc)) + { + if (objfile->sect_index_text == -1) + continue; + + ms_type = mst_file_text; + svalue += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); + } + else if (SC_IS_DATA (ext_in->asym.sc)) + { + if (objfile->sect_index_data == -1) + continue; + + ms_type = mst_file_data; + svalue += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile)); + } + else if (SC_IS_BSS (ext_in->asym.sc)) + { + if (objfile->sect_index_bss == -1) + continue; + + ms_type = mst_file_bss; + svalue += ANOFFSET (objfile->section_offsets, SECT_OFF_BSS (objfile)); + } + else if (SC_IS_SBSS (ext_in->asym.sc)) + { + const int sbss_sect_index = get_section_index (objfile, ".sbss"); + + if (sbss_sect_index == -1) + continue; + + ms_type = mst_file_bss; + svalue += ANOFFSET (objfile->section_offsets, sbss_sect_index); + } + else + ms_type = mst_abs; + break; + case stLocal: + case stNil: + /* The alpha has the section start addresses in stLocal symbols + whose name starts with a `.'. Skip those but complain for all + other stLocal symbols. + Irix6 puts the section start addresses in stNil symbols, skip + those too. */ + if (name[0] == '.') + continue; + /* Fall through. */ + default: + ms_type = mst_unknown; + complain (&unknown_ext_complaint, name); + } + if (!ECOFF_IN_ELF (cur_bfd)) + prim_record_minimal_symbol (name, svalue, ms_type, objfile); + } /* Pass 3 over files, over local syms: fill in static symbols */ for (f_idx = 0; f_idx < hdr->ifdMax; f_idx++) @@ -2551,16 +2529,16 @@ parse_partial_symbols (objfile, section_offsets) } /* Determine the start address for this object file from the - file header and relocate it, except for Irix 5.2 zero fh->adr. */ + file header and relocate it, except for Irix 5.2 zero fh->adr. */ if (fh->cpd) { textlow = fh->adr; if (relocatable || textlow != 0) - textlow += ANOFFSET (section_offsets, SECT_OFF_TEXT); + textlow += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); } else textlow = 0; - pst = start_psymtab_common (objfile, section_offsets, + pst = start_psymtab_common (objfile, objfile->section_offsets, fdr_name (fh), textlow, objfile->global_psymbols.next, @@ -2568,9 +2546,11 @@ parse_partial_symbols (objfile, section_offsets) pst->read_symtab_private = ((char *) obstack_alloc (&objfile->psymbol_obstack, sizeof (struct symloc))); - memset ((PTR) pst->read_symtab_private, 0, sizeof (struct symloc)); + memset (pst->read_symtab_private, 0, sizeof (struct symloc)); save_pst = pst; + TEXTLOW (pst) = pst->textlow; + TEXTHIGH (pst) = pst->texthigh; FDR_IDX (pst) = f_idx; CUR_BFD (pst) = cur_bfd; DEBUG_SWAP (pst) = debug_swap; @@ -2582,15 +2562,15 @@ parse_partial_symbols (objfile, section_offsets) /* Set up language for the pst. The language from the FDR is used if it is unambigious (e.g. cfront - with native cc and g++ will set the language to C). - Otherwise we have to deduce the language from the filename. - Native ecoff has every header file in a separate FDR, so - deduce_language_from_filename will return language_unknown for - a header file, which is not what we want. - But the FDRs for the header files are after the FDR for the source - file, so we can assign the language of the source file to the - following header files. Then we save the language in the private - pst data so that we can reuse it when building symtabs. */ + with native cc and g++ will set the language to C). + Otherwise we have to deduce the language from the filename. + Native ecoff has every header file in a separate FDR, so + deduce_language_from_filename will return language_unknown for + a header file, which is not what we want. + But the FDRs for the header files are after the FDR for the source + file, so we can assign the language of the source file to the + following header files. Then we save the language in the private + pst data so that we can reuse it when building symtabs. */ prev_language = psymtab_language; switch (fh->lang) @@ -2606,14 +2586,14 @@ parse_partial_symbols (objfile, section_offsets) psymtab_language = prev_language; PST_PRIVATE (pst)->pst_language = psymtab_language; - pst->texthigh = pst->textlow; + TEXTHIGH (pst) = TEXTLOW (pst); /* For stabs-in-ecoff files, the second symbol must be @stab. - This symbol is emitted by mips-tfile to signal that the - current object file uses encapsulated stabs instead of mips - ecoff for local symbols. (It is the second symbol because - the first symbol is the stFile used to signal the start of a - file). */ + This symbol is emitted by mips-tfile to signal that the + current object file uses encapsulated stabs instead of mips + ecoff for local symbols. (It is the second symbol because + the first symbol is the stFile used to signal the start of a + file). */ processing_gcc_compilation = 0; if (fh->csym >= 2) { @@ -2634,7 +2614,7 @@ parse_partial_symbols (objfile, section_offsets) (*swap_sym_in) (cur_bfd, (((char *) debug_info->external_sym) - + (fh->isymBase + cur_sdx) * external_sym_size), + + (fh->isymBase + cur_sdx) * external_sym_size), &sh); type_code = ECOFF_UNMARK_STAB (sh.index); if (!ECOFF_IS_STAB (&sh)) @@ -2643,8 +2623,8 @@ parse_partial_symbols (objfile, section_offsets) { CORE_ADDR procaddr; long isym; - - sh.value += ANOFFSET (section_offsets, SECT_OFF_TEXT); + + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); if (sh.st == stStaticProc) { namestring = debug_info->ss + fh->issBase + sh.iss; @@ -2652,7 +2632,7 @@ parse_partial_symbols (objfile, section_offsets) sh.value, mst_file_text, NULL, - SECT_OFF_TEXT, + SECT_OFF_TEXT (objfile), NULL, objfile); } @@ -2671,12 +2651,12 @@ parse_partial_symbols (objfile, section_offsets) { CORE_ADDR high = procaddr + sh.value; - /* Kludge for Irix 5.2 zero fh->adr. */ + /* Kludge for Irix 5.2 zero fh->adr. */ if (!relocatable - && (pst->textlow == 0 || procaddr < pst->textlow)) - pst->textlow = procaddr; - if (high > pst->texthigh) - pst->texthigh = high; + && (TEXTLOW (pst) == 0 || procaddr < TEXTLOW (pst))) + TEXTLOW (pst) = procaddr; + if (high > TEXTHIGH (pst)) + TEXTHIGH (pst) = high; } } else if (sh.st == stStatic) @@ -2695,12 +2675,12 @@ parse_partial_symbols (objfile, section_offsets) case scPData: case scXData: namestring = debug_info->ss + fh->issBase + sh.iss; - sh.value += ANOFFSET (section_offsets, SECT_OFF_DATA); + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile)); prim_record_minimal_symbol_and_info (namestring, sh.value, mst_file_data, NULL, - SECT_OFF_DATA, + SECT_OFF_DATA (objfile), NULL, objfile); break; @@ -2709,12 +2689,12 @@ parse_partial_symbols (objfile, section_offsets) /* FIXME! Shouldn't this use cases for bss, then have the default be abs? */ namestring = debug_info->ss + fh->issBase + sh.iss; - sh.value += ANOFFSET (section_offsets, SECT_OFF_BSS); + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_BSS (objfile)); prim_record_minimal_symbol_and_info (namestring, sh.value, mst_file_bss, NULL, - SECT_OFF_BSS, + SECT_OFF_BSS (objfile), NULL, objfile); break; @@ -2726,7 +2706,7 @@ parse_partial_symbols (objfile, section_offsets) { char *stabstring = debug_info->ss + fh->issBase + sh.iss; int len = strlen (stabstring); - while (stabstring[len-1] == '\\') + while (stabstring[len - 1] == '\\') { SYMR sh2; char *stabstring1 = stabstring; @@ -2740,7 +2720,7 @@ parse_partial_symbols (objfile, section_offsets) cur_sdx++; (*swap_sym_in) (cur_bfd, (((char *) debug_info->external_sym) - + (fh->isymBase + cur_sdx) + + (fh->isymBase + cur_sdx) * external_sym_size), &sh2); stabstring2 = debug_info->ss + fh->issBase + sh2.iss; @@ -2748,31 +2728,565 @@ parse_partial_symbols (objfile, section_offsets) /* Concatinate stabstring2 with stabstring1 */ if (stabstring - && stabstring != debug_info->ss + fh->issBase + sh.iss) + && stabstring != debug_info->ss + fh->issBase + sh.iss) stabstring = xrealloc (stabstring, len + len2 + 1); else - stabstring = xmalloc (len + len2 + 1); - strcpy (stabstring, stabstring1); + { + stabstring = xmalloc (len + len2 + 1); + strcpy (stabstring, stabstring1); + } strcpy (stabstring + len, stabstring2); len += len2; } -#define SET_NAMESTRING() \ - namestring = stabstring -#define CUR_SYMBOL_TYPE type_code -#define CUR_SYMBOL_VALUE sh.value -#define START_PSYMTAB(ofile,secoff,fname,low,symoff,global_syms,static_syms)\ - pst = save_pst -#define END_PSYMTAB(pst,ilist,ninc,c_off,c_text,dep_list,n_deps,textlow_not_set) (void)0 -#define HANDLE_RBRAC(val) \ - if ((val) > save_pst->texthigh) save_pst->texthigh = (val); -#include "partial-stab.h" - - if (stabstring + switch (type_code) + { + static struct complaint function_outside_compilation_unit = { + "function `%s' appears to be defined outside of all compilation units", 0, 0 + }; + char *p; + /* + * Standard, external, non-debugger, symbols + */ + + case N_TEXT | N_EXT: + case N_NBTEXT | N_EXT: + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); + goto record_it; + + case N_DATA | N_EXT: + case N_NBDATA | N_EXT: + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile)); + goto record_it; + + case N_BSS: + case N_BSS | N_EXT: + case N_NBBSS | N_EXT: + case N_SETV | N_EXT: /* FIXME, is this in BSS? */ + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_BSS (objfile)); + goto record_it; + + case N_ABS | N_EXT: + record_it: + continue; + + /* Standard, local, non-debugger, symbols */ + + case N_NBTEXT: + + /* We need to be able to deal with both N_FN or N_TEXT, + because we have no way of knowing whether the sys-supplied ld + or GNU ld was used to make the executable. Sequents throw + in another wrinkle -- they renumbered N_FN. */ + + case N_FN: + case N_FN_SEQ: + case N_TEXT: + continue; + + case N_DATA: + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile)); + goto record_it; + + case N_UNDF | N_EXT: + continue; /* Just undefined, not COMMON */ + + case N_UNDF: + continue; + + /* Lots of symbol types we can just ignore. */ + + case N_ABS: + case N_NBDATA: + case N_NBBSS: + continue; + + /* Keep going . . . */ + + /* + * Special symbol types for GNU + */ + case N_INDR: + case N_INDR | N_EXT: + case N_SETA: + case N_SETA | N_EXT: + case N_SETT: + case N_SETT | N_EXT: + case N_SETD: + case N_SETD | N_EXT: + case N_SETB: + case N_SETB | N_EXT: + case N_SETV: + continue; + + /* + * Debugger symbols + */ + + case N_SO: + { + CORE_ADDR valu; + static int prev_so_symnum = -10; + static int first_so_symnum; + char *p; + int prev_textlow_not_set; + + valu = sh.value + ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); + + prev_textlow_not_set = textlow_not_set; + +#ifdef SOFUN_ADDRESS_MAYBE_MISSING + /* A zero value is probably an indication for the SunPRO 3.0 + compiler. end_psymtab explicitly tests for zero, so + don't relocate it. */ + + if (sh.value == 0) + { + textlow_not_set = 1; + valu = 0; + } + else + textlow_not_set = 0; +#else + textlow_not_set = 0; +#endif + past_first_source_file = 1; + + if (prev_so_symnum != symnum - 1) + { /* Here if prev stab wasn't N_SO */ + first_so_symnum = symnum; + + if (pst) + { + pst = (struct partial_symtab *) 0; + includes_used = 0; + dependencies_used = 0; + } + } + + prev_so_symnum = symnum; + + /* End the current partial symtab and start a new one */ + + /* SET_NAMESTRING ();*/ + namestring = stabstring; + + /* Null name means end of .o file. Don't start a new one. */ + if (*namestring == '\000') + continue; + + /* Some compilers (including gcc) emit a pair of initial N_SOs. + The first one is a directory name; the second the file name. + If pst exists, is empty, and has a filename ending in '/', + we assume the previous N_SO was a directory name. */ + + p = strrchr (namestring, '/'); + if (p && *(p + 1) == '\000') + continue; /* Simply ignore directory name SOs */ + + /* Some other compilers (C++ ones in particular) emit useless + SOs for non-existant .c files. We ignore all subsequent SOs that + immediately follow the first. */ + + if (!pst) + pst = save_pst; + continue; + } + + case N_BINCL: + continue; + + case N_SOL: + { + enum language tmp_language; + /* Mark down an include file in the current psymtab */ + + /* SET_NAMESTRING ();*/ + namestring = stabstring; + + tmp_language = deduce_language_from_filename (namestring); + + /* Only change the psymtab's language if we've learned + something useful (eg. tmp_language is not language_unknown). + In addition, to match what start_subfile does, never change + from C++ to C. */ + if (tmp_language != language_unknown + && (tmp_language != language_c + || psymtab_language != language_cplus)) + psymtab_language = tmp_language; + + /* In C++, one may expect the same filename to come round many + times, when code is coming alternately from the main file + and from inline functions in other files. So I check to see + if this is a file we've seen before -- either the main + source file, or a previously included file. + + This seems to be a lot of time to be spending on N_SOL, but + things like "break c-exp.y:435" need to work (I + suppose the psymtab_include_list could be hashed or put + in a binary tree, if profiling shows this is a major hog). */ + if (pst && STREQ (namestring, pst->filename)) + continue; + { + register int i; + for (i = 0; i < includes_used; i++) + if (STREQ (namestring, psymtab_include_list[i])) + { + i = -1; + break; + } + if (i == -1) + continue; + } + + psymtab_include_list[includes_used++] = namestring; + if (includes_used >= includes_allocated) + { + char **orig = psymtab_include_list; + + psymtab_include_list = (char **) + alloca ((includes_allocated *= 2) * + sizeof (char *)); + memcpy ((PTR) psymtab_include_list, (PTR) orig, + includes_used * sizeof (char *)); + } + continue; + } + case N_LSYM: /* Typedef or automatic variable. */ + case N_STSYM: /* Data seg var -- static */ + case N_LCSYM: /* BSS " */ + case N_ROSYM: /* Read-only data seg var -- static. */ + case N_NBSTS: /* Gould nobase. */ + case N_NBLCS: /* symbols. */ + case N_FUN: + case N_GSYM: /* Global (extern) variable; can be + data or bss (sigh FIXME). */ + + /* Following may probably be ignored; I'll leave them here + for now (until I do Pascal and Modula 2 extensions). */ + + case N_PC: /* I may or may not need this; I + suspect not. */ + case N_M2C: /* I suspect that I can ignore this here. */ + case N_SCOPE: /* Same. */ + + /* SET_NAMESTRING ();*/ + namestring = stabstring; + p = (char *) strchr (namestring, ':'); + if (!p) + continue; /* Not a debugging symbol. */ + + + + /* Main processing section for debugging symbols which + the initial read through the symbol tables needs to worry + about. If we reach this point, the symbol which we are + considering is definitely one we are interested in. + p must also contain the (valid) index into the namestring + which indicates the debugging type symbol. */ + + switch (p[1]) + { + case 'S': + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile)); +#ifdef STATIC_TRANSFORM_NAME + namestring = STATIC_TRANSFORM_NAME (namestring); +#endif + add_psymbol_to_list (namestring, p - namestring, + VAR_NAMESPACE, LOC_STATIC, + &objfile->static_psymbols, + 0, sh.value, + psymtab_language, objfile); + continue; + case 'G': + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile)); + /* The addresses in these entries are reported to be + wrong. See the code that reads 'G's for symtabs. */ + add_psymbol_to_list (namestring, p - namestring, + VAR_NAMESPACE, LOC_STATIC, + &objfile->global_psymbols, + 0, sh.value, + psymtab_language, objfile); + continue; + + case 'T': + /* When a 'T' entry is defining an anonymous enum, it + may have a name which is the empty string, or a + single space. Since they're not really defining a + symbol, those shouldn't go in the partial symbol + table. We do pick up the elements of such enums at + 'check_enum:', below. */ + if (p >= namestring + 2 + || (p == namestring + 1 + && namestring[0] != ' ')) + { + add_psymbol_to_list (namestring, p - namestring, + STRUCT_NAMESPACE, LOC_TYPEDEF, + &objfile->static_psymbols, + sh.value, 0, + psymtab_language, objfile); + if (p[2] == 't') + { + /* Also a typedef with the same name. */ + add_psymbol_to_list (namestring, p - namestring, + VAR_NAMESPACE, LOC_TYPEDEF, + &objfile->static_psymbols, + sh.value, 0, + psymtab_language, objfile); + p += 1; + } + /* The semantics of C++ state that "struct foo { ... }" + also defines a typedef for "foo". Unfortuantely, cfront + never makes the typedef when translating from C++ to C. + We make the typedef here so that "ptype foo" works as + expected for cfront translated code. */ + else if (psymtab_language == language_cplus) + { + /* Also a typedef with the same name. */ + add_psymbol_to_list (namestring, p - namestring, + VAR_NAMESPACE, LOC_TYPEDEF, + &objfile->static_psymbols, + sh.value, 0, + psymtab_language, objfile); + } + } + goto check_enum; + case 't': + if (p != namestring) /* a name is there, not just :T... */ + { + add_psymbol_to_list (namestring, p - namestring, + VAR_NAMESPACE, LOC_TYPEDEF, + &objfile->static_psymbols, + sh.value, 0, + psymtab_language, objfile); + } + check_enum: + /* If this is an enumerated type, we need to + add all the enum constants to the partial symbol + table. This does not cover enums without names, e.g. + "enum {a, b} c;" in C, but fortunately those are + rare. There is no way for GDB to find those from the + enum type without spending too much time on it. Thus + to solve this problem, the compiler needs to put out the + enum in a nameless type. GCC2 does this. */ + + /* We are looking for something of the form + <name> ":" ("t" | "T") [<number> "="] "e" + {<constant> ":" <value> ","} ";". */ + + /* Skip over the colon and the 't' or 'T'. */ + p += 2; + /* This type may be given a number. Also, numbers can come + in pairs like (0,26). Skip over it. */ + while ((*p >= '0' && *p <= '9') + || *p == '(' || *p == ',' || *p == ')' + || *p == '=') + p++; + + if (*p++ == 'e') + { + /* The aix4 compiler emits extra crud before the members. */ + if (*p == '-') + { + /* Skip over the type (?). */ + while (*p != ':') + p++; + + /* Skip over the colon. */ + p++; + } + + /* We have found an enumerated type. */ + /* According to comments in read_enum_type + a comma could end it instead of a semicolon. + I don't know where that happens. + Accept either. */ + while (*p && *p != ';' && *p != ',') + { + char *q; + + /* Check for and handle cretinous dbx symbol name + continuation! */ + if (*p == '\\' || (*p == '?' && p[1] == '\0')) + p = next_symbol_text (objfile); + + /* Point to the character after the name + of the enum constant. */ + for (q = p; *q && *q != ':'; q++) + ; + /* Note that the value doesn't matter for + enum constants in psymtabs, just in symtabs. */ + add_psymbol_to_list (p, q - p, + VAR_NAMESPACE, LOC_CONST, + &objfile->static_psymbols, 0, + 0, psymtab_language, objfile); + /* Point past the name. */ + p = q; + /* Skip over the value. */ + while (*p && *p != ',') + p++; + /* Advance past the comma. */ + if (*p) + p++; + } + } + continue; + case 'c': + /* Constant, e.g. from "const" in Pascal. */ + add_psymbol_to_list (namestring, p - namestring, + VAR_NAMESPACE, LOC_CONST, + &objfile->static_psymbols, sh.value, + 0, psymtab_language, objfile); + continue; + + case 'f': + if (! pst) + { + int name_len = p - namestring; + char *name = xmalloc (name_len + 1); + memcpy (name, namestring, name_len); + name[name_len] = '\0'; + complain (&function_outside_compilation_unit, name); + xfree (name); + } + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); + add_psymbol_to_list (namestring, p - namestring, + VAR_NAMESPACE, LOC_BLOCK, + &objfile->static_psymbols, + 0, sh.value, + psymtab_language, objfile); + continue; + + /* Global functions were ignored here, but now they + are put into the global psymtab like one would expect. + They're also in the minimal symbol table. */ + case 'F': + if (! pst) + { + int name_len = p - namestring; + char *name = xmalloc (name_len + 1); + memcpy (name, namestring, name_len); + name[name_len] = '\0'; + complain (&function_outside_compilation_unit, name); + xfree (name); + } + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); + add_psymbol_to_list (namestring, p - namestring, + VAR_NAMESPACE, LOC_BLOCK, + &objfile->global_psymbols, + 0, sh.value, + psymtab_language, objfile); + continue; + + /* Two things show up here (hopefully); static symbols of + local scope (static used inside braces) or extensions + of structure symbols. We can ignore both. */ + case 'V': + case '(': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '-': + case '#': /* for symbol identification (used in live ranges) */ + /* added to support cfront stabs strings */ + case 'Z': /* for definition continuations */ + case 'P': /* for prototypes */ + continue; + + case ':': + /* It is a C++ nested symbol. We don't need to record it + (I don't think); if we try to look up foo::bar::baz, + then symbols for the symtab containing foo should get + read in, I think. */ + /* Someone says sun cc puts out symbols like + /foo/baz/maclib::/usr/local/bin/maclib, + which would get here with a symbol type of ':'. */ + continue; + + default: + /* Unexpected symbol descriptor. The second and subsequent stabs + of a continued stab can show up here. The question is + whether they ever can mimic a normal stab--it would be + nice if not, since we certainly don't want to spend the + time searching to the end of every string looking for + a backslash. */ + + complain (&unknown_symchar_complaint, p[1]); + + /* Ignore it; perhaps it is an extension that we don't + know about. */ + continue; + } + + case N_EXCL: + continue; + + case N_ENDM: +#ifdef SOFUN_ADDRESS_MAYBE_MISSING + /* Solaris 2 end of module, finish current partial symbol table. + END_PSYMTAB will set TEXTHIGH (pst) to the proper value, which + is necessary if a module compiled without debugging info + follows this module. */ + if (pst) + { + pst = (struct partial_symtab *) 0; + includes_used = 0; + dependencies_used = 0; + } +#endif + continue; + + case N_RBRAC: + if (sh.value > TEXTHIGH (save_pst)) + TEXTHIGH (save_pst) = sh.value; + continue; + case N_EINCL: + case N_DSLINE: + case N_BSLINE: + case N_SSYM: /* Claim: Structure or union element. + Hopefully, I can ignore this. */ + case N_ENTRY: /* Alternate entry point; can ignore. */ + case N_MAIN: /* Can definitely ignore this. */ + case N_CATCH: /* These are GNU C++ extensions */ + case N_EHDECL: /* that can safely be ignored here. */ + case N_LENG: + case N_BCOMM: + case N_ECOMM: + case N_ECOML: + case N_FNAME: + case N_SLINE: + case N_RSYM: + case N_PSYM: + case N_LBRAC: + case N_NSYMS: /* Ultrix 4.0: symbol count */ + case N_DEFD: /* GNU Modula-2 */ + case N_ALIAS: /* SunPro F77: alias name, ignore for now. */ + + case N_OBJ: /* useless types from Solaris */ + case N_OPT: + /* These symbols aren't interesting; don't worry about them */ + + continue; + + default: + /* If we haven't found it yet, ignore it. It's probably some + new type we don't know about yet. */ + complain (&unknown_symtype_complaint, + local_hex_string (type_code)); /*CUR_SYMBOL_TYPE*/ + continue; + } + if (stabstring && stabstring != debug_info->ss + fh->issBase + sh.iss) - free (stabstring); + xfree (stabstring); } - /* end - Handle continuation */ + /* end - Handle continuation */ } } else @@ -2795,7 +3309,7 @@ parse_partial_symbols (objfile, section_offsets) } /* Non absolute static symbols go into the minimal table. */ - if (SC_IS_UNDEF(sh.sc) || sh.sc == scNil + if (SC_IS_UNDEF (sh.sc) || sh.sc == scNil || (sh.index == indexNil && (sh.st != stStatic || sh.sc == scAbs))) { @@ -2813,18 +3327,18 @@ parse_partial_symbols (objfile, section_offsets) /* The value of a stEnd symbol is the displacement from the corresponding start symbol value, do not relocate it. */ if (sh.st != stEnd) - sh.value += ANOFFSET (section_offsets, SECT_OFF_TEXT); + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); break; case scData: case scSData: case scRData: case scPData: case scXData: - sh.value += ANOFFSET (section_offsets, SECT_OFF_DATA); + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile)); break; case scBss: case scSBss: - sh.value += ANOFFSET (section_offsets, SECT_OFF_BSS); + sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_BSS (objfile)); break; } @@ -2837,7 +3351,7 @@ parse_partial_symbols (objfile, section_offsets) case stStaticProc: prim_record_minimal_symbol_and_info (name, sh.value, mst_file_text, NULL, - SECT_OFF_TEXT, NULL, + SECT_OFF_TEXT (objfile), NULL, objfile); /* FALLTHROUGH */ @@ -2858,18 +3372,18 @@ parse_partial_symbols (objfile, section_offsets) add_psymbol_to_list (name, strlen (name), VAR_NAMESPACE, LOC_BLOCK, &objfile->global_psymbols, - 0, sh.value, psymtab_language, objfile); + 0, sh.value, psymtab_language, objfile); else add_psymbol_to_list (name, strlen (name), VAR_NAMESPACE, LOC_BLOCK, &objfile->static_psymbols, - 0, sh.value, psymtab_language, objfile); + 0, sh.value, psymtab_language, objfile); /* Skip over procedure to next one. */ if (sh.index >= hdr->iauxMax) { /* Should not happen, but does when cross-compiling - with the MIPS compiler. FIXME -- pull later. */ + with the MIPS compiler. FIXME -- pull later. */ complain (&index_complaint, name); new_sdx = cur_sdx + 1; /* Don't skip at all */ } @@ -2898,35 +3412,35 @@ parse_partial_symbols (objfile, section_offsets) /* Kludge for Irix 5.2 zero fh->adr. */ if (!relocatable - && (pst->textlow == 0 || procaddr < pst->textlow)) - pst->textlow = procaddr; + && (TEXTLOW (pst) == 0 || procaddr < TEXTLOW (pst))) + TEXTLOW (pst) = procaddr; high = procaddr + sh.value; - if (high > pst->texthigh) - pst->texthigh = high; + if (high > TEXTHIGH (pst)) + TEXTHIGH (pst) = high; continue; case stStatic: /* Variable */ - if (SC_IS_DATA (sh.sc)) + if (SC_IS_DATA (sh.sc)) prim_record_minimal_symbol_and_info (name, sh.value, mst_file_data, NULL, - SECT_OFF_DATA, + SECT_OFF_DATA (objfile), NULL, objfile); else prim_record_minimal_symbol_and_info (name, sh.value, mst_file_bss, NULL, - SECT_OFF_BSS, + SECT_OFF_BSS (objfile), NULL, objfile); class = LOC_STATIC; break; - case stIndirect:/* Irix5 forward declaration */ + case stIndirect: /* Irix5 forward declaration */ /* Skip forward declarations from Irix5 cc */ goto skip; - case stTypedef:/* Typedef */ + case stTypedef: /* Typedef */ /* Skip typedefs for forward declarations and opaque structs from alpha and mips cc. */ if (sh.iss == 0 || has_opaque_xref (fh, &sh)) @@ -2941,11 +3455,11 @@ parse_partial_symbols (objfile, section_offsets) case stUnion: case stStruct: case stEnum: - case stBlock: /* { }, str, un, enum*/ + case stBlock: /* { }, str, un, enum */ /* Do not create a partial symbol for cc unnamed aggregates and gcc empty aggregates. */ if ((sh.sc == scInfo - || SC_IS_COMMON(sh.sc)) + || SC_IS_COMMON (sh.sc)) && sh.iss != 0 && sh.index != cur_sdx + 2) { @@ -3009,11 +3523,11 @@ parse_partial_symbols (objfile, section_offsets) CORE_ADDR svalue; if (ext_ptr->ifd != f_idx) - abort (); + internal_error (__FILE__, __LINE__, "failed internal consistency check"); psh = &ext_ptr->asym; /* Do not add undefined symbols to the partial symbol table. */ - if (SC_IS_UNDEF(psh->sc) || psh->sc == scNil) + if (SC_IS_UNDEF (psh->sc) || psh->sc == scNil) continue; svalue = psh->value; @@ -3021,18 +3535,18 @@ parse_partial_symbols (objfile, section_offsets) { case scText: case scRConst: - svalue += ANOFFSET (section_offsets, SECT_OFF_TEXT); + svalue += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); break; case scData: case scSData: case scRData: case scPData: case scXData: - svalue += ANOFFSET (section_offsets, SECT_OFF_DATA); + svalue += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile)); break; case scBss: case scSBss: - svalue += ANOFFSET (section_offsets, SECT_OFF_BSS); + svalue += ANOFFSET (objfile->section_offsets, SECT_OFF_BSS (objfile)); break; } @@ -3058,7 +3572,7 @@ parse_partial_symbols (objfile, section_offsets) case stGlobal: /* Global common symbols are resolved by the runtime loader, ignore them. */ - if (SC_IS_COMMON(psh->sc)) + if (SC_IS_COMMON (psh->sc)) continue; class = LOC_STATIC; @@ -3074,48 +3588,48 @@ parse_partial_symbols (objfile, section_offsets) } /* Link pst to FDR. end_psymtab returns NULL if the psymtab was - empty and put on the free list. */ + empty and put on the free list. */ fdr_to_pst[f_idx].pst = end_psymtab (save_pst, - psymtab_include_list, includes_used, - -1, save_pst->texthigh, - dependency_list, dependencies_used, textlow_not_set); + psymtab_include_list, includes_used, + -1, TEXTHIGH (save_pst), + dependency_list, dependencies_used, textlow_not_set); includes_used = 0; dependencies_used = 0; - if (objfile->ei.entry_point >= save_pst->textlow && - objfile->ei.entry_point < save_pst->texthigh) + if (objfile->ei.entry_point >= TEXTLOW (save_pst) && + objfile->ei.entry_point < TEXTHIGH (save_pst)) { - objfile->ei.entry_file_lowpc = save_pst->textlow; - objfile->ei.entry_file_highpc = save_pst->texthigh; + objfile->ei.entry_file_lowpc = TEXTLOW (save_pst); + objfile->ei.entry_file_highpc = TEXTHIGH (save_pst); } /* The objfile has its functions reordered if this partial symbol - table overlaps any other partial symbol table. - We cannot assume a reordered objfile if a partial symbol table - is contained within another partial symbol table, as partial symbol - tables for include files with executable code are contained - within the partial symbol table for the including source file, - and we do not want to flag the objfile reordered for these cases. - - This strategy works well for Irix-5.2 shared libraries, but we - might have to use a more elaborate (and slower) algorithm for - other cases. */ + table overlaps any other partial symbol table. + We cannot assume a reordered objfile if a partial symbol table + is contained within another partial symbol table, as partial symbol + tables for include files with executable code are contained + within the partial symbol table for the including source file, + and we do not want to flag the objfile reordered for these cases. + + This strategy works well for Irix-5.2 shared libraries, but we + might have to use a more elaborate (and slower) algorithm for + other cases. */ save_pst = fdr_to_pst[f_idx].pst; if (save_pst != NULL - && save_pst->textlow != 0 + && TEXTLOW (save_pst) != 0 && !(objfile->flags & OBJF_REORDERED)) { ALL_OBJFILE_PSYMTABS (objfile, pst) - { - if (save_pst != pst - && save_pst->textlow >= pst->textlow - && save_pst->textlow < pst->texthigh - && save_pst->texthigh > pst->texthigh) - { - objfile->flags |= OBJF_REORDERED; - break; - } - } + { + if (save_pst != pst + && TEXTLOW (save_pst) >= TEXTLOW (pst) + && TEXTLOW (save_pst) < TEXTHIGH (pst) + && TEXTHIGH (save_pst) > TEXTHIGH (pst)) + { + objfile->flags |= OBJF_REORDERED; + break; + } + } } } @@ -3125,7 +3639,7 @@ parse_partial_symbols (objfile, section_offsets) fh = f_idx + debug_info->fdr; pst = fdr_to_pst[f_idx].pst; - if (pst == (struct partial_symtab *)NULL) + if (pst == (struct partial_symtab *) NULL) continue; /* This should catch stabs-in-ecoff. */ @@ -3133,7 +3647,7 @@ parse_partial_symbols (objfile, section_offsets) continue; /* Skip the first file indirect entry as it is a self dependency - for source files or a reverse .h -> .c dependency for header files. */ + for source files or a reverse .h -> .c dependency for header files. */ pst->number_of_dependencies = 0; pst->dependencies = ((struct partial_symtab **) @@ -3159,7 +3673,7 @@ parse_partial_symbols (objfile, section_offsets) continue; /* Do not add to dependeny list if psymtab was empty. */ - if (fdr_to_pst[rh].pst == (struct partial_symtab *)NULL) + if (fdr_to_pst[rh].pst == (struct partial_symtab *) NULL) continue; pst->dependencies[pst->number_of_dependencies++] = fdr_to_pst[rh].pst; } @@ -3179,17 +3693,13 @@ parse_partial_symbols (objfile, section_offsets) all the the enum constants to the partial symbol table. */ static void -handle_psymbol_enumerators (objfile, fh, stype, svalue) - struct objfile *objfile; - FDR *fh; - int stype; - CORE_ADDR svalue; +handle_psymbol_enumerators (struct objfile *objfile, FDR *fh, int stype, + CORE_ADDR svalue) { const bfd_size_type external_sym_size = debug_swap->external_sym_size; - void (* const swap_sym_in) PARAMS ((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)); + + ((fh->isymBase + cur_sdx + 1) * external_sym_size)); SYMR sh; TIR tir; @@ -3200,12 +3710,12 @@ handle_psymbol_enumerators (objfile, fh, stype, svalue) case stBlock: /* It is an enumerated type if the next symbol entry is a stMember - and its auxiliary index is indexNil or its auxiliary entry - is a plain btNil or btVoid. - Alpha cc -migrate enums are recognized by a zero index and - a zero symbol value. - DU 4.0 cc enums are recognized by a member type of btEnum without - qualifiers and a zero symbol value. */ + and its auxiliary index is indexNil or its auxiliary entry + is a plain btNil or btVoid. + Alpha cc -migrate enums are recognized by a zero index and + a zero symbol value. + DU 4.0 cc enums are recognized by a member type of btEnum without + qualifiers and a zero symbol value. */ (*swap_sym_in) (cur_bfd, ext_sym, &sh); if (sh.st != stMember) return; @@ -3238,7 +3748,7 @@ handle_psymbol_enumerators (objfile, fh, stype, svalue) name = debug_info->ss + cur_fdr->issBase + sh.iss; /* Note that the value doesn't matter for enum constants - in psymtabs, just in symtabs. */ + in psymtabs, just in symtabs. */ add_psymbol_to_list (name, strlen (name), VAR_NAMESPACE, LOC_CONST, &objfile->static_psymbols, 0, @@ -3247,9 +3757,10 @@ handle_psymbol_enumerators (objfile, fh, stype, svalue) } } +/* Get the next symbol. OBJFILE is unused. */ + static char * -mdebug_next_symbol_text (objfile) - struct objfile *objfile; /* argument objfile is currently unused */ +mdebug_next_symbol_text (struct objfile *objfile) { SYMR sh; @@ -3273,19 +3784,18 @@ mdebug_next_symbol_text (objfile) The flow of control and even the memory allocation differs. FIXME. */ static void -psymtab_to_symtab_1 (pst, filename) - struct partial_symtab *pst; - char *filename; +psymtab_to_symtab_1 (struct partial_symtab *pst, char *filename) { bfd_size_type external_sym_size; bfd_size_type external_pdr_size; - void (*swap_sym_in) PARAMS ((bfd *, PTR, SYMR *)); - void (*swap_pdr_in) PARAMS ((bfd *, PTR, PDR *)); + void (*swap_sym_in) (bfd *, void *, SYMR *); + void (*swap_pdr_in) (bfd *, void *, PDR *); int i; - struct symtab *st; + struct symtab *st = NULL; FDR *fh; struct linetable *lines; CORE_ADDR lowest_pdr_addr = 0; + int last_symtab_ended = 0; if (pst->readin) return; @@ -3318,7 +3828,7 @@ psymtab_to_symtab_1 (pst, filename) /* Do nothing if this is a dummy psymtab. */ if (pst->n_global_syms == 0 && pst->n_static_syms == 0 - && pst->textlow == 0 && pst->texthigh == 0) + && TEXTLOW (pst) == 0 && TEXTHIGH (pst) == 0) return; /* Now read the symbols for this symtab */ @@ -3387,12 +3897,34 @@ psymtab_to_symtab_1 (pst, filename) int type_code = ECOFF_UNMARK_STAB (sh.index); /* We should never get non N_STAB symbols here, but they - should be harmless, so keep process_one_symbol from - complaining about them. */ + should be harmless, so keep process_one_symbol from + complaining about them. */ if (type_code & N_STAB) { - process_one_symbol (type_code, 0, valu, name, - pst->section_offsets, pst->objfile); + /* If we found a trailing N_SO with no name, process + it here instead of in process_one_symbol, so we + can keep a handle to its symtab. The symtab + would otherwise be ended twice, once in + process_one_symbol, and once after this loop. */ + if (type_code == N_SO + && last_source_file + && previous_stab_code != (unsigned char) N_SO + && *name == '\000') + { + valu += ANOFFSET (pst->section_offsets, + SECT_OFF_TEXT (pst->objfile)); + previous_stab_code = N_SO; + st = end_symtab (valu, pst->objfile, + SECT_OFF_TEXT (pst->objfile)); + end_stabs (); + last_symtab_ended = 1; + } + else + { + last_symtab_ended = 0; + process_one_symbol (type_code, 0, valu, name, + pst->section_offsets, pst->objfile); + } } /* Similarly a hack. */ else if (name[0] == '#') @@ -3405,12 +3937,12 @@ psymtab_to_symtab_1 (pst, filename) /* Make up special symbol to contain procedure specific info */ struct mips_extra_func_info *e = - ((struct mips_extra_func_info *) - obstack_alloc (¤t_objfile->symbol_obstack, - sizeof (struct mips_extra_func_info))); + ((struct mips_extra_func_info *) + obstack_alloc (¤t_objfile->symbol_obstack, + 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 (e, 0, sizeof (struct mips_extra_func_info)); SYMBOL_NAMESPACE (s) = LABEL_NAMESPACE; SYMBOL_CLASS (s) = LOC_CONST; SYMBOL_TYPE (s) = mdebug_type_void; @@ -3430,7 +3962,7 @@ psymtab_to_symtab_1 (pst, filename) else { /* Handle encoded stab line number. */ - valu += ANOFFSET (pst->section_offsets, SECT_OFF_TEXT); + valu += ANOFFSET (pst->section_offsets, SECT_OFF_TEXT (pst->objfile)); record_line (current_subfile, sh.index, valu); } } @@ -3441,18 +3973,22 @@ psymtab_to_symtab_1 (pst, filename) else complain (&stab_unknown_complaint, name); } - st = end_symtab (pst->texthigh, pst->objfile, SECT_OFF_TEXT); - end_stabs (); + + if (! last_symtab_ended) + { + st = end_symtab (TEXTHIGH (pst), pst->objfile, SECT_OFF_TEXT (pst->objfile)); + end_stabs (); + } /* Sort the symbol table now, we are done adding symbols to it. - We must do this before parse_procedure calls lookup_symbol. */ + We must do this before parse_procedure calls lookup_symbol. */ sort_symtab_syms (st); /* There used to be a call to sort_blocks here, but this should not - be necessary for stabs symtabs. And as sort_blocks modifies the - start address of the GLOBAL_BLOCK to the FIRST_LOCAL_BLOCK, - it did the wrong thing if the first procedure in a file was - generated via asm statements. */ + be necessary for stabs symtabs. And as sort_blocks modifies the + start address of the GLOBAL_BLOCK to the FIRST_LOCAL_BLOCK, + it did the wrong thing if the first procedure in a file was + generated via asm statements. */ /* Fill in procedure info next. */ if (fh->cpd > 0) @@ -3465,7 +4001,7 @@ psymtab_to_symtab_1 (pst, filename) PDR *pdr_in_end; pr_block = (PDR *) xmalloc (fh->cpd * sizeof (PDR)); - old_chain = make_cleanup (free, pr_block); + old_chain = make_cleanup (xfree, pr_block); pdr_ptr = ((char *) debug_info->external_pdr + fh->ipdFirst * external_pdr_size); @@ -3478,7 +4014,7 @@ psymtab_to_symtab_1 (pst, filename) (*swap_pdr_in) (cur_bfd, pdr_ptr, pdr_in); /* Determine lowest PDR address, the PDRs are not always - sorted. */ + sorted. */ if (pdr_in == pr_block) lowest_pdr_addr = pdr_in->adr; else if (pdr_in->adr < lowest_pdr_addr) @@ -3530,7 +4066,7 @@ psymtab_to_symtab_1 (pst, filename) top_stack->cur_st = st; top_stack->cur_block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (st), STATIC_BLOCK); - BLOCK_START (top_stack->cur_block) = pst->textlow; + BLOCK_START (top_stack->cur_block) = TEXTLOW (pst); BLOCK_END (top_stack->cur_block) = 0; top_stack->blocktype = stFile; top_stack->maxsyms = 2 * f_max; @@ -3556,7 +4092,7 @@ psymtab_to_symtab_1 (pst, filename) (*swap_sym_in) (cur_bfd, sym_ptr, &sh); c = parse_symbol (&sh, debug_info->external_aux + fh->iauxBase, - sym_ptr, fh->fBigendian, pst->section_offsets); + sym_ptr, fh->fBigendian, pst->section_offsets, pst->objfile); sym_ptr += c * external_sym_size; } @@ -3574,7 +4110,7 @@ psymtab_to_symtab_1 (pst, filename) pr_block = (PDR *) xmalloc (fh->cpd * sizeof (PDR)); - old_chain = make_cleanup (free, pr_block); + old_chain = make_cleanup (xfree, pr_block); pdr_ptr = ((char *) debug_info->external_pdr + fh->ipdFirst * external_pdr_size); @@ -3611,8 +4147,8 @@ psymtab_to_symtab_1 (pst, filename) LINETABLE (st) = lines; /* .. and our share of externals. - XXX use the global list to speed up things here. how? - FIXME, Maybe quit once we have found the right number of ext's? */ + XXX use the global list to speed up things here. how? + FIXME, Maybe quit once we have found the right number of ext's? */ top_stack->cur_st = st; top_stack->cur_block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (top_stack->cur_st), GLOBAL_BLOCK); @@ -3624,11 +4160,11 @@ psymtab_to_symtab_1 (pst, filename) ext_ptr = PST_PRIVATE (pst)->extern_tab; for (i = PST_PRIVATE (pst)->extern_count; --i >= 0; ext_ptr++) - parse_external (ext_ptr, fh->fBigendian, pst->section_offsets); + parse_external (ext_ptr, fh->fBigendian, pst->section_offsets, pst->objfile); /* If there are undefined symbols, tell the user. - The alpha has an undefined symbol for every symbol that is - from a shared library, so tell the user only if verbose is on. */ + The alpha has an undefined symbol for every symbol that is + from a shared library, so tell the user only if verbose is on. */ if (info_verbose && n_undef_symbols) { printf_filtered ("File %s contains %d unresolved references:", @@ -3642,7 +4178,7 @@ psymtab_to_symtab_1 (pst, filename) st->primary = 1; - /* Sort the symbol table now, we are done adding symbols to it.*/ + /* Sort the symbol table now, we are done adding symbols to it. */ sort_symtab_syms (st); sort_blocks (st); @@ -3660,9 +4196,7 @@ psymtab_to_symtab_1 (pst, filename) to an opaque aggregate type, else 0. */ static int -has_opaque_xref (fh, sh) - FDR *fh; - SYMR *sh; +has_opaque_xref (FDR *fh, SYMR *sh) { TIR tir; union aux_ext *ax; @@ -3694,14 +4228,8 @@ has_opaque_xref (fh, sh) Return value says how many aux symbols we ate. */ static int -cross_ref (fd, ax, tpp, type_code, pname, bigend, sym_name) - int fd; - union aux_ext *ax; - struct type **tpp; - enum type_code type_code; /* Use to alloc new type if none is found. */ - char **pname; - int bigend; - char *sym_name; +cross_ref (int fd, union aux_ext *ax, struct type **tpp, enum type_code type_code, /* Use to alloc new type if none is found. */ + char **pname, int bigend, char *sym_name) { RNDXR rn[1]; unsigned int rf; @@ -3712,7 +4240,7 @@ cross_ref (fd, ax, tpp, type_code, pname, bigend, sym_name) int xref_fd; struct mdebug_pending *pend; - *tpp = (struct type *)NULL; + *tpp = (struct type *) NULL; (*debug_swap->swap_rndx_in) (bigend, &ax->a_rndx, rn); @@ -3733,8 +4261,7 @@ cross_ref (fd, ax, tpp, type_code, pname, bigend, sym_name) if (rf == -1) { *pname = "<undefined>"; - *tpp = init_type (type_code, 0, 0, (char *) NULL, current_objfile); - TYPE_FLAGS (*tpp) |= TYPE_FLAG_STUB; + *tpp = init_type (type_code, 0, TYPE_FLAG_STUB, (char *) NULL, current_objfile); return result; } @@ -3776,7 +4303,7 @@ cross_ref (fd, ax, tpp, type_code, pname, bigend, sym_name) || (sh.st != stBlock && sh.st != stTypedef && sh.st != stIndirect && sh.st != stStruct && sh.st != stUnion && sh.st != stEnum)) - && (sh.st != stBlock || !SC_IS_COMMON(sh.sc))) + && (sh.st != stBlock || !SC_IS_COMMON (sh.sc))) { /* File indirect entry is corrupt. */ *pname = "<illegal>"; @@ -3801,14 +4328,14 @@ cross_ref (fd, ax, tpp, type_code, pname, bigend, sym_name) /* alpha cc puts out a stTypedef with a sh.iss of zero for two cases: a) forward declarations of structs/unions/enums which are not - defined in this compilation unit. - For these the type will be void. This is a bad design decision - as cross referencing across compilation units is impossible - due to the missing name. + defined in this compilation unit. + For these the type will be void. This is a bad design decision + as cross referencing across compilation units is impossible + due to the missing name. b) forward declarations of structs/unions/enums/typedefs which - are defined later in this file or in another file in the same - compilation unit. Irix5 cc uses a stIndirect symbol for this. - Simply cross reference those again to get the true type. + are defined later in this file or in another file in the same + compilation unit. Irix5 cc uses a stIndirect symbol for this. + Simply cross reference those again to get the true type. The forward references are not entered in the pending list and in the symbol table. */ @@ -3823,7 +4350,7 @@ cross_ref (fd, ax, tpp, type_code, pname, bigend, sym_name) case btVoid: *tpp = init_type (type_code, 0, 0, (char *) NULL, current_objfile); - *pname = "<undefined>"; + *pname = "<undefined>"; break; case btStruct: @@ -3838,16 +4365,16 @@ cross_ref (fd, ax, tpp, type_code, pname, bigend, sym_name) case btTypedef: /* Follow a forward typedef. This might recursively - call cross_ref till we get a non typedef'ed type. - FIXME: This is not correct behaviour, but gdb currently - cannot handle typedefs without type copying. Type - copying is impossible as we might have mutual forward - references between two files and the copied type would not - get filled in when we later parse its definition. */ + call cross_ref till we get a non typedef'ed type. + FIXME: This is not correct behaviour, but gdb currently + cannot handle typedefs without type copying. Type + copying is impossible as we might have mutual forward + references between two files and the copied type would not + get filled in when we later parse its definition. */ *tpp = parse_type (xref_fd, debug_info->external_aux + fh->iauxBase, sh.index, - (int *)NULL, + (int *) NULL, fh->fBigendian, debug_info->ss + fh->issBase + sh.iss); add_pending (fh, esh, *tpp); @@ -3873,7 +4400,7 @@ cross_ref (fd, ax, tpp, type_code, pname, bigend, sym_name) *tpp = parse_type (xref_fd, debug_info->external_aux + fh->iauxBase, sh.index, - (int *)NULL, + (int *) NULL, fh->fBigendian, debug_info->ss + fh->issBase + sh.iss); } @@ -3898,28 +4425,22 @@ cross_ref (fd, ax, tpp, type_code, pname, bigend, sym_name) keeping the symtab sorted */ static struct symbol * -mylookup_symbol (name, block, namespace, class) - char *name; - register struct block *block; - namespace_enum namespace; - enum address_class class; +mylookup_symbol (char *name, register struct block *block, + namespace_enum namespace, enum address_class class) { - register int bot, top, inc; - register struct symbol *sym; + int i, inc; + struct symbol *sym; - bot = 0; - top = BLOCK_NSYMS (block); inc = name[0]; - while (bot < top) + ALL_BLOCK_SYMBOLS (block, i, sym) { - sym = BLOCK_SYM (block, bot); if (SYMBOL_NAME (sym)[0] == inc && SYMBOL_NAMESPACE (sym) == namespace && SYMBOL_CLASS (sym) == class && strcmp (SYMBOL_NAME (sym), name) == 0) return sym; - bot++; } + block = BLOCK_SUPERBLOCK (block); if (block) return mylookup_symbol (name, block, namespace, class); @@ -3933,9 +4454,7 @@ mylookup_symbol (name, block, namespace, class) that's the only time we know how big the block is. FIXME. */ static void -add_symbol (s, b) - struct symbol *s; - struct block *b; +add_symbol (struct symbol *s, struct block *b) { int nsyms = BLOCK_NSYMS (b)++; struct block *origb; @@ -3946,13 +4465,13 @@ add_symbol (s, b) { complain (&block_overflow_complaint, SYMBOL_NAME (s)); /* In this case shrink_block is actually grow_block, since - BLOCK_NSYMS(b) is larger than its current size. */ + BLOCK_NSYMS(b) is larger than its current size. */ origb = b; b = shrink_block (top_stack->cur_block, top_stack->cur_st); /* Now run through the stack replacing pointers to the - original block. shrink_block has already done this - for the blockvector and BLOCK_FUNCTION. */ + original block. shrink_block has already done this + for the blockvector and BLOCK_FUNCTION. */ for (stackp = top_stack; stackp; stackp = stackp->next) { if (stackp->cur_block == origb) @@ -3968,13 +4487,11 @@ add_symbol (s, b) /* Add a new block B to a symtab S */ static void -add_block (b, s) - struct block *b; - struct symtab *s; +add_block (struct block *b, struct symtab *s) { 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))); @@ -4000,11 +4517,7 @@ add_block (b, s) This is another reason why -ggdb debugging format is preferable. */ static int -add_line (lt, lineno, adr, last) - struct linetable *lt; - int lineno; - CORE_ADDR adr; - int last; +add_line (struct linetable *lt, int lineno, CORE_ADDR adr, int last) { /* DEC c89 sometimes produces zero linenos which confuse gdb. Change them to something sensible. */ @@ -4026,9 +4539,7 @@ add_line (lt, lineno, adr, last) /* Blocks with a smaller low bound should come first */ static int -compare_blocks (arg1, arg2) - const PTR arg1; - const PTR arg2; +compare_blocks (const void *arg1, const void *arg2) { register int addr_diff; struct block **b1 = (struct block **) arg1; @@ -4045,8 +4556,7 @@ compare_blocks (arg1, arg2) as required by some MI search routines */ static void -sort_blocks (s) - struct symtab *s; +sort_blocks (struct symtab *s) { struct blockvector *bv = BLOCKVECTOR (s); @@ -4097,11 +4607,7 @@ sort_blocks (s) MAXSYMS and linenumbers MAXLINES we'll put in it */ static struct symtab * -new_symtab (name, maxsyms, maxlines, objfile) - char *name; - int maxsyms; - int maxlines; - struct objfile *objfile; +new_symtab (char *name, int maxsyms, int maxlines, struct objfile *objfile) { struct symtab *s = allocate_symtab (name, objfile); @@ -4116,29 +4622,26 @@ new_symtab (name, maxsyms, maxlines, objfile) s->free_code = free_linetable; s->debugformat = obsavestring ("ECOFF", 5, - &objfile -> symbol_obstack); + &objfile->symbol_obstack); return (s); } /* Allocate a new partial_symtab NAME */ static struct partial_symtab * -new_psymtab (name, objfile, section_offsets) - char *name; - struct objfile *objfile; - struct section_offsets *section_offsets; +new_psymtab (char *name, struct objfile *objfile) { struct partial_symtab *psymtab; psymtab = allocate_psymtab (name, objfile); - psymtab->section_offsets = section_offsets; + psymtab->section_offsets = objfile->section_offsets; /* Keep a backpointer to the file's symbols */ psymtab->read_symtab_private = ((char *) obstack_alloc (&objfile->psymbol_obstack, sizeof (struct symloc))); - memset ((PTR) psymtab->read_symtab_private, 0, sizeof (struct symloc)); + memset (psymtab->read_symtab_private, 0, sizeof (struct symloc)); CUR_BFD (psymtab) = cur_bfd; DEBUG_SWAP (psymtab) = debug_swap; DEBUG_INFO (psymtab) = debug_info; @@ -4155,8 +4658,7 @@ new_psymtab (name, objfile, section_offsets) proper size to allocate. */ static struct linetable * -new_linetable (size) - int size; +new_linetable (int size) { struct linetable *l; @@ -4173,11 +4675,10 @@ new_linetable (size) calculating the proper size to allocate. */ static struct linetable * -shrink_linetable (lt) - struct linetable *lt; +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)))); @@ -4186,8 +4687,7 @@ shrink_linetable (lt) /* Allocate and zero a new blockvector of NBLOCKS blocks. */ static struct blockvector * -new_bvect (nblocks) - int nblocks; +new_bvect (int nblocks) { struct blockvector *bv; int size; @@ -4203,8 +4703,7 @@ new_bvect (nblocks) /* Allocate and zero a new block of MAXSYMS symbols */ static struct block * -new_block (maxsyms) - int maxsyms; +new_block (int maxsyms) { int size = sizeof (struct block) + (maxsyms - 1) * sizeof (struct symbol *); @@ -4215,9 +4714,7 @@ new_block (maxsyms) Shrink_block can also be used by add_symbol to grow a block. */ static struct block * -shrink_block (b, s) - struct block *b; - struct symtab *s; +shrink_block (struct block *b, struct symtab *s) { struct block *new; struct blockvector *bv = BLOCKVECTOR (s); @@ -4225,13 +4722,13 @@ shrink_block (b, s) /* 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 *)))); /* Should chase pointers to old one. Fortunately, that`s just - the block`s function and inferior blocks */ + the block`s function and inferior blocks */ if (BLOCK_FUNCTION (new) && SYMBOL_BLOCK_VALUE (BLOCK_FUNCTION (new)) == b) SYMBOL_BLOCK_VALUE (BLOCK_FUNCTION (new)) = new; for (i = 0; i < BLOCKVECTOR_NBLOCKS (bv); i++) @@ -4245,14 +4742,13 @@ shrink_block (b, s) /* Create a new symbol with printname NAME */ static struct symbol * -new_symbol (name) - char *name; +new_symbol (char *name) { struct symbol *s = ((struct symbol *) obstack_alloc (¤t_objfile->symbol_obstack, sizeof (struct symbol))); - memset ((PTR) s, 0, sizeof (*s)); + memset (s, 0, sizeof (*s)); SYMBOL_NAME (s) = obsavestring (name, strlen (name), ¤t_objfile->symbol_obstack); SYMBOL_LANGUAGE (s) = psymtab_language; @@ -4263,8 +4759,7 @@ new_symbol (name) /* Create a new type with printname NAME */ static struct type * -new_type (name) - char *name; +new_type (char *name) { struct type *t; @@ -4280,11 +4775,8 @@ new_type (name) it as normal. */ void -elfmdebug_build_psymtabs (objfile, swap, sec, section_offsets) - struct objfile *objfile; - const struct ecoff_debug_swap *swap; - asection *sec; - struct section_offsets *section_offsets; +elfmdebug_build_psymtabs (struct objfile *objfile, + const struct ecoff_debug_swap *swap, asection *sec) { bfd *abfd = objfile->obfd; struct ecoff_debug_info *info; @@ -4297,7 +4789,7 @@ elfmdebug_build_psymtabs (objfile, swap, sec, section_offsets) error ("Error reading ECOFF debugging information: %s", bfd_errmsg (bfd_get_error ())); - mdebug_build_psymtabs (objfile, swap, info, section_offsets); + mdebug_build_psymtabs (objfile, swap, info); } @@ -4319,7 +4811,7 @@ elfmdebug_build_psymtabs (objfile, swap, sec, section_offsets) #ifdef TM_MIPS_H void -fixup_sigtramp () +fixup_sigtramp (void) { struct symbol *s; struct symtab *st; @@ -4384,8 +4876,8 @@ fixup_sigtramp () /* Make a MIPS_EFI_SYMBOL_NAME entry for it */ { struct mips_extra_func_info *e = - ((struct mips_extra_func_info *) - xzalloc (sizeof (struct mips_extra_func_info))); + ((struct mips_extra_func_info *) + xzalloc (sizeof (struct mips_extra_func_info))); e->numargs = 0; /* the kernel thinks otherwise */ e->pdr.frameoffset = 32; @@ -4418,10 +4910,10 @@ fixup_sigtramp () BLOCK_SYM (b, BLOCK_NSYMS (b)++) = s; } -#endif /* TM_MIPS_H */ +#endif /* TM_MIPS_H */ void -_initialize_mdebugread () +_initialize_mdebugread (void) { mdebug_type_void = init_type (TYPE_CODE_VOID, 1, @@ -4479,7 +4971,7 @@ _initialize_mdebugread () init_type (TYPE_CODE_INT, 8, 0, "long long", (struct objfile *) NULL); - mdebug_type_unsigned_long_long_64 = + mdebug_type_unsigned_long_long_64 = init_type (TYPE_CODE_INT, 8, TYPE_FLAG_UNSIGNED, "unsigned long long", (struct objfile *) NULL); |
