X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmdebugread.c;h=c0bce551489d775af488823bd2a67443994c6c67;hb=05bc7456b872b81044d3b0e7c4d74c1de57217fd;hp=99a029ed90452e80f29514905283a04886e497dc;hpb=0e9f083f4cb94a9dc861f38ba151aac06efce2b8;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c index 99a029ed90..c0bce55148 100644 --- a/gdb/mdebugread.c +++ b/gdb/mdebugread.c @@ -1,6 +1,6 @@ /* Read a symbol table in ECOFF format (Third-Eye). - Copyright (C) 1986-2013 Free Software Foundation, Inc. + Copyright (C) 1986-2018 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 @@ -51,12 +51,10 @@ #include "complaints.h" #include "demangle.h" #include "gdb-demangle.h" -#include "gdb_assert.h" #include "block.h" #include "dictionary.h" #include "mdebugread.h" -#include "gdb_stat.h" -#include +#include #include "psympriv.h" #include "source.h" @@ -70,8 +68,6 @@ #include "expression.h" -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 symbol's ECOFF section with its ELF section. This is necessary in @@ -222,38 +218,39 @@ static int found_ecoff_debugging_info; /* Forward declarations. */ static int upgrade_type (int, struct type **, int, union aux_ext *, - int, char *); + int, const char *); -static void parse_partial_symbols (struct objfile *); +static void parse_partial_symbols (minimal_symbol_reader &, + struct objfile *); static int has_opaque_xref (FDR *, SYMR *); static int cross_ref (int, union aux_ext *, struct type **, enum type_code, - char **, int, char *); + const char **, int, const char *); -static struct symbol *new_symbol (char *); +static struct symbol *new_symbol (const char *); static struct type *new_type (char *); enum block_type { FUNCTION_BLOCK, NON_FUNCTION_BLOCK }; -static struct block *new_block (enum block_type); +static struct block *new_block (enum block_type, enum language); -static struct symtab *new_symtab (const char *, int, struct objfile *); +static struct compunit_symtab *new_symtab (const char *, int, struct objfile *); static struct linetable *new_linetable (int); static struct blockvector *new_bvect (int); static struct type *parse_type (int, union aux_ext *, unsigned int, int *, - int, char *); + int, const char *); -static struct symbol *mylookup_symbol (char *, struct block *, domain_enum, - enum address_class); +static struct symbol *mylookup_symbol (const char *, const struct block *, + domain_enum, enum address_class); static void sort_blocks (struct symtab *); -static struct partial_symtab *new_psymtab (char *, struct objfile *); +static struct partial_symtab *new_psymtab (const char *, struct objfile *); static void psymtab_to_symtab_1 (struct objfile *objfile, struct partial_symtab *, const char *); @@ -269,7 +266,7 @@ static struct linetable *shrink_linetable (struct linetable *); static void handle_psymbol_enumerators (struct objfile *, FDR *, int, CORE_ADDR); -static char *mdebug_next_symbol_text (struct objfile *); +static const char *mdebug_next_symbol_text (struct objfile *); /* Exported procedure: Builds a symtab from the partial symtab SELF. Restores the environment in effect when SELF was created, delegates @@ -323,7 +320,7 @@ get_rfd (int cf, int rf) /* Return a safer print NAME for a file descriptor. */ -static char * +static const char * fdr_name (FDR *f) { if (f->rss == -1) @@ -338,7 +335,8 @@ fdr_name (FDR *f) different sections are relocated via the SECTION_OFFSETS. */ void -mdebug_build_psymtabs (struct objfile *objfile, +mdebug_build_psymtabs (minimal_symbol_reader &reader, + struct objfile *objfile, const struct ecoff_debug_swap *swap, struct ecoff_debug_info *info) { @@ -361,7 +359,7 @@ mdebug_build_psymtabs (struct objfile *objfile, info->fdr = (FDR *) obstack_alloc (&objfile->objfile_obstack, (info->symbolic_header.ifdMax * sizeof (FDR))); - fdr_src = info->external_fdr; + fdr_src = (char *) info->external_fdr; fdr_end = (fdr_src + info->symbolic_header.ifdMax * swap->external_fdr_size); fdr_ptr = info->fdr; @@ -369,7 +367,7 @@ mdebug_build_psymtabs (struct objfile *objfile, (*swap->swap_fdr_in) (objfile->obfd, fdr_src, fdr_ptr); } - parse_partial_symbols (objfile); + parse_partial_symbols (reader, objfile); #if 0 /* Check to make sure file was compiled with -g. If not, warn the @@ -432,24 +430,24 @@ static struct parse_stack static void push_parse_stack (void) { - struct parse_stack *new; + struct parse_stack *newobj; /* Reuse frames if possible. */ if (top_stack && top_stack->prev) - new = top_stack->prev; + newobj = top_stack->prev; else - new = (struct parse_stack *) xzalloc (sizeof (struct parse_stack)); + newobj = XCNEW (struct parse_stack); /* Initialize new frame with previous content. */ if (top_stack) { - struct parse_stack *prev = new->prev; + struct parse_stack *prev = newobj->prev; - *new = *top_stack; - top_stack->prev = new; - new->prev = prev; - new->next = top_stack; + *newobj = *top_stack; + top_stack->prev = newobj; + newobj->prev = prev; + newobj->next = top_stack; } - top_stack = new; + top_stack = newobj; } /* Exit a lexical context. */ @@ -523,6 +521,14 @@ add_pending (FDR *fh, char *sh, struct type *t) /* Parsing Routines proper. */ +static void +reg_value_complaint (int regnum, int num_regs, const char *sym) +{ + complaint (&symfile_complaints, + _("bad register number %d (max %d) in symbol %s"), + regnum, num_regs - 1, sym); +} + /* Parse a single symbol. Mostly just make up a GDB symbol for it. For blocks, procedures and types we open a new lexical context. This is basically just a big switch on the symbol's type. Argument @@ -535,7 +541,21 @@ add_pending (FDR *fh, char *sh, struct type *t) static int mdebug_reg_to_regnum (struct symbol *sym, struct gdbarch *gdbarch) { - return gdbarch_ecoff_reg_to_regnum (gdbarch, SYMBOL_VALUE (sym)); + int regno = gdbarch_ecoff_reg_to_regnum (gdbarch, SYMBOL_VALUE (sym)); + + if (regno < 0 + || regno >= (gdbarch_num_regs (gdbarch) + + gdbarch_num_pseudo_regs (gdbarch))) + { + reg_value_complaint (regno, + gdbarch_num_regs (gdbarch) + + gdbarch_num_pseudo_regs (gdbarch), + SYMBOL_PRINT_NAME (sym)); + + regno = gdbarch_sp_regnum (gdbarch); /* Known safe, though useless. */ + } + + return regno; } static const struct symbol_register_ops mdebug_register_funcs = { @@ -547,6 +567,26 @@ static const struct symbol_register_ops mdebug_register_funcs = { static int mdebug_register_index; static int mdebug_regparm_index; +/* Common code for symbols describing data. */ + +static void +add_data_symbol (SYMR *sh, union aux_ext *ax, int bigend, + struct symbol *s, int aclass_index, struct block *b, + struct objfile *objfile, const char *name) +{ + SYMBOL_DOMAIN (s) = VAR_DOMAIN; + SYMBOL_ACLASS_INDEX (s) = aclass_index; + add_symbol (s, top_stack->cur_st, b); + + /* Type could be missing if file is compiled without debugging info. */ + if (SC_IS_UNDEF (sh->sc) + || sh->sc == scNil || sh->index == indexNil) + SYMBOL_TYPE (s) = objfile_type (objfile)->nodebug_data_symbol; + else + SYMBOL_TYPE (s) = parse_type (cur_fd, ax, sh->index, 0, bigend, name); + /* Value of a data symbol is its memory address. */ +} + static int parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, struct section_offsets *section_offsets, struct objfile *objfile) @@ -554,14 +594,13 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, struct gdbarch *gdbarch = get_objfile_arch (objfile); const bfd_size_type external_sym_size = debug_swap->external_sym_size; void (*const swap_sym_in) (bfd *, void *, SYMR *) = debug_swap->swap_sym_in; - char *name; + const char *name; struct symbol *s; struct block *b; struct mdebug_pending *pend; struct type *t; struct field *f; int count = 1; - enum address_class class; TIR tir; long svalue = sh->value; int bitsize; @@ -602,15 +641,14 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, break; case stGlobal: /* External symbol, goes into global block. */ - class = LOC_STATIC; - b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (top_stack->cur_st), + b = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (top_stack->cur_st), GLOBAL_BLOCK); s = new_symbol (name); SYMBOL_VALUE_ADDRESS (s) = (CORE_ADDR) sh->value; - goto data; + add_data_symbol (sh, ax, bigend, s, LOC_STATIC, b, objfile, name); + break; case stStatic: /* Static data, goes into current block. */ - class = LOC_STATIC; b = top_stack->cur_block; s = new_symbol (name); if (SC_IS_COMMON (sh->sc)) @@ -624,29 +662,19 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, } else SYMBOL_VALUE_ADDRESS (s) = (CORE_ADDR) sh->value; - goto data; + add_data_symbol (sh, ax, bigend, s, LOC_STATIC, b, objfile, name); + break; case stLocal: /* Local variable, goes into current block. */ b = top_stack->cur_block; s = new_symbol (name); SYMBOL_VALUE (s) = svalue; if (sh->sc == scRegister) - class = mdebug_register_index; + add_data_symbol (sh, ax, bigend, s, mdebug_register_index, + b, objfile, name); else - class = LOC_LOCAL; - - data: /* Common code for symbols describing data. */ - SYMBOL_DOMAIN (s) = VAR_DOMAIN; - SYMBOL_ACLASS_INDEX (s) = class; - add_symbol (s, top_stack->cur_st, b); - - /* Type could be missing if file is compiled without debugging info. */ - if (SC_IS_UNDEF (sh->sc) - || sh->sc == scNil || sh->index == indexNil) - SYMBOL_TYPE (s) = objfile_type (objfile)->nodebug_data_symbol; - else - SYMBOL_TYPE (s) = parse_type (cur_fd, ax, sh->index, 0, bigend, name); - /* Value of a data symbol is its memory address. */ + add_data_symbol (sh, ax, bigend, s, LOC_LOCAL, + b, objfile, name); break; case stParam: /* Arg to procedure, goes into current @@ -756,7 +784,8 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, b = top_stack->cur_block; if (sh->st == stProc) { - struct blockvector *bv = BLOCKVECTOR (top_stack->cur_st); + const struct blockvector *bv + = SYMTAB_BLOCKVECTOR (top_stack->cur_st); /* The next test should normally be true, but provides a hook for nested functions (which we don't want to make @@ -780,7 +809,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, TYPE_PROTOTYPED (SYMBOL_TYPE (s)) = 1; /* Create and enter a new lexical context. */ - b = new_block (FUNCTION_BLOCK); + b = new_block (FUNCTION_BLOCK, SYMBOL_LANGUAGE (s)); SYMBOL_BLOCK_VALUE (s) = b; BLOCK_FUNCTION (b) = s; BLOCK_START (b) = BLOCK_END (b) = sh->value; @@ -1051,8 +1080,8 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, enum_sym = allocate_symbol (mdebugread_objfile); SYMBOL_SET_LINKAGE_NAME (enum_sym, - obstack_copy0 (&mdebugread_objfile->objfile_obstack, - f->name, strlen (f->name))); + (char *) obstack_copy0 (&mdebugread_objfile->objfile_obstack, + f->name, strlen (f->name))); SYMBOL_ACLASS_INDEX (enum_sym) = LOC_CONST; SYMBOL_TYPE (enum_sym) = t; SYMBOL_DOMAIN (enum_sym) = VAR_DOMAIN; @@ -1113,7 +1142,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, } top_stack->blocktype = stBlock; - b = new_block (NON_FUNCTION_BLOCK); + b = new_block (NON_FUNCTION_BLOCK, psymtab_language); BLOCK_START (b) = sh->value + top_stack->procadr; BLOCK_SUPERBLOCK (b) = top_stack->cur_block; top_stack->cur_block = b; @@ -1131,7 +1160,8 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, top_stack->blocktype == stStaticProc)) { /* Finished with procedure */ - struct blockvector *bv = BLOCKVECTOR (top_stack->cur_st); + const struct blockvector *bv + = SYMTAB_BLOCKVECTOR (top_stack->cur_st); struct mdebug_extra_func_info *e; struct block *b = top_stack->cur_block; struct type *ftype = top_stack->cur_type; @@ -1348,7 +1378,8 @@ static struct type * basic_type (int bt, struct objfile *objfile) { struct gdbarch *gdbarch = get_objfile_arch (objfile); - struct type **map_bt = objfile_data (objfile, basic_type_data); + struct type **map_bt + = (struct type **) objfile_data (objfile, basic_type_data); struct type *tp; if (bt >= btMax) @@ -1371,97 +1402,80 @@ basic_type (int bt, struct objfile *objfile) break; case btAdr: - tp = init_type (TYPE_CODE_PTR, 4, TYPE_FLAG_UNSIGNED, - "adr_32", objfile); - TYPE_TARGET_TYPE (tp) = objfile_type (objfile)->builtin_void; + tp = init_pointer_type (objfile, 32, "adr_32", + objfile_type (objfile)->builtin_void); break; case btChar: - tp = init_type (TYPE_CODE_INT, 1, 0, - "char", objfile); + tp = init_integer_type (objfile, 8, 0, "char"); + TYPE_NOSIGN (tp) = 1; break; case btUChar: - tp = init_type (TYPE_CODE_INT, 1, TYPE_FLAG_UNSIGNED, - "unsigned char", objfile); + tp = init_integer_type (objfile, 8, 1, "unsigned char"); break; case btShort: - tp = init_type (TYPE_CODE_INT, 2, 0, - "short", objfile); + tp = init_integer_type (objfile, 16, 0, "short"); break; case btUShort: - tp = init_type (TYPE_CODE_INT, 2, TYPE_FLAG_UNSIGNED, - "unsigned short", objfile); + tp = init_integer_type (objfile, 16, 1, "unsigned short"); break; case btInt: - tp = init_type (TYPE_CODE_INT, 4, 0, - "int", objfile); + tp = init_integer_type (objfile, 32, 0, "int"); break; case btUInt: - tp = init_type (TYPE_CODE_INT, 4, TYPE_FLAG_UNSIGNED, - "unsigned int", objfile); + tp = init_integer_type (objfile, 32, 1, "unsigned int"); break; case btLong: - tp = init_type (TYPE_CODE_INT, 4, 0, - "long", objfile); + tp = init_integer_type (objfile, 32, 0, "long"); break; case btULong: - tp = init_type (TYPE_CODE_INT, 4, TYPE_FLAG_UNSIGNED, - "unsigned long", objfile); + tp = init_integer_type (objfile, 32, 1, "unsigned long"); break; case btFloat: - tp = init_type (TYPE_CODE_FLT, - gdbarch_float_bit (gdbarch) / TARGET_CHAR_BIT, 0, - "float", objfile); + tp = init_float_type (objfile, gdbarch_float_bit (gdbarch), + "float", gdbarch_float_format (gdbarch)); break; case btDouble: - tp = init_type (TYPE_CODE_FLT, - gdbarch_double_bit (gdbarch) / TARGET_CHAR_BIT, 0, - "double", objfile); + tp = init_float_type (objfile, gdbarch_double_bit (gdbarch), + "double", gdbarch_double_format (gdbarch)); break; case btComplex: - tp = init_type (TYPE_CODE_COMPLEX, - 2 * gdbarch_float_bit (gdbarch) / TARGET_CHAR_BIT, 0, - "complex", objfile); - TYPE_TARGET_TYPE (tp) = basic_type (btFloat, objfile); + tp = init_complex_type (objfile, "complex", + basic_type (btFloat, objfile)); break; case btDComplex: - tp = init_type (TYPE_CODE_COMPLEX, - 2 * gdbarch_double_bit (gdbarch) / TARGET_CHAR_BIT, 0, - "double complex", objfile); - TYPE_TARGET_TYPE (tp) = basic_type (btDouble, objfile); + tp = init_complex_type (objfile, "double complex", + basic_type (btFloat, objfile)); break; case btFixedDec: /* We use TYPE_CODE_INT to print these as integers. Does this do any good? Would we be better off with TYPE_CODE_ERROR? Should TYPE_CODE_ERROR print things in hex if it knows the size? */ - tp = init_type (TYPE_CODE_INT, - gdbarch_int_bit (gdbarch) / TARGET_CHAR_BIT, 0, - "fixed decimal", objfile); + tp = init_integer_type (objfile, gdbarch_int_bit (gdbarch), 0, + "fixed decimal"); break; case btFloatDec: - tp = init_type (TYPE_CODE_ERROR, - gdbarch_double_bit (gdbarch) / TARGET_CHAR_BIT, 0, - "floating decimal", objfile); + tp = init_type (objfile, TYPE_CODE_ERROR, + gdbarch_double_bit (gdbarch), "floating decimal"); break; case btString: /* Is a "string" the way btString means it the same as TYPE_CODE_STRING? FIXME. */ - tp = init_type (TYPE_CODE_STRING, 1, 0, - "string", objfile); + tp = init_type (objfile, TYPE_CODE_STRING, TARGET_CHAR_BIT, "string"); break; case btVoid: @@ -1469,39 +1483,32 @@ basic_type (int bt, struct objfile *objfile) break; case btLong64: - tp = init_type (TYPE_CODE_INT, 8, 0, - "long", objfile); + tp = init_integer_type (objfile, 64, 0, "long"); break; case btULong64: - tp = init_type (TYPE_CODE_INT, 8, TYPE_FLAG_UNSIGNED, - "unsigned long", objfile); + tp = init_integer_type (objfile, 64, 1, "unsigned long"); break; case btLongLong64: - tp = init_type (TYPE_CODE_INT, 8, 0, - "long long", objfile); + tp = init_integer_type (objfile, 64, 0, "long long"); break; case btULongLong64: - tp = init_type (TYPE_CODE_INT, 8, TYPE_FLAG_UNSIGNED, - "unsigned long long", objfile); + tp = init_integer_type (objfile, 64, 1, "unsigned long long"); break; case btAdr64: - tp = init_type (TYPE_CODE_PTR, 8, TYPE_FLAG_UNSIGNED, - "adr_64", objfile); - TYPE_TARGET_TYPE (tp) = objfile_type (objfile)->builtin_void; + tp = init_pointer_type (objfile, 64, "adr_64", + objfile_type (objfile)->builtin_void); break; case btInt64: - tp = init_type (TYPE_CODE_INT, 8, 0, - "int", objfile); + tp = init_integer_type (objfile, 64, 0, "int"); break; case btUInt64: - tp = init_type (TYPE_CODE_INT, 8, TYPE_FLAG_UNSIGNED, - "unsigned int", objfile); + tp = init_integer_type (objfile, 64, 1, "unsigned int"); break; default: @@ -1520,7 +1527,7 @@ basic_type (int bt, struct objfile *objfile) static struct type * parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, - int bigend, char *sym_name) + int bigend, const char *sym_name) { TIR t[1]; struct type *tp = 0; @@ -1648,12 +1655,12 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, name. This apparently is a MIPS extension for C sets. */ t->bt == btSet) { - char *name; + const char *name; /* Try to cross reference this type, build new type on failure. */ ax += cross_ref (fd, ax, &tp, type_code, &name, bigend, sym_name); if (tp == (struct type *) NULL) - tp = init_type (type_code, 0, 0, (char *) NULL, mdebugread_objfile); + tp = init_type (mdebugread_objfile, type_code, 0, NULL); /* DEC c89 produces cross references to qualified aggregate types, dereference them. */ @@ -1696,8 +1703,9 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, else if (TYPE_TAG_NAME (tp) == NULL || strcmp (TYPE_TAG_NAME (tp), name) != 0) TYPE_TAG_NAME (tp) - = obstack_copy0 (&mdebugread_objfile->objfile_obstack, - name, strlen (name)); + = ((const char *) + obstack_copy0 (&mdebugread_objfile->objfile_obstack, + name, strlen (name))); } } @@ -1707,12 +1715,12 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, FIXME: We are not doing any guessing on range types. */ if (t->bt == btRange) { - char *name; + const char *name; /* Try to cross reference this type, build new type on failure. */ ax += cross_ref (fd, ax, &tp, type_code, &name, bigend, sym_name); if (tp == (struct type *) NULL) - tp = init_type (type_code, 0, 0, (char *) NULL, mdebugread_objfile); + tp = init_type (mdebugread_objfile, type_code, 0, NULL); /* Make sure that TYPE_CODE(tp) has an expected type code. Any type may be returned from cross_ref if file indirect entries @@ -1733,13 +1741,14 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, if (TYPE_NAME (tp) == NULL || strcmp (TYPE_NAME (tp), name) != 0) TYPE_NAME (tp) - = obstack_copy0 (&mdebugread_objfile->objfile_obstack, - name, strlen (name)); + = ((const char *) + obstack_copy0 (&mdebugread_objfile->objfile_obstack, + name, strlen (name))); } } if (t->bt == btTypedef) { - char *name; + const char *name; /* Try to cross reference this type, it should succeed. */ ax += cross_ref (fd, ax, &tp, type_code, &name, bigend, sym_name); @@ -1807,7 +1816,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, static int upgrade_type (int fd, struct type **tpp, int tq, union aux_ext *ax, int bigend, - char *sym_name) + const char *sym_name) { int off; struct type *t; @@ -1869,8 +1878,8 @@ upgrade_type (int fd, struct type **tpp, int tq, union aux_ext *ax, int bigend, ax++; rf = AUX_GET_WIDTH (bigend, ax); /* bit size of array element */ - range = create_range_type ((struct type *) NULL, indx, - lower, upper); + range = create_static_range_type ((struct type *) NULL, indx, + lower, upper); t = create_array_type ((struct type *) NULL, *tpp, range); @@ -1921,14 +1930,12 @@ upgrade_type (int fd, struct type **tpp, int tq, union aux_ext *ax, int bigend, to look for the function which contains the MDEBUG_EFI_SYMBOL_NAME symbol in question, or NULL to use top_stack->cur_block. */ -static void parse_procedure (PDR *, struct symtab *, struct partial_symtab *); - static void -parse_procedure (PDR *pr, struct symtab *search_symtab, +parse_procedure (PDR *pr, struct compunit_symtab *search_symtab, struct partial_symtab *pst) { struct symbol *s, *i; - struct block *b; + const struct block *b; char *sh_name; /* Simple rule to find files linked "-x". */ @@ -1986,7 +1993,8 @@ parse_procedure (PDR *pr, struct symtab *search_symtab, #else s = mylookup_symbol (sh_name, - BLOCKVECTOR_BLOCK (BLOCKVECTOR (search_symtab), STATIC_BLOCK), + BLOCKVECTOR_BLOCK (COMPUNIT_BLOCKVECTOR (search_symtab), + STATIC_BLOCK), VAR_DOMAIN, LOC_BLOCK); #endif @@ -2099,7 +2107,7 @@ parse_external (EXTR *es, int bigend, struct section_offsets *section_offsets, /* Reading .o files */ if (SC_IS_UNDEF (es->asym.sc) || es->asym.sc == scNil) { - char *what; + const char *what; switch (es->asym.st) { case stNil: @@ -2251,7 +2259,8 @@ function_outside_compilation_unit_complaint (const char *arg1) belongs to, and then records this new minimal symbol. */ static void -record_minimal_symbol (const char *name, const CORE_ADDR address, +record_minimal_symbol (minimal_symbol_reader &reader, + const char *name, const CORE_ADDR address, enum minimal_symbol_type ms_type, int storage_class, struct objfile *objfile) { @@ -2307,15 +2316,15 @@ record_minimal_symbol (const char *name, const CORE_ADDR address, section = -1; } - prim_record_minimal_symbol_and_info (name, address, ms_type, - section, objfile); + reader.record_with_info (name, address, ms_type, section); } /* Master parsing procedure for first-pass reading of file symbols into a partial_symtab. */ static void -parse_partial_symbols (struct objfile *objfile) +parse_partial_symbols (minimal_symbol_reader &reader, + struct objfile *objfile) { struct gdbarch *gdbarch = get_objfile_arch (objfile); const bfd_size_type external_sym_size = debug_swap->external_sym_size; @@ -2336,7 +2345,6 @@ parse_partial_symbols (struct objfile *objfile) SYMR sh; struct partial_symtab *pst; int textlow_not_set = 1; - int past_first_source_file = 0; /* List of current psymtab's include files. */ const char **psymtab_include_list; @@ -2396,8 +2404,7 @@ parse_partial_symbols (struct objfile *objfile) /* Allocate the map FDR -> PST. 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); + fdr_to_pst = XCNEWVEC (struct pst_map, hdr->ifdMax + 1); old_chain = make_cleanup (xfree, fdr_to_pst); fdr_to_pst++; { @@ -2416,7 +2423,7 @@ parse_partial_symbols (struct objfile *objfile) hdr->ifdMax * sizeof (struct mdebug_pending *)); /* Pass 0 over external syms: swap them in. */ - ext_block = (EXTR *) xmalloc (hdr->iextMax * sizeof (EXTR)); + ext_block = XNEWVEC (EXTR, hdr->iextMax); make_cleanup (xfree, ext_block); ext_out = (char *) debug_info->external_ext; @@ -2519,14 +2526,10 @@ parse_partial_symbols (struct objfile *objfile) { 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 */ @@ -2539,20 +2542,14 @@ parse_partial_symbols (struct objfile *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; @@ -2585,8 +2582,6 @@ parse_partial_symbols (struct objfile *objfile) continue; ms_type = mst_file_text; - svalue += ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)); } else if (SC_IS_DATA (ext_in->asym.sc)) { @@ -2594,8 +2589,6 @@ parse_partial_symbols (struct objfile *objfile) continue; ms_type = mst_file_data; - svalue += ANOFFSET (objfile->section_offsets, - SECT_OFF_DATA (objfile)); } else if (SC_IS_BSS (ext_in->asym.sc)) { @@ -2603,8 +2596,6 @@ parse_partial_symbols (struct objfile *objfile) continue; ms_type = mst_file_bss; - svalue += ANOFFSET (objfile->section_offsets, - SECT_OFF_BSS (objfile)); } else if (SC_IS_SBSS (ext_in->asym.sc)) { @@ -2614,7 +2605,6 @@ parse_partial_symbols (struct objfile *objfile) continue; ms_type = mst_file_bss; - svalue += ANOFFSET (objfile->section_offsets, sbss_sect_index); } else ms_type = mst_abs; @@ -2634,7 +2624,7 @@ parse_partial_symbols (struct objfile *objfile) unknown_ext_complaint (name); } if (!ECOFF_IN_ELF (cur_bfd)) - record_minimal_symbol (name, svalue, ms_type, ext_in->asym.sc, + record_minimal_symbol (reader, name, svalue, ms_type, ext_in->asym.sc, objfile); } @@ -2664,11 +2654,11 @@ parse_partial_symbols (struct objfile *objfile) } else textlow = 0; - pst = start_psymtab_common (objfile, objfile->section_offsets, + pst = start_psymtab_common (objfile, fdr_name (fh), textlow, - objfile->global_psymbols.next, - objfile->static_psymbols.next); + objfile->global_psymbols, + objfile->static_psymbols); pst->read_symtab_private = obstack_alloc (&objfile->objfile_obstack, sizeof (struct symloc)); memset (pst->read_symtab_private, 0, sizeof (struct symloc)); @@ -2748,15 +2738,15 @@ parse_partial_symbols (struct objfile *objfile) CORE_ADDR procaddr; long isym; - sh.value += ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)); if (sh.st == stStaticProc) { namestring = debug_info->ss + fh->issBase + sh.iss; - record_minimal_symbol (namestring, sh.value, + record_minimal_symbol (reader, namestring, sh.value, mst_file_text, sh.sc, objfile); } + sh.value += ANOFFSET (objfile->section_offsets, + SECT_OFF_TEXT (objfile)); procaddr = sh.value; isym = AUX_GET_ISYM (fh->fBigendian, @@ -2796,22 +2786,22 @@ parse_partial_symbols (struct objfile *objfile) case scPData: case scXData: namestring = debug_info->ss + fh->issBase + sh.iss; - sh.value += ANOFFSET (objfile->section_offsets, - SECT_OFF_DATA (objfile)); - record_minimal_symbol (namestring, sh.value, + record_minimal_symbol (reader, namestring, sh.value, mst_file_data, sh.sc, objfile); + sh.value += ANOFFSET (objfile->section_offsets, + SECT_OFF_DATA (objfile)); break; default: /* 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 (objfile->section_offsets, - SECT_OFF_BSS (objfile)); - record_minimal_symbol (namestring, sh.value, + record_minimal_symbol (reader, namestring, sh.value, mst_file_bss, sh.sc, objfile); + sh.value += ANOFFSET (objfile->section_offsets, + SECT_OFF_BSS (objfile)); break; } } @@ -2845,10 +2835,11 @@ parse_partial_symbols (struct objfile *objfile) /* Concatinate stabstring2 with stabstring1. */ if (stabstring && stabstring != debug_info->ss + fh->issBase + sh.iss) - stabstring = xrealloc (stabstring, len + len2 + 1); + stabstring + = (char *) xrealloc (stabstring, len + len2 + 1); else { - stabstring = xmalloc (len + len2 + 1); + stabstring = (char *) xmalloc (len + len2 + 1); strcpy (stabstring, stabstring1); } strcpy (stabstring + len, stabstring2); @@ -2857,7 +2848,7 @@ parse_partial_symbols (struct objfile *objfile) switch (type_code) { - char *p; + const char *p; /* Standard, external, non-debugger, symbols. */ @@ -2942,36 +2933,21 @@ parse_partial_symbols (struct objfile *objfile) case N_SO: { - CORE_ADDR valu; static int prev_so_symnum = -10; - static int first_so_symnum; const 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; /* A zero value is probably an indication for the - SunPRO 3.0 compiler. end_psymtab explicitly tests + SunPRO 3.0 compiler. dbx_end_psymtab explicitly tests for zero, so don't relocate it. */ if (sh.value == 0 && gdbarch_sofun_address_maybe_missing (gdbarch)) - { - textlow_not_set = 1; - valu = 0; - } + textlow_not_set = 1; else textlow_not_set = 0; - 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; @@ -3128,7 +3104,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_STATIC, &objfile->static_psymbols, - 0, sh.value, + sh.value, psymtab_language, objfile); continue; case 'G': @@ -3140,7 +3116,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_STATIC, &objfile->global_psymbols, - 0, sh.value, + sh.value, psymtab_language, objfile); continue; @@ -3158,8 +3134,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, STRUCT_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - sh.value, 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); if (p[2] == 't') { /* Also a typedef with the same name. */ @@ -3167,8 +3142,7 @@ parse_partial_symbols (struct objfile *objfile) p - namestring, 1, VAR_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - sh.value, 0, - psymtab_language, + 0, psymtab_language, objfile); p += 1; } @@ -3181,8 +3155,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - sh.value, 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); } check_enum: /* If this is an enumerated type, we need to add @@ -3229,7 +3202,7 @@ parse_partial_symbols (struct objfile *objfile) Accept either. */ while (*p && *p != ';' && *p != ',') { - char *q; + const char *q; /* Check for and handle cretinous dbx symbol name continuation! */ @@ -3246,7 +3219,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (p, q - p, 1, VAR_DOMAIN, LOC_CONST, &objfile->static_psymbols, - 0, 0, psymtab_language, + 0, psymtab_language, objfile); /* Point past the name. */ p = q; @@ -3264,15 +3237,14 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_CONST, &objfile->static_psymbols, - sh.value, 0, psymtab_language, - objfile); + 0, psymtab_language, objfile); continue; case 'f': if (! pst) { int name_len = p - namestring; - char *name = xmalloc (name_len + 1); + char *name = (char *) xmalloc (name_len + 1); memcpy (name, namestring, name_len); name[name_len] = '\0'; @@ -3284,7 +3256,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_BLOCK, &objfile->static_psymbols, - 0, sh.value, + sh.value, psymtab_language, objfile); continue; @@ -3296,7 +3268,7 @@ parse_partial_symbols (struct objfile *objfile) if (! pst) { int name_len = p - namestring; - char *name = xmalloc (name_len + 1); + char *name = (char *) xmalloc (name_len + 1); memcpy (name, namestring, name_len); name[name_len] = '\0'; @@ -3308,7 +3280,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (namestring, p - namestring, 1, VAR_DOMAIN, LOC_BLOCK, &objfile->global_psymbols, - 0, sh.value, + sh.value, psymtab_language, objfile); continue; @@ -3365,7 +3337,7 @@ parse_partial_symbols (struct objfile *objfile) case N_ENDM: /* Solaris 2 end of module, finish current partial - symbol table. END_PSYMTAB will set + symbol table. dbx_end_psymtab will set pst->texthigh to the proper value, which is necessary if a module compiled without debugging info follows this module. */ @@ -3434,7 +3406,8 @@ parse_partial_symbols (struct objfile *objfile) for (cur_sdx = 0; cur_sdx < fh->csym;) { char *name; - enum address_class class; + enum address_class theclass; + CORE_ADDR minsym_value; (*swap_sym_in) (cur_bfd, ((char *) debug_info->external_sym @@ -3460,6 +3433,8 @@ parse_partial_symbols (struct objfile *objfile) name = debug_info->ss + fh->issBase + sh.iss; + minsym_value = sh.value; + switch (sh.sc) { case scText: @@ -3492,10 +3467,9 @@ parse_partial_symbols (struct objfile *objfile) int new_sdx; case stStaticProc: - prim_record_minimal_symbol_and_info (name, sh.value, - mst_file_text, - SECT_OFF_TEXT (objfile), - objfile); + reader.record_with_info (name, minsym_value, + mst_file_text, + SECT_OFF_TEXT (objfile)); /* FALLTHROUGH */ @@ -3548,12 +3522,12 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (name, strlen (name), 1, VAR_DOMAIN, LOC_BLOCK, &objfile->global_psymbols, - 0, sh.value, psymtab_language, objfile); + sh.value, psymtab_language, objfile); else add_psymbol_to_list (name, strlen (name), 1, VAR_DOMAIN, LOC_BLOCK, &objfile->static_psymbols, - 0, sh.value, psymtab_language, objfile); + sh.value, psymtab_language, objfile); procaddr = sh.value; @@ -3578,16 +3552,14 @@ parse_partial_symbols (struct objfile *objfile) case stStatic: /* Variable */ if (SC_IS_DATA (sh.sc)) - prim_record_minimal_symbol_and_info (name, sh.value, - mst_file_data, - SECT_OFF_DATA (objfile), - objfile); + reader.record_with_info (name, minsym_value, + mst_file_data, + SECT_OFF_DATA (objfile)); else - prim_record_minimal_symbol_and_info (name, sh.value, - mst_file_bss, - SECT_OFF_BSS (objfile), - objfile); - class = LOC_STATIC; + reader.record_with_info (name, minsym_value, + mst_file_bss, + SECT_OFF_BSS (objfile)); + theclass = LOC_STATIC; break; case stIndirect: /* Irix5 forward declaration */ @@ -3599,11 +3571,11 @@ parse_partial_symbols (struct objfile *objfile) structs from alpha and mips cc. */ if (sh.iss == 0 || has_opaque_xref (fh, &sh)) goto skip; - class = LOC_TYPEDEF; + theclass = LOC_TYPEDEF; break; case stConstant: /* Constant decl */ - class = LOC_CONST; + theclass = LOC_CONST; break; case stUnion: @@ -3620,8 +3592,7 @@ parse_partial_symbols (struct objfile *objfile) add_psymbol_to_list (name, strlen (name), 1, STRUCT_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - 0, (CORE_ADDR) 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); } handle_psymbol_enumerators (objfile, fh, sh.st, sh.value); @@ -3659,9 +3630,9 @@ parse_partial_symbols (struct objfile *objfile) } /* Use this gdb symbol. */ add_psymbol_to_list (name, strlen (name), 1, - VAR_DOMAIN, class, + VAR_DOMAIN, theclass, &objfile->static_psymbols, - 0, sh.value, psymtab_language, objfile); + sh.value, psymtab_language, objfile); skip: cur_sdx++; /* Go to next file symbol. */ } @@ -3673,7 +3644,7 @@ parse_partial_symbols (struct objfile *objfile) PST_PRIVATE (save_pst)->extern_tab = ext_ptr; for (; --cur_sdx >= 0; ext_ptr++) { - enum address_class class; + enum address_class theclass; SYMR *psh; char *name; CORE_ADDR svalue; @@ -3723,7 +3694,7 @@ parse_partial_symbols (struct objfile *objfile) Ignore them, as parse_external will ignore them too. */ continue; case stLabel: - class = LOC_LABEL; + theclass = LOC_LABEL; break; default: unknown_ext_complaint (debug_info->ssext + psh->iss); @@ -3734,24 +3705,25 @@ parse_partial_symbols (struct objfile *objfile) if (SC_IS_COMMON (psh->sc)) continue; - class = LOC_STATIC; + theclass = LOC_STATIC; break; } name = debug_info->ssext + psh->iss; add_psymbol_to_list (name, strlen (name), 1, - VAR_DOMAIN, class, + VAR_DOMAIN, theclass, &objfile->global_psymbols, - 0, svalue, - psymtab_language, objfile); + svalue, psymtab_language, objfile); } } - /* Link pst to FDR. end_psymtab returns NULL if the psymtab was + /* Link pst to FDR. dbx_end_psymtab returns NULL if the psymtab was empty and put on the free list. */ - fdr_to_pst[f_idx].pst = end_psymtab (objfile, save_pst, - psymtab_include_list, includes_used, - -1, save_pst->texthigh, - dependency_list, dependencies_used, textlow_not_set); + fdr_to_pst[f_idx].pst + = dbx_end_psymtab (objfile, save_pst, + psymtab_include_list, includes_used, + -1, save_pst->texthigh, + dependency_list, dependencies_used, + textlow_not_set); includes_used = 0; dependencies_used = 0; @@ -3904,15 +3876,15 @@ handle_psymbol_enumerators (struct objfile *objfile, FDR *fh, int stype, in psymtabs, just in symtabs. */ add_psymbol_to_list (name, strlen (name), 1, VAR_DOMAIN, LOC_CONST, - &objfile->static_psymbols, 0, - (CORE_ADDR) 0, psymtab_language, objfile); + &objfile->static_psymbols, + 0, psymtab_language, objfile); ext_sym += external_sym_size; } } /* Get the next symbol. OBJFILE is unused. */ -static char * +static const char * mdebug_next_symbol_text (struct objfile *objfile) { SYMR sh; @@ -3945,11 +3917,12 @@ psymtab_to_symtab_1 (struct objfile *objfile, void (*swap_sym_in) (bfd *, void *, SYMR *); void (*swap_pdr_in) (bfd *, void *, PDR *); int i; - struct symtab *st = NULL; + struct compunit_symtab *cust = NULL; FDR *fh; struct linetable *lines; CORE_ADDR lowest_pdr_addr = 0; int last_symtab_ended = 0; + struct section_offsets *section_offsets = objfile->section_offsets; if (pst->readin) return; @@ -4050,6 +4023,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, if (ECOFF_IS_STAB (&sh) || (name[0] == '#')) { int type_code = ECOFF_UNMARK_STAB (sh.index); + enum language language = PST_PRIVATE (pst)->pst_language; /* We should never get non N_STAB symbols here, but they should be harmless, so keep process_one_symbol from @@ -4066,11 +4040,10 @@ psymtab_to_symtab_1 (struct objfile *objfile, && previous_stab_code != (unsigned char) N_SO && *name == '\000') { - valu += ANOFFSET (pst->section_offsets, + valu += ANOFFSET (section_offsets, SECT_OFF_TEXT (objfile)); previous_stab_code = N_SO; - st = end_symtab (valu, objfile, - SECT_OFF_TEXT (objfile)); + cust = end_symtab (valu, SECT_OFF_TEXT (objfile)); end_stabs (); last_symtab_ended = 1; } @@ -4078,14 +4051,14 @@ psymtab_to_symtab_1 (struct objfile *objfile, { last_symtab_ended = 0; process_one_symbol (type_code, 0, valu, name, - pst->section_offsets, objfile); + section_offsets, objfile, language); } } /* Similarly a hack. */ else if (name[0] == '#') { process_one_symbol (N_SLINE, 0, valu, name, - pst->section_offsets, objfile); + section_offsets, objfile, language); } if (type_code == N_FUN) { @@ -4117,7 +4090,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, else { /* Handle encoded stab line number. */ - valu += ANOFFSET (pst->section_offsets, + valu += ANOFFSET (section_offsets, SECT_OFF_TEXT (objfile)); record_line (current_subfile, sh.index, gdbarch_addr_bits_remove (gdbarch, valu)); @@ -4134,8 +4107,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, if (! last_symtab_ended) { - st = end_symtab (pst->texthigh, objfile, - SECT_OFF_TEXT (objfile)); + cust = end_symtab (pst->texthigh, SECT_OFF_TEXT (objfile)); end_stabs (); } @@ -4155,7 +4127,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, PDR *pdr_in; PDR *pdr_in_end; - pr_block = (PDR *) xmalloc (fh->cpd * sizeof (PDR)); + pr_block = XNEWVEC (PDR, fh->cpd); old_chain = make_cleanup (xfree, pr_block); pdr_ptr = ((char *) debug_info->external_pdr @@ -4179,7 +4151,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, pdr_in = pr_block; pdr_in_end = pdr_in + fh->cpd; for (; pdr_in < pdr_in_end; pdr_in++) - parse_procedure (pdr_in, st, pst); + parse_procedure (pdr_in, cust, pst); do_cleanups (old_chain); } @@ -4194,28 +4166,28 @@ psymtab_to_symtab_1 (struct objfile *objfile, if (fh == 0) { maxlines = 0; - st = new_symtab ("unknown", 0, objfile); + cust = new_symtab ("unknown", 0, objfile); } else { maxlines = 2 * fh->cline; - st = new_symtab (pst->filename, maxlines, objfile); + cust = new_symtab (pst->filename, maxlines, objfile); /* The proper language was already determined when building the psymtab, use it. */ - st->language = PST_PRIVATE (pst)->pst_language; + COMPUNIT_FILETABS (cust)->language = PST_PRIVATE (pst)->pst_language; } - psymtab_language = st->language; + psymtab_language = COMPUNIT_FILETABS (cust)->language; - lines = LINETABLE (st); + lines = SYMTAB_LINETABLE (COMPUNIT_FILETABS (cust)); /* Get a new lexical context. */ push_parse_stack (); - top_stack->cur_st = st; - top_stack->cur_block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (st), - STATIC_BLOCK); + top_stack->cur_st = COMPUNIT_FILETABS (cust); + top_stack->cur_block + = BLOCKVECTOR_BLOCK (COMPUNIT_BLOCKVECTOR (cust), STATIC_BLOCK); BLOCK_START (top_stack->cur_block) = pst->textlow; BLOCK_END (top_stack->cur_block) = 0; top_stack->blocktype = stFile; @@ -4242,7 +4214,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, c = parse_symbol (&sh, debug_info->external_aux + fh->iauxBase, sym_ptr, fh->fBigendian, - pst->section_offsets, objfile); + section_offsets, objfile); sym_ptr += c * external_sym_size; } @@ -4258,7 +4230,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, PDR *pdr_in; PDR *pdr_in_end; - pr_block = (PDR *) xmalloc (fh->cpd * sizeof (PDR)); + pr_block = XNEWVEC (PDR, fh->cpd); old_chain = make_cleanup (xfree, pr_block); @@ -4289,7 +4261,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, pdr_in = pr_block; pdr_in_end = pdr_in + fh->cpd; for (; pdr_in < pdr_in_end; pdr_in++) - parse_procedure (pdr_in, 0, pst); + parse_procedure (pdr_in, NULL, pst); do_cleanups (old_chain); } @@ -4298,25 +4270,26 @@ psymtab_to_symtab_1 (struct objfile *objfile, size = lines->nitems; if (size > 1) --size; - LINETABLE (st) = obstack_copy (&mdebugread_objfile->objfile_obstack, - lines, - (sizeof (struct linetable) - + size * sizeof (lines->item))); + SYMTAB_LINETABLE (COMPUNIT_FILETABS (cust)) + = ((struct linetable *) + obstack_copy (&mdebugread_objfile->objfile_obstack, + lines, (sizeof (struct linetable) + + size * sizeof (lines->item)))); xfree (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? */ - top_stack->cur_st = st; + top_stack->cur_st = COMPUNIT_FILETABS (cust); top_stack->cur_block - = BLOCKVECTOR_BLOCK (BLOCKVECTOR (top_stack->cur_st), + = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (top_stack->cur_st), GLOBAL_BLOCK); top_stack->blocktype = stFile; 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, objfile); + section_offsets, objfile); /* If there are undefined symbols, tell the user. The alpha has an undefined symbol for every symbol that is @@ -4324,7 +4297,8 @@ psymtab_to_symtab_1 (struct objfile *objfile, if (info_verbose && n_undef_symbols) { printf_filtered (_("File %s contains %d unresolved references:"), - symtab_to_filename_for_display (st), + symtab_to_filename_for_display + (COMPUNIT_FILETABS (cust)), n_undef_symbols); printf_filtered ("\n\t%4d variables\n\t%4d " "procedures\n\t%4d labels\n", @@ -4334,13 +4308,11 @@ psymtab_to_symtab_1 (struct objfile *objfile, } pop_parse_stack (); - set_symtab_primary (st, 1); - - sort_blocks (st); + sort_blocks (COMPUNIT_FILETABS (cust)); } /* Now link the psymtab and the symtab. */ - pst->symtab = st; + pst->compunit_symtab = cust; mdebugread_objfile = NULL; } @@ -4386,7 +4358,7 @@ static int 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) + const char **pname, int bigend, const char *sym_name) { RNDXR rn[1]; unsigned int rf; @@ -4397,7 +4369,7 @@ cross_ref (int fd, union aux_ext *ax, struct type **tpp, int xref_fd; struct mdebug_pending *pend; - *tpp = (struct type *) NULL; + *tpp = NULL; (*debug_swap->swap_rndx_in) (bigend, &ax->a_rndx, rn); @@ -4413,13 +4385,13 @@ cross_ref (int fd, union aux_ext *ax, struct type **tpp, } /* mips cc uses a rf of -1 for opaque struct definitions. - Set TYPE_FLAG_STUB for these types so that check_typedef will + Set TYPE_STUB for these types so that check_typedef will resolve them if the struct gets defined in another compilation unit. */ if (rf == -1) { *pname = ""; - *tpp = init_type (type_code, 0, TYPE_FLAG_STUB, - (char *) NULL, mdebugread_objfile); + *tpp = init_type (mdebugread_objfile, type_code, 0, NULL); + TYPE_STUB (*tpp) = 1; return result; } @@ -4505,8 +4477,7 @@ cross_ref (int fd, union aux_ext *ax, struct type **tpp, switch (tir.bt) { case btVoid: - *tpp = init_type (type_code, 0, 0, (char *) NULL, - mdebugread_objfile); + *tpp = init_type (mdebugread_objfile, type_code, 0, NULL); *pname = ""; break; @@ -4541,8 +4512,7 @@ cross_ref (int fd, union aux_ext *ax, struct type **tpp, complaint (&symfile_complaints, _("illegal bt %d in forward typedef for %s"), tir.bt, sym_name); - *tpp = init_type (type_code, 0, 0, (char *) NULL, - mdebugread_objfile); + *tpp = init_type (mdebugread_objfile, type_code, 0, NULL); break; } return result; @@ -4570,7 +4540,7 @@ cross_ref (int fd, union aux_ext *ax, struct type **tpp, has not been parsed yet. Initialize the type only, it will be filled in when it's definition is parsed. */ - *tpp = init_type (type_code, 0, 0, (char *) NULL, mdebugread_objfile); + *tpp = init_type (mdebugread_objfile, type_code, 0, NULL); } add_pending (fh, esh, *tpp); } @@ -4584,8 +4554,8 @@ cross_ref (int fd, union aux_ext *ax, struct type **tpp, keeping the symtab sorted. */ static struct symbol * -mylookup_symbol (char *name, struct block *block, - domain_enum domain, enum address_class class) +mylookup_symbol (const char *name, const struct block *block, + domain_enum domain, enum address_class theclass) { struct block_iterator iter; int inc; @@ -4596,14 +4566,14 @@ mylookup_symbol (char *name, struct block *block, { if (SYMBOL_LINKAGE_NAME (sym)[0] == inc && SYMBOL_DOMAIN (sym) == domain - && SYMBOL_CLASS (sym) == class + && SYMBOL_CLASS (sym) == theclass && strcmp (SYMBOL_LINKAGE_NAME (sym), name) == 0) return sym; } block = BLOCK_SUPERBLOCK (block); if (block) - return mylookup_symbol (name, block, domain, class); + return mylookup_symbol (name, block, domain, theclass); return 0; } @@ -4613,7 +4583,7 @@ mylookup_symbol (char *name, struct block *block, static void add_symbol (struct symbol *s, struct symtab *symtab, struct block *b) { - SYMBOL_SYMTAB (s) = symtab; + symbol_set_symtab (s, symtab); dict_add_symbol (BLOCK_DICT (b), s); } @@ -4622,14 +4592,16 @@ add_symbol (struct symbol *s, struct symtab *symtab, struct block *b) static void add_block (struct block *b, struct symtab *s) { - struct blockvector *bv = BLOCKVECTOR (s); + /* Cast away "const", but that's ok because we're building the + symtab and blockvector here. */ + struct blockvector *bv = (struct blockvector *) SYMTAB_BLOCKVECTOR (s); bv = (struct blockvector *) xrealloc ((void *) bv, (sizeof (struct blockvector) + BLOCKVECTOR_NBLOCKS (bv) * sizeof (bv->block))); - if (bv != BLOCKVECTOR (s)) - BLOCKVECTOR (s) = bv; + if (bv != SYMTAB_BLOCKVECTOR (s)) + SYMTAB_BLOCKVECTOR (s) = bv; BLOCKVECTOR_BLOCK (bv, BLOCKVECTOR_NBLOCKS (bv)++) = b; } @@ -4691,7 +4663,9 @@ compare_blocks (const void *arg1, const void *arg2) static void sort_blocks (struct symtab *s) { - struct blockvector *bv = BLOCKVECTOR (s); + /* We have to cast away const here, but this is ok because we're + constructing the blockvector in this code. */ + struct blockvector *bv = (struct blockvector *) SYMTAB_BLOCKVECTOR (s); if (BLOCKVECTOR_NBLOCKS (bv) <= FIRST_LOCAL_BLOCK) { @@ -4739,35 +4713,40 @@ sort_blocks (struct symtab *s) /* Allocate a new symtab for NAME. Needs an estimate of how many linenumbers MAXLINES we'll put in it. */ -static struct symtab * +static struct compunit_symtab * new_symtab (const char *name, int maxlines, struct objfile *objfile) { - struct symtab *s = allocate_symtab (name, objfile); + struct compunit_symtab *cust = allocate_compunit_symtab (objfile, name); + struct symtab *symtab; + struct blockvector *bv; + enum language lang; + + add_compunit_symtab_to_objfile (cust); + symtab = allocate_symtab (cust, name); - LINETABLE (s) = new_linetable (maxlines); + SYMTAB_LINETABLE (symtab) = new_linetable (maxlines); + lang = compunit_language (cust); /* All symtabs must have at least two blocks. */ - BLOCKVECTOR (s) = new_bvect (2); - BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK) - = new_block (NON_FUNCTION_BLOCK); - BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK) - = new_block (NON_FUNCTION_BLOCK); - BLOCK_SUPERBLOCK (BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK)) = - BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK); - - s->debugformat = "ECOFF"; - return (s); + bv = new_bvect (2); + BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK) = new_block (NON_FUNCTION_BLOCK, lang); + BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK) = new_block (NON_FUNCTION_BLOCK, lang); + BLOCK_SUPERBLOCK (BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK)) = + BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK); + COMPUNIT_BLOCKVECTOR (cust) = bv; + + COMPUNIT_DEBUGFORMAT (cust) = "ECOFF"; + return cust; } /* Allocate a new partial_symtab NAME. */ static struct partial_symtab * -new_psymtab (char *name, struct objfile *objfile) +new_psymtab (const char *name, struct objfile *objfile) { struct partial_symtab *psymtab; psymtab = allocate_psymtab (name, objfile); - psymtab->section_offsets = objfile->section_offsets; /* Keep a backpointer to the file's symbols. */ @@ -4833,23 +4812,23 @@ new_bvect (int nblocks) return bv; } -/* Allocate and zero a new block, and set its BLOCK_DICT. If function - is non-zero, assume the block is associated to a function, and make - sure that the symbols are stored linearly; otherwise, store them - hashed. */ +/* Allocate and zero a new block of language LANGUAGE, and set its + BLOCK_DICT. If function is non-zero, assume the block is + associated to a function, and make sure that the symbols are stored + linearly; otherwise, store them hashed. */ static struct block * -new_block (enum block_type type) +new_block (enum block_type type, enum language language) { /* FIXME: carlton/2003-09-11: This should use allocate_block to allocate the block. Which, in turn, suggests that the block should be allocated on an obstack. */ - struct block *retval = xzalloc (sizeof (struct block)); + struct block *retval = XCNEW (struct block); if (type == FUNCTION_BLOCK) - BLOCK_DICT (retval) = dict_create_linear_expandable (); + BLOCK_DICT (retval) = dict_create_linear_expandable (language); else - BLOCK_DICT (retval) = dict_create_hashed_expandable (); + BLOCK_DICT (retval) = dict_create_hashed_expandable (language); return retval; } @@ -4857,7 +4836,7 @@ new_block (enum block_type type) /* Create a new symbol with printname NAME. */ static struct symbol * -new_symbol (char *name) +new_symbol (const char *name) { struct symbol *s = allocate_symbol (mdebugread_objfile); @@ -4891,14 +4870,12 @@ elfmdebug_build_psymtabs (struct objfile *objfile, { bfd *abfd = objfile->obfd; struct ecoff_debug_info *info; - struct cleanup *back_to; /* FIXME: It's not clear whether we should be getting minimal symbol information from .mdebug in an ELF file, or whether we will. Re-initialize the minimal symbol reader in case we do. */ - init_minimal_symbol_collection (); - back_to = make_cleanup_discard_minimal_symbols (); + minimal_symbol_reader reader (objfile); info = ((struct ecoff_debug_info *) obstack_alloc (&objfile->objfile_obstack, @@ -4908,10 +4885,9 @@ elfmdebug_build_psymtabs (struct objfile *objfile, error (_("Error reading ECOFF debugging information: %s"), bfd_errmsg (bfd_get_error ())); - mdebug_build_psymtabs (objfile, swap, info); + mdebug_build_psymtabs (reader, objfile, swap, info); - install_minimal_symbols (objfile); - do_cleanups (back_to); + reader.install (); } void