X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fstabsread.c;h=1b5426e28426bb6074fd849c45adf48d291b5e91;hb=c1b5c1ebc938b6dc0277363b8c47d75b0b5a621f;hp=8d392906429977a0b8a041ae537e287265b9df44;hpb=86a73007627a3c52d1c624ed430ac0e74fb8cc3e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/stabsread.c b/gdb/stabsread.c index 8d39290642..1b5426e284 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -1,6 +1,6 @@ /* Support routines for decoding "stabs" debugging information format. - Copyright (C) 1986-2018 Free Software Foundation, Inc. + Copyright (C) 1986-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -36,21 +36,30 @@ #include "libaout.h" #include "aout/aout64.h" #include "gdb-stabs.h" -#include "buildsym.h" +#include "buildsym-legacy.h" #include "complaints.h" #include "demangle.h" #include "gdb-demangle.h" #include "language.h" #include "target-float.h" +#include "c-lang.h" #include "cp-abi.h" #include "cp-support.h" #include -/* Ask stabsread.h to define the vars it normally declares `extern'. */ -#define EXTERN -/**/ -#include "stabsread.h" /* Our own declarations */ -#undef EXTERN +#include "stabsread.h" + +/* See stabsread.h for these globals. */ +unsigned int symnum; +const char *(*next_symbol_text_func) (struct objfile *); +unsigned char processing_gcc_compilation; +int within_function; +struct symbol *global_sym_chain[HASHSIZE]; +struct pending_stabs *global_stabs; +int previous_stab_code; +int *this_object_header_files; +int n_this_object_header_files; +int n_allocated_this_object_header_files; struct nextfield { @@ -76,14 +85,16 @@ struct next_fnfieldlist This is part of some reorganization of low level C++ support and is expected to eventually go away... (FIXME) */ -struct field_info +struct stab_field_info { - struct nextfield *list; - struct next_fnfieldlist *fnlist; + struct nextfield *list = nullptr; + struct next_fnfieldlist *fnlist = nullptr; + + auto_obstack obstack; }; static void -read_one_struct_field (struct field_info *, const char **, const char *, +read_one_struct_field (struct stab_field_info *, const char **, const char *, struct type *, struct objfile *); static struct type *dbx_alloc_type (int[2], struct objfile *); @@ -116,24 +127,24 @@ static struct type *read_enum_type (const char **, struct type *, struct objfile static struct type *rs6000_builtin_type (int, struct objfile *); static int -read_member_functions (struct field_info *, const char **, struct type *, +read_member_functions (struct stab_field_info *, const char **, struct type *, struct objfile *); static int -read_struct_fields (struct field_info *, const char **, struct type *, +read_struct_fields (struct stab_field_info *, const char **, struct type *, struct objfile *); static int -read_baseclasses (struct field_info *, const char **, struct type *, +read_baseclasses (struct stab_field_info *, const char **, struct type *, struct objfile *); static int -read_tilde_fields (struct field_info *, const char **, struct type *, +read_tilde_fields (struct stab_field_info *, const char **, struct type *, struct objfile *); -static int attach_fn_fields_to_type (struct field_info *, struct type *); +static int attach_fn_fields_to_type (struct stab_field_info *, struct type *); -static int attach_fields_to_type (struct field_info *, struct type *, +static int attach_fields_to_type (struct stab_field_info *, struct type *, struct objfile *); static struct type *read_struct_type (const char **, struct type *, @@ -149,7 +160,7 @@ static struct field *read_args (const char **, int, struct objfile *, static void add_undefined_type (struct type *, int[2]); static int -read_cpp_abbrev (struct field_info *, const char **, struct type *, +read_cpp_abbrev (struct stab_field_info *, const char **, struct type *, struct objfile *); static const char *find_name_end (const char *name); @@ -164,21 +175,20 @@ static const char vb_name[] = "_vb$"; static void invalid_cpp_abbrev_complaint (const char *arg1) { - complaint (&symfile_complaints, _("invalid C++ abbreviation `%s'"), arg1); + complaint (_("invalid C++ abbreviation `%s'"), arg1); } 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"), + complaint (_("bad register number %d (max %d) in symbol %s"), regnum, num_regs - 1, sym); } static void stabs_general_complaint (const char *arg1) { - complaint (&symfile_complaints, "%s", arg1); + complaint ("%s", arg1); } /* Make a list of forward references which haven't been defined. */ @@ -249,8 +259,7 @@ dbx_lookup_type (int typenums[2], struct objfile *objfile) if (filenum < 0 || filenum >= n_this_object_header_files) { - complaint (&symfile_complaints, - _("Invalid symbol data: type number " + complaint (_("Invalid symbol data: type number " "(%d,%d) out of range at symtab pos %d."), filenum, index, symnum); goto error_return; @@ -417,9 +426,8 @@ patch_block_stabs (struct pending *symbols, struct pending_stabs *stabs, sym = allocate_symbol (objfile); SYMBOL_DOMAIN (sym) = VAR_DOMAIN; SYMBOL_ACLASS_INDEX (sym) = LOC_OPTIMIZED_OUT; - SYMBOL_SET_LINKAGE_NAME - (sym, (char *) obstack_copy0 (&objfile->objfile_obstack, - name, pp - name)); + sym->set_linkage_name + (obstack_strndup (&objfile->objfile_obstack, name, pp - name)); pp += 2; if (*(pp - 1) == 'F' || *(pp - 1) == 'f') { @@ -433,7 +441,7 @@ patch_block_stabs (struct pending *symbols, struct pending_stabs *stabs, { SYMBOL_TYPE (sym) = read_type (&pp, objfile); } - add_symbol_to_list (sym, &global_symbols); + add_symbol_to_list (sym, get_global_symbols ()); } else { @@ -617,14 +625,10 @@ stab_reg_to_regnum (struct symbol *sym, struct gdbarch *gdbarch) { int regno = gdbarch_stab_reg_to_regnum (gdbarch, SYMBOL_VALUE (sym)); - if (regno < 0 - || regno >= (gdbarch_num_regs (gdbarch) - + gdbarch_num_pseudo_regs (gdbarch))) + if (regno < 0 || regno >= gdbarch_num_cooked_regs (gdbarch)) { - reg_value_complaint (regno, - gdbarch_num_regs (gdbarch) - + gdbarch_num_pseudo_regs (gdbarch), - SYMBOL_PRINT_NAME (sym)); + reg_value_complaint (regno, gdbarch_num_cooked_regs (gdbarch), + sym->print_name ()); regno = gdbarch_sp_regnum (gdbarch); /* Known safe, though useless. */ } @@ -673,7 +677,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, p = strchr (p, ':'); if (p == NULL) { - complaint (&symfile_complaints, + complaint ( _("Bad stabs string '%s'"), string); return NULL; } @@ -696,7 +700,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_LINE (sym) = 0; /* unknown */ } - SYMBOL_SET_LANGUAGE (sym, current_subfile->language, + SYMBOL_SET_LANGUAGE (sym, get_current_subfile ()->language, &objfile->objfile_obstack); if (is_cplus_marker (string[0])) @@ -705,14 +709,14 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, switch (string[1]) { case 't': - SYMBOL_SET_LINKAGE_NAME (sym, "this"); + sym->set_linkage_name ("this"); break; case 'v': /* $vtbl_ptr_type */ goto normal; case 'e': - SYMBOL_SET_LINKAGE_NAME (sym, "eh_throw"); + sym->set_linkage_name ("eh_throw"); break; case '_': @@ -726,7 +730,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, /* fall through */ default: - complaint (&symfile_complaints, _("Unknown C++ symbol name `%s'"), + complaint (_("Unknown C++ symbol name `%s'"), string); goto normal; /* Do *something* with it. */ } @@ -736,7 +740,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, normal: std::string new_name; - if (SYMBOL_LANGUAGE (sym) == language_cplus) + if (sym->language () == language_cplus) { char *name = (char *) alloca (p - string + 1); @@ -747,14 +751,16 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, if (!new_name.empty ()) { SYMBOL_SET_NAMES (sym, - new_name.c_str (), new_name.length (), + new_name, 1, objfile); } else - SYMBOL_SET_NAMES (sym, string, p - string, 1, objfile); + SYMBOL_SET_NAMES (sym, gdb::string_view (string, p - string), true, + objfile); - if (SYMBOL_LANGUAGE (sym) == language_cplus) - cp_scan_for_anonymous_namespaces (sym, objfile); + if (sym->language () == language_cplus) + cp_scan_for_anonymous_namespaces (get_buildsym_compunit (), sym, + objfile); } p++; @@ -790,7 +796,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_ACLASS_INDEX (sym) = LOC_CONST; SYMBOL_TYPE (sym) = error_type (&p, objfile); SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &file_symbols); + add_symbol_to_list (sym, get_file_symbols ()); return sym; } ++p; @@ -849,7 +855,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_ACLASS_INDEX (sym) = LOC_CONST; SYMBOL_TYPE (sym) = error_type (&p, objfile); SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &file_symbols); + add_symbol_to_list (sym, get_file_symbols ()); return sym; } @@ -874,7 +880,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_ACLASS_INDEX (sym) = LOC_CONST; SYMBOL_TYPE (sym) = error_type (&p, objfile); SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &file_symbols); + add_symbol_to_list (sym, get_file_symbols ()); return sym; } @@ -929,7 +935,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, } } SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &file_symbols); + add_symbol_to_list (sym, get_file_symbols ()); return sym; case 'C': @@ -937,8 +943,8 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_TYPE (sym) = read_type (&p, objfile); SYMBOL_ACLASS_INDEX (sym) = LOC_LABEL; SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - SYMBOL_VALUE_ADDRESS (sym) = valu; - add_symbol_to_list (sym, &local_symbols); + SET_SYMBOL_VALUE_ADDRESS (sym, valu); + add_symbol_to_list (sym, get_local_symbols ()); break; case 'f': @@ -946,7 +952,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_TYPE (sym) = read_type (&p, objfile); SYMBOL_ACLASS_INDEX (sym) = LOC_BLOCK; SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &file_symbols); + add_symbol_to_list (sym, get_file_symbols ()); /* fall into process_function_types. */ process_function_types: @@ -1017,7 +1023,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_TYPE (sym) = read_type (&p, objfile); SYMBOL_ACLASS_INDEX (sym) = LOC_BLOCK; SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &global_symbols); + add_symbol_to_list (sym, get_global_symbols ()); goto process_function_types; case 'G': @@ -1032,13 +1038,13 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, Symbol references don't have valid names and wont't match up with minimal symbols when the global_sym_chain is relocated. We'll fixup symbol references when we fixup the defining symbol. */ - if (SYMBOL_LINKAGE_NAME (sym) && SYMBOL_LINKAGE_NAME (sym)[0] != '#') + if (sym->linkage_name () && sym->linkage_name ()[0] != '#') { - i = hashname (SYMBOL_LINKAGE_NAME (sym)); + i = hashname (sym->linkage_name ()); SYMBOL_VALUE_CHAIN (sym) = global_sym_chain[i]; global_sym_chain[i] = sym; } - add_symbol_to_list (sym, &global_symbols); + add_symbol_to_list (sym, get_global_symbols ()); break; /* This case is faked by a conditional above, @@ -1050,7 +1056,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_ACLASS_INDEX (sym) = LOC_LOCAL; SYMBOL_VALUE (sym) = valu; SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &local_symbols); + add_symbol_to_list (sym, get_local_symbols ()); break; case 'p': @@ -1071,7 +1077,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_VALUE (sym) = valu; SYMBOL_DOMAIN (sym) = VAR_DOMAIN; SYMBOL_IS_ARGUMENT (sym) = 1; - add_symbol_to_list (sym, &local_symbols); + add_symbol_to_list (sym, get_local_symbols ()); if (gdbarch_byte_order (gdbarch) != BFD_ENDIAN_BIG) { @@ -1100,6 +1106,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, } break; } + /* Fall through. */ case 'P': /* acc seems to use P to declare the prototypes of functions that @@ -1119,7 +1126,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_IS_ARGUMENT (sym) = 1; SYMBOL_VALUE (sym) = valu; SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &local_symbols); + add_symbol_to_list (sym, get_local_symbols ()); break; case 'r': @@ -1134,8 +1141,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, the same name to represent an argument passed in a register. GCC uses 'P' for the same case. So if we find such a symbol pair we combine it into one 'P' symbol. - For Sun cc we need to do this regardless of - stabs_argument_has_addr, because the compiler puts out + For Sun cc we need to do this regardless of stabs_argument_has_addr, because the compiler puts out the 'p' symbol even if it never saves the argument onto the stack. @@ -1150,6 +1156,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, but this case is considered pathological and causes a warning from a decent compiler. */ + struct pending *local_symbols = *get_local_symbols (); if (local_symbols && local_symbols->nsyms > 0 && gdbarch_stabs_argument_has_addr (gdbarch, SYMBOL_TYPE (sym))) @@ -1159,8 +1166,8 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, prev_sym = local_symbols->symbol[local_symbols->nsyms - 1]; if ((SYMBOL_CLASS (prev_sym) == LOC_REF_ARG || SYMBOL_CLASS (prev_sym) == LOC_ARG) - && strcmp (SYMBOL_LINKAGE_NAME (prev_sym), - SYMBOL_LINKAGE_NAME (sym)) == 0) + && strcmp (prev_sym->linkage_name (), + sym->linkage_name ()) == 0) { SYMBOL_ACLASS_INDEX (prev_sym) = stab_register_index; /* Use the type from the LOC_REGISTER; that is the type @@ -1171,37 +1178,36 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, break; } } - add_symbol_to_list (sym, &local_symbols); + add_symbol_to_list (sym, get_local_symbols ()); } else - add_symbol_to_list (sym, &file_symbols); + add_symbol_to_list (sym, get_file_symbols ()); break; case 'S': /* Static symbol at top level of file. */ SYMBOL_TYPE (sym) = read_type (&p, objfile); SYMBOL_ACLASS_INDEX (sym) = LOC_STATIC; - SYMBOL_VALUE_ADDRESS (sym) = valu; + SET_SYMBOL_VALUE_ADDRESS (sym, valu); if (gdbarch_static_transform_name_p (gdbarch) - && gdbarch_static_transform_name (gdbarch, - SYMBOL_LINKAGE_NAME (sym)) - != SYMBOL_LINKAGE_NAME (sym)) + && gdbarch_static_transform_name (gdbarch, sym->linkage_name ()) + != sym->linkage_name ()) { struct bound_minimal_symbol msym; - msym = lookup_minimal_symbol (SYMBOL_LINKAGE_NAME (sym), - NULL, objfile); + msym = lookup_minimal_symbol (sym->linkage_name (), NULL, objfile); if (msym.minsym != NULL) { const char *new_name = gdbarch_static_transform_name - (gdbarch, SYMBOL_LINKAGE_NAME (sym)); + (gdbarch, sym->linkage_name ()); - SYMBOL_SET_LINKAGE_NAME (sym, new_name); - SYMBOL_VALUE_ADDRESS (sym) = BMSYMBOL_VALUE_ADDRESS (msym); + sym->set_linkage_name (new_name); + SET_SYMBOL_VALUE_ADDRESS (sym, + BMSYMBOL_VALUE_ADDRESS (msym)); } } SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &file_symbols); + add_symbol_to_list (sym, get_file_symbols ()); break; case 't': @@ -1219,7 +1225,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, This is important to do, because of forward references: The cleanup of undefined types stored in undef_types only uses STRUCT_DOMAIN symbols to perform the replacement. */ - synonym = (SYMBOL_LANGUAGE (sym) == language_ada && p[-2] != 'T'); + synonym = (sym->language () == language_ada && p[-2] != 'T'); /* Typedef */ SYMBOL_TYPE (sym) = read_type (&p, objfile); @@ -1246,18 +1252,13 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, for (j = TYPE_N_BASECLASSES (SYMBOL_TYPE (sym)) - 1; j >= 0; j--) if (TYPE_BASECLASS_NAME (SYMBOL_TYPE (sym), j) == 0) TYPE_BASECLASS_NAME (SYMBOL_TYPE (sym), j) = - type_name_no_tag (TYPE_BASECLASS (SYMBOL_TYPE (sym), j)); + TYPE_NAME (TYPE_BASECLASS (SYMBOL_TYPE (sym), j)); } if (TYPE_NAME (SYMBOL_TYPE (sym)) == NULL) { - /* gcc-2.6 or later (when using -fvtable-thunks) - emits a unique named type for a vtable entry. - Some gdb code depends on that specific name. */ - extern const char vtbl_ptr_name[]; - if ((TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_PTR - && strcmp (SYMBOL_LINKAGE_NAME (sym), vtbl_ptr_name)) + && strcmp (sym->linkage_name (), vtbl_ptr_name)) || TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_FUNC) { /* If we are giving a name to a type such as "pointer to @@ -1296,16 +1297,16 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, */ /* Pascal accepts names for pointer types. */ - if (current_subfile->language == language_pascal) + if (get_current_subfile ()->language == language_pascal) { - TYPE_NAME (SYMBOL_TYPE (sym)) = SYMBOL_LINKAGE_NAME (sym); + TYPE_NAME (SYMBOL_TYPE (sym)) = sym->linkage_name (); } } else - TYPE_NAME (SYMBOL_TYPE (sym)) = SYMBOL_LINKAGE_NAME (sym); + TYPE_NAME (SYMBOL_TYPE (sym)) = sym->linkage_name (); } - add_symbol_to_list (sym, &file_symbols); + add_symbol_to_list (sym, get_file_symbols ()); if (synonym) { @@ -1318,10 +1319,9 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_DOMAIN (struct_sym) = STRUCT_DOMAIN; if (TYPE_NAME (SYMBOL_TYPE (sym)) == 0) TYPE_NAME (SYMBOL_TYPE (sym)) - = obconcat (&objfile->objfile_obstack, - SYMBOL_LINKAGE_NAME (sym), + = obconcat (&objfile->objfile_obstack, sym->linkage_name (), (char *) NULL); - add_symbol_to_list (struct_sym, &file_symbols); + add_symbol_to_list (struct_sym, get_file_symbols ()); } break; @@ -1344,12 +1344,11 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_ACLASS_INDEX (sym) = LOC_TYPEDEF; SYMBOL_VALUE (sym) = valu; SYMBOL_DOMAIN (sym) = STRUCT_DOMAIN; - if (TYPE_TAG_NAME (SYMBOL_TYPE (sym)) == 0) - TYPE_TAG_NAME (SYMBOL_TYPE (sym)) - = obconcat (&objfile->objfile_obstack, - SYMBOL_LINKAGE_NAME (sym), + if (TYPE_NAME (SYMBOL_TYPE (sym)) == 0) + TYPE_NAME (SYMBOL_TYPE (sym)) + = obconcat (&objfile->objfile_obstack, sym->linkage_name (), (char *) NULL); - add_symbol_to_list (sym, &file_symbols); + add_symbol_to_list (sym, get_file_symbols ()); if (synonym) { @@ -1362,10 +1361,9 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_DOMAIN (typedef_sym) = VAR_DOMAIN; if (TYPE_NAME (SYMBOL_TYPE (sym)) == 0) TYPE_NAME (SYMBOL_TYPE (sym)) - = obconcat (&objfile->objfile_obstack, - SYMBOL_LINKAGE_NAME (sym), + = obconcat (&objfile->objfile_obstack, sym->linkage_name (), (char *) NULL); - add_symbol_to_list (typedef_sym, &file_symbols); + add_symbol_to_list (typedef_sym, get_file_symbols ()); } break; @@ -1373,27 +1371,25 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, /* Static symbol of local scope. */ SYMBOL_TYPE (sym) = read_type (&p, objfile); SYMBOL_ACLASS_INDEX (sym) = LOC_STATIC; - SYMBOL_VALUE_ADDRESS (sym) = valu; + SET_SYMBOL_VALUE_ADDRESS (sym, valu); if (gdbarch_static_transform_name_p (gdbarch) - && gdbarch_static_transform_name (gdbarch, - SYMBOL_LINKAGE_NAME (sym)) - != SYMBOL_LINKAGE_NAME (sym)) + && gdbarch_static_transform_name (gdbarch, sym->linkage_name ()) + != sym->linkage_name ()) { struct bound_minimal_symbol msym; - msym = lookup_minimal_symbol (SYMBOL_LINKAGE_NAME (sym), - NULL, objfile); + msym = lookup_minimal_symbol (sym->linkage_name (), NULL, objfile); if (msym.minsym != NULL) { const char *new_name = gdbarch_static_transform_name - (gdbarch, SYMBOL_LINKAGE_NAME (sym)); + (gdbarch, sym->linkage_name ()); - SYMBOL_SET_LINKAGE_NAME (sym, new_name); - SYMBOL_VALUE_ADDRESS (sym) = BMSYMBOL_VALUE_ADDRESS (msym); + sym->set_linkage_name (new_name); + SET_SYMBOL_VALUE_ADDRESS (sym, BMSYMBOL_VALUE_ADDRESS (msym)); } } SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &local_symbols); + add_symbol_to_list (sym, get_local_symbols ()); break; case 'v': @@ -1403,7 +1399,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_IS_ARGUMENT (sym) = 1; SYMBOL_VALUE (sym) = valu; SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &local_symbols); + add_symbol_to_list (sym, get_local_symbols ()); break; case 'a': @@ -1413,7 +1409,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_IS_ARGUMENT (sym) = 1; SYMBOL_VALUE (sym) = valu; SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &local_symbols); + add_symbol_to_list (sym, get_local_symbols ()); break; case 'X': @@ -1425,7 +1421,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_ACLASS_INDEX (sym) = LOC_LOCAL; SYMBOL_VALUE (sym) = valu; SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &local_symbols); + add_symbol_to_list (sym, get_local_symbols ()); break; default: @@ -1433,7 +1429,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, SYMBOL_ACLASS_INDEX (sym) = LOC_CONST; SYMBOL_VALUE (sym) = 0; SYMBOL_DOMAIN (sym) = VAR_DOMAIN; - add_symbol_to_list (sym, &file_symbols); + add_symbol_to_list (sym, get_file_symbols ()); break; } @@ -1489,8 +1485,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, static struct type * error_type (const char **pp, struct objfile *objfile) { - complaint (&symfile_complaints, - _("couldn't parse type; debugger out of date?")); + complaint (_("couldn't parse type; debugger out of date?")); while (1) { /* Skip to end of symbol. */ @@ -1610,8 +1605,7 @@ again: { /* Complain and keep going, so compilers can invent new cross-reference types. */ - complaint (&symfile_complaints, - _("Unrecognized cross-reference type `%c'"), + complaint (_("Unrecognized cross-reference type `%c'"), (*pp)[0]); code = TYPE_CODE_STRUCT; break; @@ -1640,7 +1634,7 @@ again: return error_type (pp, objfile); } type_name = NULL; - if (current_subfile->language == language_cplus) + if (get_current_subfile ()->language == language_cplus) { char *name = (char *) alloca (p - *pp + 1); @@ -1649,12 +1643,8 @@ again: std::string new_name = cp_canonicalize_string (name); if (!new_name.empty ()) - { - type_name - = (char *) obstack_copy0 (&objfile->objfile_obstack, - new_name.c_str (), - new_name.length ()); - } + type_name = obstack_strdup (&objfile->objfile_obstack, + new_name); } if (type_name == NULL) { @@ -1677,7 +1667,7 @@ again: type, rather than allocating a new one. This saves some memory. */ - for (ppt = file_symbols; ppt; ppt = ppt->next) + for (ppt = *get_file_symbols (); ppt; ppt = ppt->next) for (i = 0; i < ppt->nsyms; i++) { struct symbol *sym = ppt->symbol[i]; @@ -1685,7 +1675,7 @@ again: if (SYMBOL_CLASS (sym) == LOC_TYPEDEF && SYMBOL_DOMAIN (sym) == STRUCT_DOMAIN && (TYPE_CODE (SYMBOL_TYPE (sym)) == code) - && strcmp (SYMBOL_LINKAGE_NAME (sym), type_name) == 0) + && strcmp (sym->linkage_name (), type_name) == 0) { obstack_free (&objfile->objfile_obstack, type_name); type = SYMBOL_TYPE (sym); @@ -1702,7 +1692,7 @@ again: type. */ type = dbx_alloc_type (typenums, objfile); TYPE_CODE (type) = code; - TYPE_TAG_NAME (type) = type_name; + TYPE_NAME (type) = type_name; INIT_CPLUS_SPECIFIC (type); TYPE_STUB (type) = 1; @@ -1767,7 +1757,6 @@ again: copies of a type otherwise. */ replace_type (type, xtype); TYPE_NAME (type) = NULL; - TYPE_TAG_NAME (type) = NULL; } else { @@ -1841,8 +1830,7 @@ again: ++*pp; else { - complaint (&symfile_complaints, - _("Prototyped function type didn't " + complaint (_("Prototyped function type didn't " "end arguments with `#':\n%s"), type_start); } @@ -1954,8 +1942,7 @@ again: (*pp)++; return_type = read_type (pp, objfile); if (*(*pp)++ != ';') - complaint (&symfile_complaints, - _("invalid (minimal) member type " + complaint (_("invalid (minimal) member type " "data format at symtab pos %d."), symnum); type = allocate_stub_method (return_type); @@ -2046,7 +2033,7 @@ again: case 'S': /* Set type */ type1 = read_type (pp, objfile); - type = create_set_type ((struct type *) NULL, type1); + type = create_set_type (NULL, type1); if (typenums[0] != -1) *dbx_lookup_type (typenums, objfile) = type; break; @@ -2073,13 +2060,14 @@ again: /* RS/6000 xlc/dbx combination uses a set of builtin types, starting from -1. Return the proper type node for a given builtin type number. */ -static const struct objfile_data *rs6000_builtin_type_data; +static const struct objfile_key> + rs6000_builtin_type_data; static struct type * rs6000_builtin_type (int typenum, struct objfile *objfile) { - struct type **negative_types - = (struct type **) objfile_data (objfile, rs6000_builtin_type_data); + struct type **negative_types = rs6000_builtin_type_data.get (objfile); /* We recognize types numbered from -NUMBER_RECOGNIZED to -1. */ #define NUMBER_RECOGNIZED 34 @@ -2087,7 +2075,7 @@ rs6000_builtin_type (int typenum, struct objfile *objfile) if (typenum >= 0 || typenum < -NUMBER_RECOGNIZED) { - complaint (&symfile_complaints, _("Unknown builtin type %d"), typenum); + complaint (_("Unknown builtin type %d"), typenum); return objfile_type (objfile)->builtin_error; } @@ -2096,7 +2084,7 @@ rs6000_builtin_type (int typenum, struct objfile *objfile) /* This includes an empty slot for type number -0. */ negative_types = OBSTACK_CALLOC (&objfile->objfile_obstack, NUMBER_RECOGNIZED + 1, struct type *); - set_objfile_data (objfile, rs6000_builtin_type_data, negative_types); + rs6000_builtin_type_data.set (objfile, negative_types); } if (negative_types[-typenum] != NULL) @@ -2253,8 +2241,7 @@ stabs_method_name_from_physname (const char *physname) if (method_name == NULL) { - complaint (&symfile_complaints, - _("Method has bad physname %s\n"), physname); + complaint (_("Method has bad physname %s\n"), physname); return NULL; } @@ -2277,7 +2264,7 @@ stabs_method_name_from_physname (const char *physname) Returns 1 for success, 0 for failure. */ static int -read_member_functions (struct field_info *fip, const char **pp, +read_member_functions (struct stab_field_info *fip, const char **pp, struct type *type, struct objfile *objfile) { int nfn_fields = 0; @@ -2317,8 +2304,7 @@ read_member_functions (struct field_info *fip, const char **pp, look_ahead_type = NULL; length = 0; - new_fnlist = XCNEW (struct next_fnfieldlist); - make_cleanup (xfree, new_fnlist); + new_fnlist = OBSTACK_ZALLOC (&fip->obstack, struct next_fnfieldlist); if ((*pp)[0] == 'o' && (*pp)[1] == 'p' && is_cplus_marker ((*pp)[2])) { @@ -2357,8 +2343,7 @@ read_member_functions (struct field_info *fip, const char **pp, do { - new_sublist = XCNEW (struct next_fnfield); - make_cleanup (xfree, new_sublist); + new_sublist = OBSTACK_ZALLOC (&fip->obstack, struct next_fnfield); /* Check for and handle cretinous dbx symbol name continuation! */ if (look_ahead_type == NULL) @@ -2445,8 +2430,7 @@ read_member_functions (struct field_info *fip, const char **pp, case '.': break; default: - complaint (&symfile_complaints, - _("const/volatile indicator missing, got '%c'"), + complaint (_("const/volatile indicator missing, got '%c'"), **pp); break; } @@ -2529,8 +2513,7 @@ read_member_functions (struct field_info *fip, const char **pp, default: /* error */ - complaint (&symfile_complaints, - _("member function type missing, got '%c'"), + complaint (_("member function type missing, got '%c'"), (*pp)[-1]); /* Normal member function. */ /* Fall through. */ @@ -2562,7 +2545,6 @@ read_member_functions (struct field_info *fip, const char **pp, } else { - int has_stub = 0; int has_destructor = 0, has_other = 0; int is_v3 = 0; struct next_fnfield *tmp_sublist; @@ -2626,8 +2608,6 @@ read_member_functions (struct field_info *fip, const char **pp, tmp_sublist = sublist; while (tmp_sublist != NULL) { - if (tmp_sublist->fn_field.is_stub) - has_stub = 1; if (tmp_sublist->fn_field.physname[0] == '_' && tmp_sublist->fn_field.physname[1] == 'Z') is_v3 = 1; @@ -2647,8 +2627,8 @@ read_member_functions (struct field_info *fip, const char **pp, /* Create a new fn_fieldlist for the destructors. */ - destr_fnlist = XCNEW (struct next_fnfieldlist); - make_cleanup (xfree, destr_fnlist); + destr_fnlist = OBSTACK_ZALLOC (&fip->obstack, + struct next_fnfieldlist); destr_fnlist->fn_fieldlist.name = obconcat (&objfile->objfile_obstack, "~", @@ -2714,29 +2694,9 @@ read_member_functions (struct field_info *fip, const char **pp, "~", main_fn_name, (char *)NULL); xfree (main_fn_name); } - else if (!has_stub) - { - char dem_opname[256]; - int ret; - - ret = cplus_demangle_opname (new_fnlist->fn_fieldlist.name, - dem_opname, DMGL_ANSI); - if (!ret) - ret = cplus_demangle_opname (new_fnlist->fn_fieldlist.name, - dem_opname, 0); - if (ret) - new_fnlist->fn_fieldlist.name - = ((const char *) - obstack_copy0 (&objfile->objfile_obstack, dem_opname, - strlen (dem_opname))); - xfree (main_fn_name); - } - new_fnlist->fn_fieldlist.fn_fields = (struct fn_field *) - obstack_alloc (&objfile->objfile_obstack, - sizeof (struct fn_field) * length); - memset (new_fnlist->fn_fieldlist.fn_fields, 0, - sizeof (struct fn_field) * length); + new_fnlist->fn_fieldlist.fn_fields + = OBSTACK_CALLOC (&objfile->objfile_obstack, length, fn_field); for (i = length; (i--, sublist); sublist = sublist->next) { new_fnlist->fn_fieldlist.fn_fields[i] = sublist->fn_field; @@ -2768,8 +2728,8 @@ read_member_functions (struct field_info *fip, const char **pp, keep parsing and it's time for error_type(). */ static int -read_cpp_abbrev (struct field_info *fip, const char **pp, struct type *type, - struct objfile *objfile) +read_cpp_abbrev (struct stab_field_info *fip, const char **pp, + struct type *type, struct objfile *objfile) { const char *p; const char *name; @@ -2794,7 +2754,7 @@ read_cpp_abbrev (struct field_info *fip, const char **pp, struct type *type, switch (cpp_abbrev) { case 'f': /* $vf -- a virtual function table pointer */ - name = type_name_no_tag (context); + name = TYPE_NAME (context); if (name == NULL) { name = ""; @@ -2804,11 +2764,10 @@ read_cpp_abbrev (struct field_info *fip, const char **pp, struct type *type, break; case 'b': /* $vb -- a virtual bsomethingorother */ - name = type_name_no_tag (context); + name = TYPE_NAME (context); if (name == NULL) { - complaint (&symfile_complaints, - _("C++ abbreviated type name " + complaint (_("C++ abbreviated type name " "unknown at symtab pos %d"), symnum); name = "FOO"; @@ -2864,13 +2823,14 @@ read_cpp_abbrev (struct field_info *fip, const char **pp, struct type *type, } static void -read_one_struct_field (struct field_info *fip, const char **pp, const char *p, - struct type *type, struct objfile *objfile) +read_one_struct_field (struct stab_field_info *fip, const char **pp, + const char *p, struct type *type, + struct objfile *objfile) { struct gdbarch *gdbarch = get_objfile_arch (objfile); fip->list->field.name - = (const char *) obstack_copy0 (&objfile->objfile_obstack, *pp, p - *pp); + = obstack_strndup (&objfile->objfile_obstack, *pp, p - *pp); *pp = p + 1; /* This means we have a visibility for a field coming. */ @@ -3007,8 +2967,8 @@ read_one_struct_field (struct field_info *fip, const char **pp, const char *p, Returns 1 for success, 0 for failure. */ static int -read_struct_fields (struct field_info *fip, const char **pp, struct type *type, - struct objfile *objfile) +read_struct_fields (struct stab_field_info *fip, const char **pp, + struct type *type, struct objfile *objfile) { const char *p; struct nextfield *newobj; @@ -3027,8 +2987,7 @@ read_struct_fields (struct field_info *fip, const char **pp, struct type *type, { STABS_CONTINUE (pp, objfile); /* Get space to record the next field's data. */ - newobj = XCNEW (struct nextfield); - make_cleanup (xfree, newobj); + newobj = OBSTACK_ZALLOC (&fip->obstack, struct nextfield); newobj->next = fip->list; fip->list = newobj; @@ -3105,8 +3064,8 @@ read_struct_fields (struct field_info *fip, const char **pp, struct type *type, static int -read_baseclasses (struct field_info *fip, const char **pp, struct type *type, - struct objfile *objfile) +read_baseclasses (struct stab_field_info *fip, const char **pp, + struct type *type, struct objfile *objfile) { int i; struct nextfield *newobj; @@ -3149,8 +3108,7 @@ read_baseclasses (struct field_info *fip, const char **pp, struct type *type, for (i = 0; i < TYPE_N_BASECLASSES (type); i++) { - newobj = XCNEW (struct nextfield); - make_cleanup (xfree, newobj); + newobj = OBSTACK_ZALLOC (&fip->obstack, struct nextfield); newobj->next = fip->list; fip->list = newobj; @@ -3169,8 +3127,7 @@ read_baseclasses (struct field_info *fip, const char **pp, struct type *type, default: /* Unknown character. Complain and treat it as non-virtual. */ { - complaint (&symfile_complaints, - _("Unknown virtual character `%c' for baseclass"), + complaint (_("Unknown virtual character `%c' for baseclass"), **pp); } } @@ -3187,8 +3144,7 @@ read_baseclasses (struct field_info *fip, const char **pp, struct type *type, /* Bad visibility format. Complain and treat it as public. */ { - complaint (&symfile_complaints, - _("Unknown visibility `%c' for baseclass"), + complaint (_("Unknown visibility `%c' for baseclass"), newobj->visibility); newobj->visibility = VISIBILITY_PUBLIC; } @@ -3211,7 +3167,7 @@ read_baseclasses (struct field_info *fip, const char **pp, struct type *type, field's name. */ newobj->field.type = read_type (pp, objfile); - newobj->field.name = type_name_no_tag (newobj->field.type); + newobj->field.name = TYPE_NAME (newobj->field.type); /* Skip trailing ';' and bump count of number of fields seen. */ if (**pp == ';') @@ -3231,8 +3187,8 @@ read_baseclasses (struct field_info *fip, const char **pp, struct type *type, so we can look for the vptr base class info. */ static int -read_tilde_fields (struct field_info *fip, const char **pp, struct type *type, - struct objfile *objfile) +read_tilde_fields (struct stab_field_info *fip, const char **pp, + struct type *type, struct objfile *objfile) { const char *p; @@ -3296,8 +3252,7 @@ read_tilde_fields (struct field_info *fip, const char **pp, struct type *type, } } /* Virtual function table field not found. */ - complaint (&symfile_complaints, - _("virtual function table pointer " + complaint (_("virtual function table pointer " "not found when defining class `%s'"), TYPE_NAME (type)); return 0; @@ -3315,7 +3270,7 @@ read_tilde_fields (struct field_info *fip, const char **pp, struct type *type, } static int -attach_fn_fields_to_type (struct field_info *fip, struct type *type) +attach_fn_fields_to_type (struct stab_field_info *fip, struct type *type) { int n; @@ -3334,7 +3289,7 @@ attach_fn_fields_to_type (struct field_info *fip, struct type *type) for this class's virtual functions. */ static int -attach_fields_to_type (struct field_info *fip, struct type *type, +attach_fields_to_type (struct stab_field_info *fip, struct type *type, struct objfile *objfile) { int nfields = 0; @@ -3409,8 +3364,7 @@ attach_fields_to_type (struct field_info *fip, struct type *type, default: /* Unknown visibility. Complain and treat it as public. */ { - complaint (&symfile_complaints, - _("Unknown visibility `%c' for field"), + complaint (_("Unknown visibility `%c' for field"), fip->list->visibility); } break; @@ -3429,9 +3383,9 @@ complain_about_struct_wipeout (struct type *type) const char *name = ""; const char *kind = ""; - if (TYPE_TAG_NAME (type)) + if (TYPE_NAME (type)) { - name = TYPE_TAG_NAME (type); + name = TYPE_NAME (type); switch (TYPE_CODE (type)) { case TYPE_CODE_STRUCT: kind = "struct "; break; @@ -3440,19 +3394,13 @@ complain_about_struct_wipeout (struct type *type) default: kind = ""; } } - else if (TYPE_NAME (type)) - { - name = TYPE_NAME (type); - kind = ""; - } else { name = ""; kind = ""; } - complaint (&symfile_complaints, - _("struct/union type gets multiply defined: %s%s"), kind, name); + complaint (_("struct/union type gets multiply defined: %s%s"), kind, name); } /* Set the length for all variants of a same main_type, which are @@ -3510,11 +3458,7 @@ static struct type * read_struct_type (const char **pp, struct type *type, enum type_code type_code, struct objfile *objfile) { - struct cleanup *back_to; - struct field_info fi; - - fi.list = NULL; - fi.fnlist = NULL; + struct stab_field_info fi; /* When describing struct/union/class types in stabs, G++ always drops all qualifications from the name. So if you've got: @@ -3536,8 +3480,6 @@ read_struct_type (const char **pp, struct type *type, enum type_code type_code, return type; } - back_to = make_cleanup (null_cleanup, 0); - INIT_CPLUS_SPECIFIC (type); TYPE_CODE (type) = type_code; TYPE_STUB (type) = 0; @@ -3549,10 +3491,7 @@ read_struct_type (const char **pp, struct type *type, enum type_code type_code, TYPE_LENGTH (type) = read_huge_number (pp, 0, &nbits, 0); if (nbits != 0) - { - do_cleanups (back_to); - return error_type (pp, objfile); - } + return error_type (pp, objfile); set_length_in_type_chain (type); } @@ -3571,7 +3510,6 @@ read_struct_type (const char **pp, struct type *type, enum type_code type_code, type = error_type (pp, objfile); } - do_cleanups (back_to); return (type); } @@ -3632,7 +3570,7 @@ read_array_type (const char **pp, struct type *type, } range_type = - create_static_range_type ((struct type *) NULL, index_type, lower, upper); + create_static_range_type (NULL, index_type, lower, upper); type = create_array_type (type, element_type, range_type); return type; @@ -3664,10 +3602,10 @@ read_enum_type (const char **pp, struct type *type, to be file-scope, between N_FN entries, using N_LSYM. What's a mother to do? For now, force all enum values to file scope. */ if (within_function) - symlist = &local_symbols; + symlist = get_local_symbols (); else #endif - symlist = &file_symbols; + symlist = get_file_symbols (); osyms = *symlist; o_nsyms = osyms ? osyms->nsyms : 0; @@ -3692,15 +3630,15 @@ read_enum_type (const char **pp, struct type *type, p = *pp; while (*p != ':') p++; - name = (char *) obstack_copy0 (&objfile->objfile_obstack, *pp, p - *pp); + name = obstack_strndup (&objfile->objfile_obstack, *pp, p - *pp); *pp = p + 1; n = read_huge_number (pp, ',', &nbits, 0); if (nbits != 0) return error_type (pp, objfile); sym = allocate_symbol (objfile); - SYMBOL_SET_LINKAGE_NAME (sym, name); - SYMBOL_SET_LANGUAGE (sym, current_subfile->language, + sym->set_linkage_name (name); + SYMBOL_SET_LANGUAGE (sym, get_current_subfile ()->language, &objfile->objfile_obstack); SYMBOL_ACLASS_INDEX (sym) = LOC_CONST; SYMBOL_DOMAIN (sym) = VAR_DOMAIN; @@ -3745,7 +3683,7 @@ read_enum_type (const char **pp, struct type *type, struct symbol *xsym = syms->symbol[j]; SYMBOL_TYPE (xsym) = type; - TYPE_FIELD_NAME (type, n) = SYMBOL_LINKAGE_NAME (xsym); + TYPE_FIELD_NAME (type, n) = xsym->linkage_name (); SET_FIELD_ENUMVAL (TYPE_FIELD (type, n), SYMBOL_VALUE (xsym)); TYPE_FIELD_BITSIZE (type, n) = 0; } @@ -3944,7 +3882,7 @@ read_huge_number (const char **pp, int end, int *bits, && len == twos_complement_bits / 3)) { /* Ok, we have enough characters for a signed value, check - for signness by testing if the sign bit is set. */ + for signedness by testing if the sign bit is set. */ sign_bit = (twos_complement_bits % 3 + 2) % 3; c = *p - '0'; if (c & (1 << sign_bit)) @@ -4253,14 +4191,13 @@ handle_true_range: /* Does this actually ever happen? Is that why we are worrying about dealing with it rather than just calling error_type? */ - complaint (&symfile_complaints, - _("base type %d of range type is not defined"), rangenums[1]); + complaint (_("base type %d of range type is not defined"), rangenums[1]); index_type = objfile_type (objfile)->builtin_int; } result_type - = create_static_range_type ((struct type *) NULL, index_type, n2, n3); + = create_static_range_type (NULL, index_type, n2, n3); return (result_type); } @@ -4295,7 +4232,7 @@ read_args (const char **pp, int end, struct objfile *objfile, int *nargsp, have been present ";-16,(0,43)" reference instead. This way the excessive ";" marker prematurely stops the parameters parsing. */ - complaint (&symfile_complaints, _("Invalid (empty) method arguments")); + complaint (_("Invalid (empty) method arguments")); *varargsp = 0; } else if (TYPE_CODE (types[n - 1]) != TYPE_CODE_VOID) @@ -4337,13 +4274,11 @@ common_block_start (const char *name, struct objfile *objfile) { if (common_block_name != NULL) { - complaint (&symfile_complaints, - _("Invalid symbol data: common block within common block")); + complaint (_("Invalid symbol data: common block within common block")); } - common_block = local_symbols; - common_block_i = local_symbols ? local_symbols->nsyms : 0; - common_block_name = (char *) obstack_copy0 (&objfile->objfile_obstack, name, - strlen (name)); + common_block = *get_local_symbols (); + common_block_i = common_block ? common_block->nsyms : 0; + common_block_name = obstack_strdup (&objfile->objfile_obstack, name); } /* Process a N_ECOMM symbol. */ @@ -4364,19 +4299,19 @@ common_block_end (struct objfile *objfile) if (common_block_name == NULL) { - complaint (&symfile_complaints, _("ECOMM symbol unmatched by BCOMM")); + complaint (_("ECOMM symbol unmatched by BCOMM")); return; } sym = allocate_symbol (objfile); /* Note: common_block_name already saved on objfile_obstack. */ - SYMBOL_SET_LINKAGE_NAME (sym, common_block_name); + sym->set_linkage_name (common_block_name); SYMBOL_ACLASS_INDEX (sym) = LOC_BLOCK; /* Now we copy all the symbols which have been defined since the BCOMM. */ /* Copy all the struct pendings before common_block. */ - for (next = local_symbols; + for (next = *get_local_symbols (); next != NULL && next != common_block; next = next->next) { @@ -4397,7 +4332,7 @@ common_block_end (struct objfile *objfile) /* Should we be putting local_symbols back to what it was? Does it matter? */ - i = hashname (SYMBOL_LINKAGE_NAME (sym)); + i = hashname (sym->linkage_name ()); SYMBOL_VALUE_CHAIN (sym) = global_sym_chain[i]; global_sym_chain[i] = sym; common_block_name = NULL; @@ -4417,7 +4352,9 @@ fix_common_block (struct symbol *sym, CORE_ADDR valu) int j; for (j = next->nsyms - 1; j >= 0; j--) - SYMBOL_VALUE_ADDRESS (next->symbol[j]) += valu; + SET_SYMBOL_VALUE_ADDRESS (next->symbol[j], + SYMBOL_VALUE_ADDRESS (next->symbol[j]) + + valu); } } @@ -4477,7 +4414,7 @@ add_undefined_type_1 (struct type *type) static void add_undefined_type (struct type *type, int typenums[2]) { - if (TYPE_TAG_NAME (type) == NULL) + if (TYPE_NAME (type) == NULL) add_undefined_type_noname (type, typenums); else add_undefined_type_1 (type); @@ -4562,14 +4499,14 @@ cleanup_undefined_types_1 (void) struct pending *ppt; int i; /* Name of the type, without "struct" or "union". */ - const char *type_name = TYPE_TAG_NAME (*type); + const char *type_name = TYPE_NAME (*type); if (type_name == NULL) { - complaint (&symfile_complaints, _("need a type name")); + complaint (_("need a type name")); break; } - for (ppt = file_symbols; ppt; ppt = ppt->next) + for (ppt = *get_file_symbols (); ppt; ppt = ppt->next) { for (i = 0; i < ppt->nsyms; i++) { @@ -4581,8 +4518,7 @@ cleanup_undefined_types_1 (void) TYPE_CODE (*type)) && (TYPE_INSTANCE_FLAGS (*type) == TYPE_INSTANCE_FLAGS (SYMBOL_TYPE (sym))) - && strcmp (SYMBOL_LINKAGE_NAME (sym), - type_name) == 0) + && strcmp (sym->linkage_name (), type_name) == 0) replace_type (*type, SYMBOL_TYPE (sym)); } } @@ -4592,8 +4528,7 @@ cleanup_undefined_types_1 (void) default: { - complaint (&symfile_complaints, - _("forward-referenced types left unresolved, " + complaint (_("forward-referenced types left unresolved, " "type code %d."), TYPE_CODE (*type)); } @@ -4604,7 +4539,7 @@ cleanup_undefined_types_1 (void) undef_types_length = 0; } -/* Try to fix all the undefined types we ecountered while processing +/* Try to fix all the undefined types we encountered while processing this unit. */ void @@ -4614,15 +4549,12 @@ cleanup_undefined_stabs_types (struct objfile *objfile) cleanup_undefined_types_noname (objfile); } -/* Scan through all of the global symbols defined in the object file, - assigning values to the debugging symbols that need to be assigned - to. Get these symbols from the minimal symbol table. */ +/* See stabsread.h. */ void scan_file_globals (struct objfile *objfile) { int hash; - struct minimal_symbol *msymbol; struct symbol *sym, *prev; struct objfile *resolve_objfile; @@ -4648,7 +4580,7 @@ scan_file_globals (struct objfile *objfile) if (hash >= HASHSIZE) return; - ALL_OBJFILE_MSYMBOLS (resolve_objfile, msymbol) + for (minimal_symbol *msymbol : resolve_objfile->msymbols ()) { QUIT; @@ -4668,12 +4600,11 @@ scan_file_globals (struct objfile *objfile) /* Get the hash index and check all the symbols under that hash index. */ - hash = hashname (MSYMBOL_LINKAGE_NAME (msymbol)); + hash = hashname (msymbol->linkage_name ()); for (sym = global_sym_chain[hash]; sym;) { - if (strcmp (MSYMBOL_LINKAGE_NAME (msymbol), - SYMBOL_LINKAGE_NAME (sym)) == 0) + if (strcmp (msymbol->linkage_name (), sym->linkage_name ()) == 0) { /* Splice this symbol out of the hash chain and assign the value we have to it. */ @@ -4699,8 +4630,9 @@ scan_file_globals (struct objfile *objfile) } else { - SYMBOL_VALUE_ADDRESS (sym) - = MSYMBOL_VALUE_ADDRESS (resolve_objfile, msymbol); + SET_SYMBOL_VALUE_ADDRESS + (sym, MSYMBOL_VALUE_ADDRESS (resolve_objfile, + msymbol)); } SYMBOL_SECTION (sym) = MSYMBOL_SECTION (msymbol); } @@ -4738,16 +4670,15 @@ scan_file_globals (struct objfile *objfile) /* Change the symbol address from the misleading chain value to address zero. */ - SYMBOL_VALUE_ADDRESS (prev) = 0; + SET_SYMBOL_VALUE_ADDRESS (prev, 0); /* Complain about unresolved common block symbols. */ if (SYMBOL_CLASS (prev) == LOC_STATIC) SYMBOL_ACLASS_INDEX (prev) = LOC_UNRESOLVED; else - complaint (&symfile_complaints, - _("%s: common block `%s' from " + complaint (_("%s: common block `%s' from " "global_sym_chain unresolved"), - objfile_name (objfile), SYMBOL_PRINT_NAME (prev)); + objfile_name (objfile), prev->print_name ()); } } memset (global_sym_chain, 0, sizeof (global_sym_chain)); @@ -4784,6 +4715,7 @@ start_stabs (void) n_this_object_header_files = 1; type_vector_length = 0; type_vector = (struct type **) 0; + within_function = 0; /* FIXME: If common_block_name is not already NULL, we should complain(). */ common_block_name = NULL; @@ -4808,7 +4740,7 @@ finish_global_stabs (struct objfile *objfile) { if (global_stabs) { - patch_block_stabs (global_symbols, global_stabs, objfile); + patch_block_stabs (*get_global_symbols (), global_stabs, objfile); xfree (global_stabs); global_stabs = NULL; } @@ -4841,13 +4773,19 @@ find_name_end (const char *name) } } +/* See stabsread.h. */ + +int +hashname (const char *name) +{ + return fast_hash (name, strlen (name)) % HASHSIZE; +} + /* Initializer for this module. */ void _initialize_stabsread (void) { - rs6000_builtin_type_data = register_objfile_data (); - undef_types_allocated = 20; undef_types_length = 0; undef_types = XNEWVEC (struct type *, undef_types_allocated);