X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fsymbols.c;h=ca2d41ea9ca5beb0cd055d39618bf0fbcc3ae947;hb=bb8f5920403b60671c504eda876c8283da2f2165;hp=295a9ad4b1e6a95052344dd189f206786ec4af79;hpb=49309057b4c45a2586735182830793c77633f51d;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/symbols.c b/gas/symbols.c index 295a9ad4b1..ca2d41ea9c 100644 --- a/gas/symbols.c +++ b/gas/symbols.c @@ -1,5 +1,6 @@ /* symbols.c -symbol table- - Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999 + Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -16,15 +17,14 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free - Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ -/* #define DEBUG_SYMS / * to debug symbol list maintenance */ - -#include +/* #define DEBUG_SYMS / * to debug symbol list maintenance. */ #include "as.h" +#include "safe-ctype.h" #include "obstack.h" /* For "symbols.h" */ #include "subsegs.h" @@ -44,7 +44,7 @@ static struct hash_control *sy_hash; /* Table of local symbols. */ static struct hash_control *local_hash; -/* Below are commented in "symbols.h". */ +/* Below are commented in "symbols.h". */ symbolS *symbol_rootP; symbolS *symbol_lastP; symbolS abs_symbol; @@ -55,44 +55,44 @@ symbolS abs_symbol; #define debug_verify_symchain(root, last) ((void) 0) #endif +#define DOLLAR_LABEL_CHAR '\001' +#define LOCAL_LABEL_CHAR '\002' + struct obstack notes; +#ifdef USE_UNIQUE +/* The name of an external symbol which is + used to make weak PE symbol names unique. */ +const char * an_external_name; +#endif -static void fb_label_init PARAMS ((void)); -static long dollar_label_instance PARAMS ((long)); -static long fb_label_instance PARAMS ((long)); +static char *save_symbol_name (const char *); +static void fb_label_init (void); +static long dollar_label_instance (long); +static long fb_label_instance (long); -static void print_binary PARAMS ((FILE *, const char *, expressionS *)); +static void print_binary (FILE *, const char *, expressionS *); +static void report_op_error (symbolS *, symbolS *, symbolS *); -/* symbol_new() - - Return a pointer to a new symbol. Die if we can't make a new +/* Return a pointer to a new symbol. Die if we can't make a new symbol. Fill in the symbol's values. Add symbol to end of symbol chain. - + This function should be called in the general case of creating a symbol. However, if the output file symbol table has already been set, and you are certain that this symbol won't be wanted in the output file, you can call symbol_create. */ symbolS * -symbol_new (name, segment, valu, frag) - const char *name; - segT segment; - valueT valu; - fragS *frag; +symbol_new (const char *name, segT segment, valueT valu, fragS *frag) { symbolS *symbolP = symbol_create (name, segment, valu, frag); - /* - * Link to end of symbol chain. - */ -#ifdef BFD_ASSEMBLER + /* Link to end of symbol chain. */ { extern int symbol_table_frozen; if (symbol_table_frozen) abort (); } -#endif symbol_append (symbolP, symbol_lastP, &symbol_rootP, &symbol_lastP); return symbolP; @@ -102,43 +102,35 @@ symbol_new (name, segment, valu, frag) to the object file format. */ static char * -save_symbol_name (name) - const char *name; +save_symbol_name (const char *name) { unsigned int name_length; char *ret; - name_length = strlen (name) + 1; /* +1 for \0 */ + name_length = strlen (name) + 1; /* +1 for \0. */ obstack_grow (¬es, name, name_length); ret = obstack_finish (¬es); -#ifdef STRIP_UNDERSCORE - if (ret[0] == '_') - ++ret; -#endif - #ifdef tc_canonicalize_symbol_name ret = tc_canonicalize_symbol_name (ret); #endif if (! symbols_case_sensitive) { - unsigned char *s; + char *s; - for (s = (unsigned char *) ret; *s != '\0'; s++) - if (islower (*s)) - *s = toupper (*s); + for (s = ret; *s != '\0'; s++) + *s = TOUPPER (*s); } return ret; } symbolS * -symbol_create (name, segment, valu, frag) - const char *name; /* It is copied, the caller can destroy/modify */ - segT segment; /* Segment identifier (SEG_) */ - valueT valu; /* Symbol value */ - fragS *frag; /* Associated fragment */ +symbol_create (const char *name, /* It is copied, the caller can destroy/modify. */ + segT segment, /* Segment identifier (SEG_). */ + valueT valu, /* Symbol value. */ + fragS *frag /* Associated fragment. */) { char *preserved_copy_of_name; symbolS *symbolP; @@ -147,15 +139,13 @@ symbol_create (name, segment, valu, frag) symbolP = (symbolS *) obstack_alloc (¬es, sizeof (symbolS)); - /* symbol must be born in some fixed state. This seems as good as any. */ + /* symbol must be born in some fixed state. This seems as good as any. */ memset (symbolP, 0, sizeof (symbolS)); -#ifdef BFD_ASSEMBLER symbolP->bsym = bfd_make_empty_symbol (stdoutput); if (symbolP->bsym == NULL) as_perror ("%s", "bfd_make_empty_symbol"); symbolP->bsym->udata.p = (PTR) symbolP; -#endif S_SET_NAME (symbolP, preserved_copy_of_name); S_SET_SEGMENT (symbolP, segment); @@ -163,10 +153,6 @@ symbol_create (name, segment, valu, frag) symbol_clear_list_pointers (symbolP); symbolP->sy_frag = frag; -#ifndef BFD_ASSEMBLER - symbolP->sy_number = ~0; - symbolP->sy_name_offset = (unsigned int) ~0; -#endif obj_symbol_new_hook (symbolP); @@ -177,14 +163,11 @@ symbol_create (name, segment, valu, frag) return symbolP; } -#ifdef BFD_ASSEMBLER /* Local symbol support. If we can get away with it, we keep only a small amount of information for local symbols. */ -static struct local_symbol *local_symbol_make PARAMS ((const char *, segT, - valueT, fragS *)); -static symbolS *local_symbol_convert PARAMS ((struct local_symbol *)); +static symbolS *local_symbol_convert (struct local_symbol *); /* Used for statistics. */ @@ -206,11 +189,7 @@ static unsigned long local_symbol_conversion_count; /* Create a local symbol and insert it into the local hash table. */ static struct local_symbol * -local_symbol_make (name, section, offset, frag) - const char *name; - segT section; - valueT offset; - fragS *frag; +local_symbol_make (const char *name, segT section, valueT value, fragS *frag) { char *name_copy; struct local_symbol *ret; @@ -224,7 +203,7 @@ local_symbol_make (name, section, offset, frag) ret->lsy_name = name_copy; ret->lsy_section = section; local_symbol_set_frag (ret, frag); - ret->lsy_offset = offset; + ret->lsy_value = value; hash_jam (local_hash, name_copy, (PTR) ret); @@ -235,8 +214,7 @@ local_symbol_make (name, section, offset, frag) reclaim the space used by the local symbol. */ static symbolS * -local_symbol_convert (locsym) - struct local_symbol *locsym; +local_symbol_convert (struct local_symbol *locsym) { symbolS *ret; @@ -246,7 +224,7 @@ local_symbol_convert (locsym) ++local_symbol_conversion_count; - ret = symbol_new (locsym->lsy_name, locsym->lsy_section, locsym->lsy_offset, + ret = symbol_new (locsym->lsy_name, locsym->lsy_section, locsym->lsy_value, local_symbol_get_frag (locsym)); if (local_symbol_resolved_p (locsym)) @@ -255,6 +233,10 @@ local_symbol_convert (locsym) /* Local symbols are always either defined or used. */ ret->sy_used = 1; +#ifdef TC_LOCAL_SYMFIELD_CONVERT + TC_LOCAL_SYMFIELD_CONVERT (locsym, ret); +#endif + symbol_table_insert (ret); local_symbol_mark_converted (locsym); @@ -264,46 +246,24 @@ local_symbol_convert (locsym) return ret; } - -#else /* ! BFD_ASSEMBLER */ - -#define LOCAL_SYMBOL_CHECK(s) 0 -#define local_symbol_convert(s) ((symbolS *) s) - -#endif /* ! BFD_ASSEMBLER */ +/* We have just seen ":". + Creates a struct symbol unless it already exists. + + Gripes if we are redefining a symbol incompatibly (and ignores it). */ -/* - * colon() - * - * We have just seen ":". - * Creates a struct symbol unless it already exists. - * - * Gripes if we are redefining a symbol incompatibly (and ignores it). - * - */ symbolS * -colon (sym_name) /* just seen "x:" - rattle symbols & frags */ - const char *sym_name; /* symbol name, as a cannonical string */ - /* We copy this string: OK to alter later. */ +colon (/* Just seen "x:" - rattle symbols & frags. */ + const char *sym_name /* Symbol name, as a cannonical string. */ + /* We copy this string: OK to alter later. */) { - register symbolS *symbolP; /* symbol we are working with */ + register symbolS *symbolP; /* Symbol we are working with. */ /* Sun local labels go out of scope whenever a non-local symbol is defined. */ - if (LOCAL_LABELS_DOLLAR) - { - int local; - -#ifdef BFD_ASSEMBLER - local = bfd_is_local_label_name (stdoutput, sym_name); -#else - local = LOCAL_LABEL (sym_name); -#endif - - if (! local) - dollar_label_clear (); - } + if (LOCAL_LABELS_DOLLAR + && !bfd_is_local_label_name (stdoutput, sym_name)) + dollar_label_clear (); #ifndef WORKING_DOT_WORD if (new_broken_words) @@ -313,8 +273,12 @@ colon (sym_name) /* just seen "x:" - rattle symbols & frags */ fragS *frag_tmp; char *frag_opcode; - extern const int md_short_jump_size; - extern const int md_long_jump_size; + if (now_seg == absolute_section) + { + as_bad (_("cannot define symbol `%s' in absolute section"), sym_name); + return NULL; + } + possible_bytes = (md_short_jump_size + new_broken_words * md_long_jump_size); @@ -327,9 +291,9 @@ colon (sym_name) /* just seen "x:" - rattle symbols & frags */ (offsetT) 0, NULL); - /* We want to store the pointer to where to insert the jump table in the - fr_opcode of the rs_broken_word frag. This requires a little - hackery. */ + /* We want to store the pointer to where to insert the jump + table in the fr_opcode of the rs_broken_word frag. This + requires a little hackery. */ while (frag_tmp && (frag_tmp->fr_type != rs_broken_word || frag_tmp->fr_opcode)) @@ -345,13 +309,12 @@ colon (sym_name) /* just seen "x:" - rattle symbols & frags */ if ((symbolP = symbol_find (sym_name)) != 0) { + S_CLEAR_WEAKREFR (symbolP); #ifdef RESOLVE_SYMBOL_REDEFINITION if (RESOLVE_SYMBOL_REDEFINITION (symbolP)) return symbolP; #endif - /* - * Now check for undefined symbols - */ + /* Now check for undefined symbols. */ if (LOCAL_SYMBOL_CHECK (symbolP)) { struct local_symbol *locsym = (struct local_symbol *) symbolP; @@ -359,62 +322,71 @@ colon (sym_name) /* just seen "x:" - rattle symbols & frags */ if (locsym->lsy_section != undefined_section && (local_symbol_get_frag (locsym) != frag_now || locsym->lsy_section != now_seg - || locsym->lsy_offset != frag_now_fix ())) + || locsym->lsy_value != frag_now_fix ())) { - as_bad (_("Symbol %s already defined."), sym_name); + as_bad (_("symbol `%s' is already defined"), sym_name); return symbolP; } locsym->lsy_section = now_seg; local_symbol_set_frag (locsym, frag_now); - locsym->lsy_offset = frag_now_fix (); + locsym->lsy_value = frag_now_fix (); } - else if (!S_IS_DEFINED (symbolP) || S_IS_COMMON (symbolP)) + else if (!(S_IS_DEFINED (symbolP) || symbol_equated_p (symbolP)) + || S_IS_COMMON (symbolP) + || S_IS_VOLATILE (symbolP)) { + if (S_IS_VOLATILE (symbolP) + /* This could be avoided when the symbol wasn't used so far, but + the comment in struc-symbol.h says this flag isn't reliable. */ + && (1 || !symbol_used_p (symbolP))) + { + symbolP = symbol_clone (symbolP, 1); + S_SET_VALUE (symbolP, 0); + S_CLEAR_VOLATILE (symbolP); + } if (S_GET_VALUE (symbolP) == 0) { symbolP->sy_frag = frag_now; #ifdef OBJ_VMS - S_SET_OTHER(symbolP, const_flag); + S_SET_OTHER (symbolP, const_flag); #endif S_SET_VALUE (symbolP, (valueT) frag_now_fix ()); S_SET_SEGMENT (symbolP, now_seg); #ifdef N_UNDF know (N_UNDF == 0); -#endif /* if we have one, it better be zero. */ +#endif /* if we have one, it better be zero. */ } else { - /* - * There are still several cases to check: - * A .comm/.lcomm symbol being redefined as - * initialized data is OK - * A .comm/.lcomm symbol being redefined with - * a larger size is also OK - * - * This only used to be allowed on VMS gas, but Sun cc - * on the sparc also depends on it. - */ + /* There are still several cases to check: + + A .comm/.lcomm symbol being redefined as initialized + data is OK + + A .comm/.lcomm symbol being redefined with a larger + size is also OK + + This only used to be allowed on VMS gas, but Sun cc + on the sparc also depends on it. */ if (((!S_IS_DEBUG (symbolP) && (!S_IS_DEFINED (symbolP) || S_IS_COMMON (symbolP)) && S_IS_EXTERNAL (symbolP)) || S_GET_SEGMENT (symbolP) == bss_section) && (now_seg == data_section + || now_seg == bss_section || now_seg == S_GET_SEGMENT (symbolP))) { - /* - * Select which of the 2 cases this is - */ + /* Select which of the 2 cases this is. */ if (now_seg != data_section) { - /* - * New .comm for prev .comm symbol. - * If the new size is larger we just - * change its value. If the new size - * is smaller, we ignore this symbol - */ + /* New .comm for prev .comm symbol. + + If the new size is larger we just change its + value. If the new size is smaller, we ignore + this symbol. */ if (S_GET_VALUE (symbolP) < ((unsigned) frag_now_fix ())) { @@ -427,47 +399,52 @@ colon (sym_name) /* just seen "x:" - rattle symbols & frags */ data. */ symbolP->sy_frag = frag_now; #ifdef OBJ_VMS - S_SET_OTHER(symbolP, const_flag); + S_SET_OTHER (symbolP, const_flag); #endif S_SET_VALUE (symbolP, (valueT) frag_now_fix ()); - S_SET_SEGMENT (symbolP, now_seg); /* keep N_EXT bit */ + S_SET_SEGMENT (symbolP, now_seg); /* Keep N_EXT bit. */ } } else { -#if defined (S_GET_OTHER) && defined (S_GET_DESC) - as_fatal (_("Symbol \"%s\" is already defined as \"%s\"/%d.%d.%ld."), - sym_name, - segment_name (S_GET_SEGMENT (symbolP)), - S_GET_OTHER (symbolP), S_GET_DESC (symbolP), - (long) S_GET_VALUE (symbolP)); +#if (!defined (OBJ_AOUT) && !defined (OBJ_MAYBE_AOUT) \ + && !defined (OBJ_BOUT) && !defined (OBJ_MAYBE_BOUT)) + static const char *od_buf = ""; #else - as_fatal (_("Symbol \"%s\" is already defined as \"%s\"/%ld."), + char od_buf[100]; + od_buf[0] = '\0'; + if (OUTPUT_FLAVOR == bfd_target_aout_flavour) + sprintf (od_buf, "%d.%d.", + S_GET_OTHER (symbolP), + S_GET_DESC (symbolP)); +#endif + as_bad (_("symbol `%s' is already defined as \"%s\"/%s%ld"), sym_name, segment_name (S_GET_SEGMENT (symbolP)), + od_buf, (long) S_GET_VALUE (symbolP)); -#endif } - } /* if the undefined symbol has no value */ + } /* if the undefined symbol has no value */ } else { - /* Don't blow up if the definition is the same */ + /* Don't blow up if the definition is the same. */ if (!(frag_now == symbolP->sy_frag && S_GET_VALUE (symbolP) == frag_now_fix () && S_GET_SEGMENT (symbolP) == now_seg)) - as_fatal (_("Symbol %s already defined."), sym_name); - } /* if this symbol is not yet defined */ + { + as_bad (_("symbol `%s' is already defined"), sym_name); + symbolP = symbol_clone (symbolP, 0); + } + } } -#ifdef BFD_ASSEMBLER else if (! flag_keep_locals && bfd_is_local_label_name (stdoutput, sym_name)) { symbolP = (symbolS *) local_symbol_make (sym_name, now_seg, (valueT) frag_now_fix (), frag_now); } -#endif /* BFD_ASSEMBLER */ else { symbolP = symbol_new (sym_name, now_seg, (valueT) frag_now_fix (), @@ -477,12 +454,12 @@ colon (sym_name) /* just seen "x:" - rattle symbols & frags */ #endif /* OBJ_VMS */ symbol_table_insert (symbolP); - } /* if we have seen this symbol before */ + } if (mri_common_symbol != NULL) { /* This symbol is actually being defined within an MRI common - section. This requires special handling. */ + section. This requires special handling. */ if (LOCAL_SYMBOL_CHECK (symbolP)) symbolP = local_symbol_convert ((struct local_symbol *) symbolP); symbolP->sy_value.X_op = O_symbol; @@ -503,17 +480,10 @@ colon (sym_name) /* just seen "x:" - rattle symbols & frags */ return symbolP; } +/* Die if we can't insert the symbol. */ -/* - * symbol_table_insert() - * - * Die if we can't insert the symbol. - * - */ - -void -symbol_table_insert (symbolP) - symbolS *symbolP; +void +symbol_table_insert (symbolS *symbolP) { register const char *error_string; @@ -525,27 +495,23 @@ symbol_table_insert (symbolP) error_string = hash_jam (local_hash, S_GET_NAME (symbolP), (PTR) symbolP); if (error_string != NULL) - as_fatal (_("Inserting \"%s\" into symbol table failed: %s"), + as_fatal (_("inserting \"%s\" into symbol table failed: %s"), S_GET_NAME (symbolP), error_string); return; } if ((error_string = hash_jam (sy_hash, S_GET_NAME (symbolP), (PTR) symbolP))) { - as_fatal (_("Inserting \"%s\" into symbol table failed: %s"), + as_fatal (_("inserting \"%s\" into symbol table failed: %s"), S_GET_NAME (symbolP), error_string); - } /* on error */ -} /* symbol_table_insert() */ + } /* on error */ +} -/* - * symbol_find_or_make() - * - * If a symbol name does not exist, create it as undefined, and insert - * it into the symbol table. Return a pointer to it. - */ +/* If a symbol name does not exist, create it as undefined, and insert + it into the symbol table. Return a pointer to it. */ + symbolS * -symbol_find_or_make (name) - const char *name; +symbol_find_or_make (const char *name) { register symbolS *symbolP; @@ -553,7 +519,6 @@ symbol_find_or_make (name) if (symbolP == NULL) { -#ifdef BFD_ASSEMBLER if (! flag_keep_locals && bfd_is_local_label_name (stdoutput, name)) { symbolP = md_undefined_symbol ((char *) name); @@ -565,7 +530,6 @@ symbol_find_or_make (name) &zero_address_frag); return symbolP; } -#endif symbolP = symbol_make (name); @@ -573,53 +537,191 @@ symbol_find_or_make (name) } /* if symbol wasn't found */ return (symbolP); -} /* symbol_find_or_make() */ +} symbolS * -symbol_make (name) - CONST char *name; +symbol_make (const char *name) { symbolS *symbolP; - /* Let the machine description default it, e.g. for register names. */ + /* Let the machine description default it, e.g. for register names. */ symbolP = md_undefined_symbol ((char *) name); if (!symbolP) symbolP = symbol_new (name, undefined_section, (valueT) 0, &zero_address_frag); return (symbolP); -} /* symbol_make() */ +} -/* - * symbol_find() - * - * Implement symbol table lookup. - * In: A symbol's name as a string: '\0' can't be part of a symbol name. - * Out: NULL if the name was not in the symbol table, else the address - * of a struct symbol associated with that name. - */ +symbolS * +symbol_clone (symbolS *orgsymP, int replace) +{ + symbolS *newsymP; + asymbol *bsymorg, *bsymnew; + /* Running local_symbol_convert on a clone that's not the one currently + in local_hash would incorrectly replace the hash entry. Thus the + symbol must be converted here. Note that the rest of the function + depends on not encountering an unconverted symbol. */ + if (LOCAL_SYMBOL_CHECK (orgsymP)) + orgsymP = local_symbol_convert ((struct local_symbol *) orgsymP); + bsymorg = orgsymP->bsym; + + know (S_IS_DEFINED (orgsymP)); + + newsymP = obstack_alloc (¬es, sizeof (*newsymP)); + *newsymP = *orgsymP; + bsymnew = bfd_make_empty_symbol (bfd_asymbol_bfd (bsymorg)); + if (bsymnew == NULL) + as_perror ("%s", "bfd_make_empty_symbol"); + newsymP->bsym = bsymnew; + bsymnew->name = bsymorg->name; + bsymnew->flags = bsymorg->flags; + bsymnew->section = bsymorg->section; + bsymnew->udata.p = (PTR) newsymP; + bfd_copy_private_symbol_data (bfd_asymbol_bfd (bsymorg), bsymorg, + bfd_asymbol_bfd (bsymnew), bsymnew); + +#ifdef obj_symbol_clone_hook + obj_symbol_clone_hook (newsymP, orgsymP); +#endif + +#ifdef tc_symbol_clone_hook + tc_symbol_clone_hook (newsymP, orgsymP); +#endif + + if (replace) + { + if (symbol_rootP == orgsymP) + symbol_rootP = newsymP; + else if (orgsymP->sy_previous) + { + orgsymP->sy_previous->sy_next = newsymP; + orgsymP->sy_previous = NULL; + } + if (symbol_lastP == orgsymP) + symbol_lastP = newsymP; + else if (orgsymP->sy_next) + orgsymP->sy_next->sy_previous = newsymP; + orgsymP->sy_next = NULL; + debug_verify_symchain (symbol_rootP, symbol_lastP); + + symbol_table_insert (newsymP); + } + + return newsymP; +} + +/* Referenced symbols, if they are forward references, need to be cloned + (without replacing the original) so that the value of the referenced + symbols at the point of use . */ + +#undef symbol_clone_if_forward_ref symbolS * -symbol_find (name) - CONST char *name; +symbol_clone_if_forward_ref (symbolS *symbolP, int is_forward) { -#ifdef STRIP_UNDERSCORE - return (symbol_find_base (name, 1)); -#else /* STRIP_UNDERSCORE */ - return (symbol_find_base (name, 0)); -#endif /* STRIP_UNDERSCORE */ -} /* symbol_find() */ + if (symbolP && !LOCAL_SYMBOL_CHECK (symbolP)) + { + symbolS *add_symbol = symbolP->sy_value.X_add_symbol; + symbolS *op_symbol = symbolP->sy_value.X_op_symbol; + + if (symbolP->sy_forward_ref) + is_forward = 1; + + if (is_forward) + { + /* assign_symbol() clones volatile symbols; pre-existing expressions + hold references to the original instance, but want the current + value. Just repeat the lookup. */ + if (add_symbol && S_IS_VOLATILE (add_symbol)) + add_symbol = symbol_find_exact (S_GET_NAME (add_symbol)); + if (op_symbol && S_IS_VOLATILE (op_symbol)) + op_symbol = symbol_find_exact (S_GET_NAME (op_symbol)); + } + + /* Re-using sy_resolving here, as this routine cannot get called from + symbol resolution code. */ + if (symbolP->bsym->section == expr_section && !symbolP->sy_resolving) + { + symbolP->sy_resolving = 1; + add_symbol = symbol_clone_if_forward_ref (add_symbol, is_forward); + op_symbol = symbol_clone_if_forward_ref (op_symbol, is_forward); + symbolP->sy_resolving = 0; + } + + if (symbolP->sy_forward_ref + || add_symbol != symbolP->sy_value.X_add_symbol + || op_symbol != symbolP->sy_value.X_op_symbol) + symbolP = symbol_clone (symbolP, 0); + + symbolP->sy_value.X_add_symbol = add_symbol; + symbolP->sy_value.X_op_symbol = op_symbol; + } + + return symbolP; +} + +symbolS * +symbol_temp_new (segT seg, valueT ofs, fragS *frag) +{ + return symbol_new (FAKE_LABEL_NAME, seg, ofs, frag); +} symbolS * -symbol_find_base (name, strip_underscore) - CONST char *name; - int strip_underscore; +symbol_temp_new_now (void) +{ + return symbol_temp_new (now_seg, frag_now_fix (), frag_now); +} + +symbolS * +symbol_temp_make (void) +{ + return symbol_make (FAKE_LABEL_NAME); +} + +/* Implement symbol table lookup. + In: A symbol's name as a string: '\0' can't be part of a symbol name. + Out: NULL if the name was not in the symbol table, else the address + of a struct symbol associated with that name. */ + +symbolS * +symbol_find_exact (const char *name) +{ + return symbol_find_exact_noref (name, 0); +} + +symbolS * +symbol_find_exact_noref (const char *name, int noref) { struct local_symbol *locsym; + symbolS* sym; - if (strip_underscore && *name == '_') - name++; + locsym = (struct local_symbol *) hash_find (local_hash, name); + if (locsym != NULL) + return (symbolS *) locsym; + + sym = ((symbolS *) hash_find (sy_hash, name)); + + /* Any references to the symbol, except for the reference in + .weakref, must clear this flag, such that the symbol does not + turn into a weak symbol. Note that we don't have to handle the + local_symbol case, since a weakrefd is always promoted out of the + local_symbol table when it is turned into a weak symbol. */ + if (sym && ! noref) + S_CLEAR_WEAKREFD (sym); + + return sym; +} +symbolS * +symbol_find (const char *name) +{ + return symbol_find_noref (name, 0); +} + +symbolS * +symbol_find_noref (const char *name, int noref) +{ #ifdef tc_canonicalize_symbol_name { char *copy; @@ -642,35 +744,25 @@ symbol_find_base (name, strip_underscore) while ((c = *orig++) != '\0') { - if (islower (c)) - c = toupper (c); - *copy++ = c; + *copy++ = TOUPPER (c); } *copy = '\0'; } - locsym = (struct local_symbol *) hash_find (local_hash, name); - if (locsym != NULL) - return (symbolS *) locsym; - - return ((symbolS *) hash_find (sy_hash, name)); + return symbol_find_exact_noref (name, noref); } -/* - * Once upon a time, symbols were kept in a singly linked list. At - * least coff needs to be able to rearrange them from time to time, for - * which a doubly linked list is much more convenient. Loic did these - * as macros which seemed dangerous to me so they're now functions. - * xoxorich. - */ +/* Once upon a time, symbols were kept in a singly linked list. At + least coff needs to be able to rearrange them from time to time, for + which a doubly linked list is much more convenient. Loic did these + as macros which seemed dangerous to me so they're now functions. + xoxorich. */ + +/* Link symbol ADDME after symbol TARGET in the chain. */ -/* Link symbol ADDME after symbol TARGET in the chain. */ -void -symbol_append (addme, target, rootPP, lastPP) - symbolS *addme; - symbolS *target; - symbolS **rootPP; - symbolS **lastPP; +void +symbol_append (symbolS *addme, symbolS *target, + symbolS **rootPP, symbolS **lastPP) { if (LOCAL_SYMBOL_CHECK (addme)) abort (); @@ -682,56 +774,44 @@ symbol_append (addme, target, rootPP, lastPP) know (*rootPP == NULL); know (*lastPP == NULL); addme->sy_next = NULL; -#ifdef SYMBOLS_NEED_BACKPOINTERS addme->sy_previous = NULL; -#endif *rootPP = addme; *lastPP = addme; return; - } /* if the list is empty */ + } /* if the list is empty */ if (target->sy_next != NULL) { -#ifdef SYMBOLS_NEED_BACKPOINTERS target->sy_next->sy_previous = addme; -#endif /* SYMBOLS_NEED_BACKPOINTERS */ } else { know (*lastPP == target); *lastPP = addme; - } /* if we have a next */ + } /* if we have a next */ addme->sy_next = target->sy_next; target->sy_next = addme; - -#ifdef SYMBOLS_NEED_BACKPOINTERS addme->sy_previous = target; -#endif /* SYMBOLS_NEED_BACKPOINTERS */ debug_verify_symchain (symbol_rootP, symbol_lastP); } -/* Set the chain pointers of SYMBOL to null. */ -void -symbol_clear_list_pointers (symbolP) - symbolS *symbolP; +/* Set the chain pointers of SYMBOL to null. */ + +void +symbol_clear_list_pointers (symbolS *symbolP) { if (LOCAL_SYMBOL_CHECK (symbolP)) abort (); symbolP->sy_next = NULL; -#ifdef SYMBOLS_NEED_BACKPOINTERS symbolP->sy_previous = NULL; -#endif } -#ifdef SYMBOLS_NEED_BACKPOINTERS -/* Remove SYMBOLP from the list. */ -void -symbol_remove (symbolP, rootPP, lastPP) - symbolS *symbolP; - symbolS **rootPP; - symbolS **lastPP; +/* Remove SYMBOLP from the list. */ + +void +symbol_remove (symbolS *symbolP, symbolS **rootPP, symbolS **lastPP) { if (LOCAL_SYMBOL_CHECK (symbolP)) abort (); @@ -739,33 +819,31 @@ symbol_remove (symbolP, rootPP, lastPP) if (symbolP == *rootPP) { *rootPP = symbolP->sy_next; - } /* if it was the root */ + } /* if it was the root */ if (symbolP == *lastPP) { *lastPP = symbolP->sy_previous; - } /* if it was the tail */ + } /* if it was the tail */ if (symbolP->sy_next != NULL) { symbolP->sy_next->sy_previous = symbolP->sy_previous; - } /* if not last */ + } /* if not last */ if (symbolP->sy_previous != NULL) { symbolP->sy_previous->sy_next = symbolP->sy_next; - } /* if not first */ + } /* if not first */ debug_verify_symchain (*rootPP, *lastPP); } -/* Link symbol ADDME before symbol TARGET in the chain. */ -void -symbol_insert (addme, target, rootPP, lastPP) - symbolS *addme; - symbolS *target; - symbolS **rootPP; - symbolS **lastPP; +/* Link symbol ADDME before symbol TARGET in the chain. */ + +void +symbol_insert (symbolS *addme, symbolS *target, + symbolS **rootPP, symbolS **lastPP ATTRIBUTE_UNUSED) { if (LOCAL_SYMBOL_CHECK (addme)) abort (); @@ -780,7 +858,7 @@ symbol_insert (addme, target, rootPP, lastPP) { know (*rootPP == target); *rootPP = addme; - } /* if not first */ + } /* if not first */ addme->sy_previous = target->sy_previous; target->sy_previous = addme; @@ -789,12 +867,8 @@ symbol_insert (addme, target, rootPP, lastPP) debug_verify_symchain (*rootPP, *lastPP); } -#endif /* SYMBOLS_NEED_BACKPOINTERS */ - -void -verify_symbol_chain (rootP, lastP) - symbolS *rootP; - symbolS *lastP; +void +verify_symbol_chain (symbolS *rootP, symbolS *lastP) { symbolS *symbolP = rootP; @@ -803,32 +877,66 @@ verify_symbol_chain (rootP, lastP) for (; symbol_next (symbolP) != NULL; symbolP = symbol_next (symbolP)) { -#ifdef BFD_ASSEMBLER assert (symbolP->bsym != NULL); -#endif -#ifdef SYMBOLS_NEED_BACKPOINTERS assert (symbolP->sy_next->sy_previous == symbolP); -#else - /* Walk the list anyways, to make sure pointers are still good. */ - ; -#endif /* SYMBOLS_NEED_BACKPOINTERS */ } assert (lastP == symbolP); } -void -verify_symbol_chain_2 (sym) - symbolS *sym; +static void +report_op_error (symbolS *symp, symbolS *left, symbolS *right) { - symbolS *p = sym, *n = sym; -#ifdef SYMBOLS_NEED_BACKPOINTERS - while (symbol_previous (p)) - p = symbol_previous (p); -#endif - while (symbol_next (n)) - n = symbol_next (n); - verify_symbol_chain (p, n); + char *file; + unsigned int line; + segT seg_left = S_GET_SEGMENT (left); + segT seg_right = right ? S_GET_SEGMENT (right) : 0; + + if (expr_symbol_where (symp, &file, &line)) + { + if (seg_left == undefined_section) + as_bad_where (file, line, + _("undefined symbol `%s' in operation"), + S_GET_NAME (left)); + if (seg_right == undefined_section) + as_bad_where (file, line, + _("undefined symbol `%s' in operation"), + S_GET_NAME (right)); + if (seg_left != undefined_section + && seg_right != undefined_section) + { + if (right) + as_bad_where (file, line, + _("invalid sections for operation on `%s' and `%s'"), + S_GET_NAME (left), S_GET_NAME (right)); + else + as_bad_where (file, line, + _("invalid section for operation on `%s'"), + S_GET_NAME (left)); + } + + } + else + { + if (seg_left == undefined_section) + as_bad (_("undefined symbol `%s' in operation setting `%s'"), + S_GET_NAME (left), S_GET_NAME (symp)); + if (seg_right == undefined_section) + as_bad (_("undefined symbol `%s' in operation setting `%s'"), + S_GET_NAME (right), S_GET_NAME (symp)); + if (seg_left != undefined_section + && seg_right != undefined_section) + { + if (right) + as_bad_where (file, line, + _("invalid sections for operation on `%s' and `%s' setting `%s'"), + S_GET_NAME (left), S_GET_NAME (right), S_GET_NAME (symp)); + else + as_bad_where (file, line, + _("invalid section for operation on `%s' setting `%s'"), + S_GET_NAME (left), S_GET_NAME (symp)); + } + } } /* Resolve the value of a symbol. This is called during the final @@ -836,27 +944,25 @@ verify_symbol_chain_2 (sym) values. */ valueT -resolve_symbol_value (symp, finalize) - symbolS *symp; - int finalize; +resolve_symbol_value (symbolS *symp) { int resolved; - valueT final_val; + valueT final_val = 0; segT final_seg; if (LOCAL_SYMBOL_CHECK (symp)) { struct local_symbol *locsym = (struct local_symbol *) symp; + final_val = locsym->lsy_value; if (local_symbol_resolved_p (locsym)) - return locsym->lsy_offset; + return final_val; - final_val = (local_symbol_get_frag (locsym)->fr_address - + locsym->lsy_offset); + final_val += local_symbol_get_frag (locsym)->fr_address / OCTETS_PER_BYTE; - if (finalize) + if (finalize_syms) { - locsym->lsy_offset = final_val; + locsym->lsy_value = final_val; local_symbol_mark_resolved (locsym); } @@ -876,8 +982,9 @@ resolve_symbol_value (symp, finalize) if (symp->sy_resolving) { - if (finalize) - as_bad (_("Symbol definition loop encountered at %s"), S_GET_NAME (symp)); + if (finalize_syms) + as_bad (_("symbol definition loop encountered at `%s'"), + S_GET_NAME (symp)); final_val = 0; resolved = 1; } @@ -887,6 +994,7 @@ resolve_symbol_value (symp, finalize) offsetT left, right; segT seg_left, seg_right; operatorT op; + int move_seg_ok; symp->sy_resolving = 1; @@ -907,7 +1015,7 @@ resolve_symbol_value (symp, finalize) /* Fall through. */ case O_constant: - final_val += symp->sy_frag->fr_address; + final_val += symp->sy_frag->fr_address / OCTETS_PER_BYTE; if (final_seg == expr_section) final_seg = absolute_section; resolved = 1; @@ -915,19 +1023,35 @@ resolve_symbol_value (symp, finalize) case O_symbol: case O_symbol_rva: - left = resolve_symbol_value (add_symbol, finalize); + left = resolve_symbol_value (add_symbol); + seg_left = S_GET_SEGMENT (add_symbol); + if (finalize_syms) + symp->sy_value.X_op_symbol = NULL; + do_symbol: + if (S_IS_WEAKREFR (symp)) + { + assert (final_val == 0); + if (S_IS_WEAKREFR (add_symbol)) + { + assert (add_symbol->sy_value.X_op == O_symbol + && add_symbol->sy_value.X_add_number == 0); + add_symbol = add_symbol->sy_value.X_add_symbol; + assert (! S_IS_WEAKREFR (add_symbol)); + symp->sy_value.X_add_symbol = add_symbol; + } + } if (symp->sy_mri_common) { /* This is a symbol inside an MRI common section. The - relocation routines are going to handle it specially. - Don't change the value. */ + relocation routines are going to handle it specially. + Don't change the value. */ resolved = symbol_resolved_p (add_symbol); break; } - if (finalize && final_val == 0) + if (finalize_syms && final_val == 0) { if (LOCAL_SYMBOL_CHECK (add_symbol)) add_symbol = local_symbol_convert ((struct local_symbol *) @@ -935,39 +1059,78 @@ resolve_symbol_value (symp, finalize) copy_symbol_attributes (symp, add_symbol); } - /* If we have equated this symbol to an undefined symbol, we - keep X_op set to O_symbol, and we don't change - X_add_number. This permits the routine which writes out - relocation to detect this case, and convert the - relocation to be against the symbol to which this symbol - is equated. */ - if (! S_IS_DEFINED (add_symbol) || S_IS_COMMON (add_symbol)) + /* If we have equated this symbol to an undefined or common + symbol, keep X_op set to O_symbol, and don't change + X_add_number. This permits the routine which writes out + relocation to detect this case, and convert the + relocation to be against the symbol to which this symbol + is equated. */ + if (! S_IS_DEFINED (add_symbol) +#if defined (OBJ_COFF) && defined (TE_PE) + || S_IS_WEAK (add_symbol) +#endif + || S_IS_COMMON (add_symbol)) { - if (finalize) + if (finalize_syms) { - S_SET_SEGMENT (symp, S_GET_SEGMENT (add_symbol)); symp->sy_value.X_op = O_symbol; symp->sy_value.X_add_symbol = add_symbol; symp->sy_value.X_add_number = final_val; + /* Use X_op_symbol as a flag. */ + symp->sy_value.X_op_symbol = add_symbol; + final_seg = seg_left; } final_val = 0; resolved = symbol_resolved_p (add_symbol); + symp->sy_resolving = 0; + goto exit_dont_set_value; + } + else if (finalize_syms && final_seg == expr_section + && seg_left != expr_section) + { + /* If the symbol is an expression symbol, do similarly + as for undefined and common syms above. Handles + "sym +/- expr" where "expr" cannot be evaluated + immediately, and we want relocations to be against + "sym", eg. because it is weak. */ + symp->sy_value.X_op = O_symbol; + symp->sy_value.X_add_symbol = add_symbol; + symp->sy_value.X_add_number = final_val; + symp->sy_value.X_op_symbol = add_symbol; + final_seg = seg_left; + final_val += symp->sy_frag->fr_address + left; + resolved = symbol_resolved_p (add_symbol); + symp->sy_resolving = 0; goto exit_dont_set_value; } else { final_val += symp->sy_frag->fr_address + left; if (final_seg == expr_section || final_seg == undefined_section) - final_seg = S_GET_SEGMENT (add_symbol); + final_seg = seg_left; } resolved = symbol_resolved_p (add_symbol); + if (S_IS_WEAKREFR (symp)) + goto exit_dont_set_value; break; case O_uminus: case O_bit_not: case O_logical_not: - left = resolve_symbol_value (add_symbol, finalize); + left = resolve_symbol_value (add_symbol); + seg_left = S_GET_SEGMENT (add_symbol); + + /* By reducing these to the relevant dyadic operator, we get + !S -> S == 0 permitted on anything, + -S -> 0 - S only permitted on absolute + ~S -> S ^ ~0 only permitted on absolute */ + if (op != O_logical_not && seg_left != absolute_section + && finalize_syms) + report_op_error (symp, add_symbol, NULL); + + if (final_seg == expr_section || final_seg == undefined_section) + final_seg = absolute_section; if (op == O_uminus) left = -left; @@ -977,8 +1140,6 @@ resolve_symbol_value (symp, finalize) left = ~left; final_val += left + symp->sy_frag->fr_address; - if (final_seg == expr_section || final_seg == undefined_section) - final_seg = absolute_section; resolved = symbol_resolved_p (add_symbol); break; @@ -1002,88 +1163,77 @@ resolve_symbol_value (symp, finalize) case O_gt: case O_logical_and: case O_logical_or: - left = resolve_symbol_value (add_symbol, finalize); - right = resolve_symbol_value (op_symbol, finalize); + left = resolve_symbol_value (add_symbol); + right = resolve_symbol_value (op_symbol); seg_left = S_GET_SEGMENT (add_symbol); seg_right = S_GET_SEGMENT (op_symbol); /* Simplify addition or subtraction of a constant by folding the constant into X_add_number. */ - if (op == O_add || op == O_subtract) + if (op == O_add) { if (seg_right == absolute_section) { - if (op == O_add) - final_val += right; - else - final_val -= right; - op = O_symbol; - op_symbol = NULL; + final_val += right; goto do_symbol; } - else if (seg_left == absolute_section && op == O_add) + else if (seg_left == absolute_section) { - op = O_symbol; final_val += left; add_symbol = op_symbol; left = right; - op_symbol = NULL; + seg_left = seg_right; goto do_symbol; } } - - /* Subtraction is permitted if both operands are in the same - section. Otherwise, both operands must be absolute. We - already handled the case of addition or subtraction of a - constant above. This will probably need to be changed - for an object file format which supports arbitrary - expressions, such as IEEE-695. */ - /* Don't emit messages unless we're finalizing the symbol value, - otherwise we may get the same message multiple times. */ - if ((seg_left != absolute_section || seg_right != absolute_section) - && (op != O_subtract || seg_left != seg_right) - && finalize) + else if (op == O_subtract) { - char *file; - unsigned int line; - - if (expr_symbol_where (symp, &file, &line)) + if (seg_right == absolute_section) { - if (seg_left == undefined_section) - as_bad_where (file, line, - _("undefined symbol %s in operation"), - S_GET_NAME (symp->sy_value.X_add_symbol)); - if (seg_right == undefined_section) - as_bad_where (file, line, - _("undefined symbol %s in operation"), - S_GET_NAME (symp->sy_value.X_op_symbol)); - if (seg_left != undefined_section - && seg_right != undefined_section) - as_bad_where (file, line, _("invalid section for operation")); + final_val -= right; + goto do_symbol; } + } + + move_seg_ok = 1; + /* Equality and non-equality tests are permitted on anything. + Subtraction, and other comparison operators are permitted if + both operands are in the same section. Otherwise, both + operands must be absolute. We already handled the case of + addition or subtraction of a constant above. This will + probably need to be changed for an object file format which + supports arbitrary expressions, such as IEEE-695. */ + if (!(seg_left == absolute_section + && seg_right == absolute_section) + && !(op == O_eq || op == O_ne) + && !((op == O_subtract + || op == O_lt || op == O_le || op == O_ge || op == O_gt) + && seg_left == seg_right + && (seg_left != undefined_section + || add_symbol == op_symbol))) + { + /* Don't emit messages unless we're finalizing the symbol value, + otherwise we may get the same message multiple times. */ + if (finalize_syms) + report_op_error (symp, add_symbol, op_symbol); + /* However do not move the symbol into the absolute section + if it cannot currently be resolved - this would confuse + other parts of the assembler into believing that the + expression had been evaluated to zero. */ else - { - if (seg_left == undefined_section) - as_bad (_("undefined symbol %s in operation setting %s"), - S_GET_NAME (symp->sy_value.X_add_symbol), - S_GET_NAME (symp)); - if (seg_right == undefined_section) - as_bad (_("undefined symbol %s in operation setting %s"), - S_GET_NAME (symp->sy_value.X_op_symbol), - S_GET_NAME (symp)); - if (seg_left != undefined_section - && seg_right != undefined_section) - as_bad (_("invalid section for operation setting %s"), - S_GET_NAME (symp)); - } + move_seg_ok = 0; } + if (move_seg_ok + && (final_seg == expr_section || final_seg == undefined_section)) + final_seg = absolute_section; + /* Check for division by zero. */ if ((op == O_divide || op == O_modulus) && right == 0) { /* If seg_right is not absolute_section, then we've - already issued a warning about using a bad symbol. */ - if (seg_right == absolute_section && finalize) + already issued a warning about using a bad symbol. */ + if (seg_right == absolute_section && finalize_syms) { char *file; unsigned int line; @@ -1091,7 +1241,7 @@ resolve_symbol_value (symp, finalize) if (expr_symbol_where (symp, &file, &line)) as_bad_where (file, line, _("division by zero")); else - as_bad (_("division by zero when setting %s"), + as_bad (_("division by zero when setting `%s'"), S_GET_NAME (symp)); } @@ -1111,8 +1261,15 @@ resolve_symbol_value (symp, finalize) case O_bit_and: left &= right; break; case O_add: left += right; break; case O_subtract: left -= right; break; - case O_eq: left = left == right ? ~ (offsetT) 0 : 0; break; - case O_ne: left = left != right ? ~ (offsetT) 0 : 0; break; + case O_eq: + case O_ne: + left = (left == right && seg_left == seg_right + && (seg_left != undefined_section + || add_symbol == op_symbol) + ? ~ (offsetT) 0 : 0); + if (symp->sy_value.X_op == O_ne) + left = ~left; + break; case O_lt: left = left < right ? ~ (offsetT) 0 : 0; break; case O_le: left = left <= right ? ~ (offsetT) 0 : 0; break; case O_ge: left = left >= right ? ~ (offsetT) 0 : 0; break; @@ -1124,10 +1281,18 @@ resolve_symbol_value (symp, finalize) final_val += symp->sy_frag->fr_address + left; if (final_seg == expr_section || final_seg == undefined_section) - final_seg = absolute_section; + { + if (seg_left == undefined_section + || seg_right == undefined_section) + final_seg = undefined_section; + else if (seg_left == absolute_section) + final_seg = seg_right; + else + final_seg = seg_left; + } resolved = (symbol_resolved_p (add_symbol) && symbol_resolved_p (op_symbol)); - break; + break; case O_register: case O_big: @@ -1143,27 +1308,23 @@ resolve_symbol_value (symp, finalize) symp->sy_resolving = 0; } - if (finalize) - { - S_SET_VALUE (symp, final_val); - -#if defined (OBJ_AOUT) && ! defined (BFD_ASSEMBLER) - /* The old a.out backend does not handle S_SET_SEGMENT correctly - for a stab symbol, so we use this bad hack. */ - if (final_seg != S_GET_SEGMENT (symp)) -#endif - S_SET_SEGMENT (symp, final_seg); - } + if (finalize_syms) + S_SET_VALUE (symp, final_val); exit_dont_set_value: + /* Always set the segment, even if not finalizing the value. + The segment is used to determine whether a symbol is defined. */ + S_SET_SEGMENT (symp, final_seg); + /* Don't worry if we can't resolve an expr_section symbol. */ - if (finalize) + if (finalize_syms) { if (resolved) symp->sy_resolved = 1; else if (S_GET_SEGMENT (symp) != expr_section) { - as_bad (_("can't resolve value for symbol \"%s\""), S_GET_NAME (symp)); + as_bad (_("can't resolve value for symbol `%s'"), + S_GET_NAME (symp)); symp->sy_resolved = 1; } } @@ -1171,31 +1332,91 @@ exit_dont_set_value: return final_val; } -#ifdef BFD_ASSEMBLER - -static void resolve_local_symbol PARAMS ((const char *, PTR)); +static void resolve_local_symbol (const char *, PTR); /* A static function passed to hash_traverse. */ static void -resolve_local_symbol (key, value) - const char *key; - PTR value; +resolve_local_symbol (const char *key ATTRIBUTE_UNUSED, PTR value) { if (value != NULL) - resolve_symbol_value (value, 1); + resolve_symbol_value (value); } -#endif - /* Resolve all local symbols. */ void -resolve_local_symbol_values () +resolve_local_symbol_values (void) { -#ifdef BFD_ASSEMBLER hash_traverse (local_hash, resolve_local_symbol); -#endif +} + +/* Obtain the current value of a symbol without changing any + sub-expressions used. */ + +int +snapshot_symbol (symbolS **symbolPP, valueT *valueP, segT *segP, fragS **fragPP) +{ + symbolS *symbolP = *symbolPP; + + if (LOCAL_SYMBOL_CHECK (symbolP)) + { + struct local_symbol *locsym = (struct local_symbol *) symbolP; + + *valueP = locsym->lsy_value; + *segP = locsym->lsy_section; + *fragPP = local_symbol_get_frag (locsym); + } + else + { + expressionS expr = symbolP->sy_value; + + if (!symbolP->sy_resolved && expr.X_op != O_illegal) + { + int resolved; + + if (symbolP->sy_resolving) + return 0; + symbolP->sy_resolving = 1; + resolved = resolve_expression (&expr); + symbolP->sy_resolving = 0; + if (!resolved) + return 0; + + switch (expr.X_op) + { + case O_constant: + case O_register: + if (!symbol_equated_p (symbolP)) + break; + /* Fall thru. */ + case O_symbol: + case O_symbol_rva: + symbolP = expr.X_add_symbol; + break; + default: + return 0; + } + } + + /* Never change a defined symbol. */ + if (symbolP->bsym->section == undefined_section + || symbolP->bsym->section == expr_section) + *symbolPP = symbolP; + *valueP = expr.X_add_number; + *segP = symbolP->bsym->section; + *fragPP = symbolP->sy_frag; + + if (*segP == expr_section) + switch (expr.X_op) + { + case O_constant: *segP = absolute_section; break; + case O_register: *segP = reg_section; break; + default: break; + } + } + + return 1; } /* Dollar labels look like a number followed by a dollar sign. Eg, "42$". @@ -1211,9 +1432,8 @@ static char *dollar_label_defines; static unsigned long dollar_label_count; static unsigned long dollar_label_max; -int -dollar_label_defined (label) - long label; +int +dollar_label_defined (long label) { long *i; @@ -1223,13 +1443,12 @@ dollar_label_defined (label) if (*i == label) return dollar_label_defines[i - dollar_labels]; - /* if we get here, label isn't defined */ + /* If we get here, label isn't defined. */ return 0; -} /* dollar_label_defined() */ +} static long -dollar_label_instance (label) - long label; +dollar_label_instance (long label) { long *i; @@ -1239,22 +1458,21 @@ dollar_label_instance (label) if (*i == label) return (dollar_label_instances[i - dollar_labels]); - /* If we get here, we haven't seen the label before, therefore its instance - count is zero. */ + /* If we get here, we haven't seen the label before. + Therefore its instance count is zero. */ return 0; } -void -dollar_label_clear () +void +dollar_label_clear (void) { memset (dollar_label_defines, '\0', (unsigned int) dollar_label_count); } #define DOLLAR_LABEL_BUMP_BY 10 -void -define_dollar_label (label) - long label; +void +define_dollar_label (long label) { long *i; @@ -1266,7 +1484,7 @@ define_dollar_label (label) return; } - /* if we get to here, we don't have label listed yet. */ + /* If we get to here, we don't have label listed yet. */ if (dollar_labels == NULL) { @@ -1284,7 +1502,7 @@ define_dollar_label (label) dollar_label_instances = (long *) xrealloc ((char *) dollar_label_instances, dollar_label_max * sizeof (long)); dollar_label_defines = xrealloc (dollar_label_defines, dollar_label_max); - } /* if we needed to grow */ + } /* if we needed to grow */ dollar_labels[dollar_label_count] = label; dollar_label_instances[dollar_label_count] = 1; @@ -1292,39 +1510,38 @@ define_dollar_label (label) ++dollar_label_count; } -/* - * dollar_label_name() - * - * Caller must copy returned name: we re-use the area for the next name. - * - * The mth occurence of label n: is turned into the symbol "Ln^Am" - * where n is the label number and m is the instance number. "L" makes - * it a label discarded unless debugging and "^A"('\1') ensures no - * ordinary symbol SHOULD get the same name as a local label - * symbol. The first "4:" is "L4^A1" - the m numbers begin at 1. - * - * fb labels get the same treatment, except that ^B is used in place of ^A. - */ - -char * /* Return local label name. */ -dollar_label_name (n, augend) - register long n; /* we just saw "n$:" : n a number */ - register int augend; /* 0 for current instance, 1 for new instance */ +/* Caller must copy returned name: we re-use the area for the next name. + + The mth occurence of label n: is turned into the symbol "Ln^Am" + where n is the label number and m is the instance number. "L" makes + it a label discarded unless debugging and "^A"('\1') ensures no + ordinary symbol SHOULD get the same name as a local label + symbol. The first "4:" is "L4^A1" - the m numbers begin at 1. + + fb labels get the same treatment, except that ^B is used in place + of ^A. */ + +char * /* Return local label name. */ +dollar_label_name (register long n, /* we just saw "n$:" : n a number. */ + register int augend /* 0 for current instance, 1 for new instance. */) { long i; - /* Returned to caller, then copied. used for created names ("4f") */ + /* Returned to caller, then copied. Used for created names ("4f"). */ static char symbol_name_build[24]; register char *p; register char *q; - char symbol_name_temporary[20]; /* build up a number, BACKWARDS */ + char symbol_name_temporary[20]; /* Build up a number, BACKWARDS. */ know (n >= 0); know (augend == 0 || augend == 1); p = symbol_name_build; +#ifdef LOCAL_LABEL_PREFIX + *p++ = LOCAL_LABEL_PREFIX; +#endif *p++ = 'L'; - /* Next code just does sprintf( {}, "%d", n); */ - /* label number */ + /* Next code just does sprintf( {}, "%d", n); */ + /* Label number. */ q = symbol_name_temporary; for (*q++ = 0, i = n; i; ++q) { @@ -1334,9 +1551,9 @@ dollar_label_name (n, augend) while ((*p = *--q) != '\0') ++p; - *p++ = 1; /* ^A */ + *p++ = DOLLAR_LABEL_CHAR; /* ^A */ - /* instance number */ + /* Instance number. */ q = symbol_name_temporary; for (*q++ = 0, i = dollar_label_instance (n) + augend; i; ++q) { @@ -1345,27 +1562,26 @@ dollar_label_name (n, augend) } while ((*p++ = *--q) != '\0');; - /* The label, as a '\0' ended string, starts at symbol_name_build. */ + /* The label, as a '\0' ended string, starts at symbol_name_build. */ return symbol_name_build; } -/* - * Sombody else's idea of local labels. They are made by "n:" where n - * is any decimal digit. Refer to them with - * "nb" for previous (backward) n: - * or "nf" for next (forward) n:. - * - * We do a little better and let n be any number, not just a single digit, but - * since the other guy's assembler only does ten, we treat the first ten - * specially. - * - * Like someone else's assembler, we have one set of local label counters for - * entire assembly, not one set per (sub)segment like in most assemblers. This - * implies that one can refer to a label in another segment, and indeed some - * crufty compilers have done just that. - * - * Since there could be a LOT of these things, treat them as a sparse array. - */ +/* Somebody else's idea of local labels. They are made by "n:" where n + is any decimal digit. Refer to them with + "nb" for previous (backward) n: + or "nf" for next (forward) n:. + + We do a little better and let n be any number, not just a single digit, but + since the other guy's assembler only does ten, we treat the first ten + specially. + + Like someone else's assembler, we have one set of local label counters for + entire assembly, not one set per (sub)segment like in most assemblers. This + implies that one can refer to a label in another segment, and indeed some + crufty compilers have done just that. + + Since there could be a LOT of these things, treat them as a sparse + array. */ #define FB_LABEL_SPECIAL (10) @@ -1375,19 +1591,19 @@ static long *fb_label_instances; static long fb_label_count; static long fb_label_max; -/* this must be more than FB_LABEL_SPECIAL */ +/* This must be more than FB_LABEL_SPECIAL. */ #define FB_LABEL_BUMP_BY (FB_LABEL_SPECIAL + 6) -static void -fb_label_init () +static void +fb_label_init (void) { memset ((void *) fb_low_counter, '\0', sizeof (fb_low_counter)); -} /* fb_label_init() */ +} -/* add one to the instance number of this fb label */ -void -fb_label_instance_inc (label) - long label; +/* Add one to the instance number of this fb label. */ + +void +fb_label_instance_inc (long label) { long *i; @@ -1406,11 +1622,11 @@ fb_label_instance_inc (label) { ++fb_label_instances[i - fb_labels]; return; - } /* if we find it */ - } /* for each existing label */ + } /* if we find it */ + } /* for each existing label */ } - /* if we get to here, we don't have label listed yet. */ + /* If we get to here, we don't have label listed yet. */ if (fb_labels == NULL) { @@ -1427,16 +1643,15 @@ fb_label_instance_inc (label) fb_label_max * sizeof (long)); fb_label_instances = (long *) xrealloc ((char *) fb_label_instances, fb_label_max * sizeof (long)); - } /* if we needed to grow */ + } /* if we needed to grow */ fb_labels[fb_label_count] = label; fb_label_instances[fb_label_count] = 1; ++fb_label_count; } -static long -fb_label_instance (label) - long label; +static long +fb_label_instance (long label) { long *i; @@ -1453,8 +1668,8 @@ fb_label_instance (label) if (*i == label) { return (fb_label_instances[i - fb_labels]); - } /* if we find it */ - } /* for each existing label */ + } /* if we find it */ + } /* for each existing label */ } /* We didn't find the label, so this must be a reference to the @@ -1462,38 +1677,42 @@ fb_label_instance (label) return 0; } -/* - * fb_label_name() - * - * Caller must copy returned name: we re-use the area for the next name. - * - * The mth occurence of label n: is turned into the symbol "Ln^Bm" - * where n is the label number and m is the instance number. "L" makes - * it a label discarded unless debugging and "^B"('\2') ensures no - * ordinary symbol SHOULD get the same name as a local label - * symbol. The first "4:" is "L4^B1" - the m numbers begin at 1. - * - * dollar labels get the same treatment, except that ^A is used in place of ^B. */ - -char * /* Return local label name. */ -fb_label_name (n, augend) - long n; /* we just saw "n:", "nf" or "nb" : n a number */ - long augend; /* 0 for nb, 1 for n:, nf */ +/* Caller must copy returned name: we re-use the area for the next name. + + The mth occurence of label n: is turned into the symbol "Ln^Bm" + where n is the label number and m is the instance number. "L" makes + it a label discarded unless debugging and "^B"('\2') ensures no + ordinary symbol SHOULD get the same name as a local label + symbol. The first "4:" is "L4^B1" - the m numbers begin at 1. + + dollar labels get the same treatment, except that ^A is used in + place of ^B. */ + +char * /* Return local label name. */ +fb_label_name (long n, /* We just saw "n:", "nf" or "nb" : n a number. */ + long augend /* 0 for nb, 1 for n:, nf. */) { long i; - /* Returned to caller, then copied. used for created names ("4f") */ + /* Returned to caller, then copied. Used for created names ("4f"). */ static char symbol_name_build[24]; register char *p; register char *q; - char symbol_name_temporary[20]; /* build up a number, BACKWARDS */ + char symbol_name_temporary[20]; /* Build up a number, BACKWARDS. */ know (n >= 0); - know (augend == 0 || augend == 1); +#ifdef TC_MMIX + know ((unsigned long) augend <= 2 /* See mmix_fb_label. */); +#else + know ((unsigned long) augend <= 1); +#endif p = symbol_name_build; +#ifdef LOCAL_LABEL_PREFIX + *p++ = LOCAL_LABEL_PREFIX; +#endif *p++ = 'L'; - /* Next code just does sprintf( {}, "%d", n); */ - /* label number */ + /* Next code just does sprintf( {}, "%d", n); */ + /* Label number. */ q = symbol_name_temporary; for (*q++ = 0, i = n; i; ++q) { @@ -1503,9 +1722,9 @@ fb_label_name (n, augend) while ((*p = *--q) != '\0') ++p; - *p++ = 2; /* ^B */ + *p++ = LOCAL_LABEL_CHAR; /* ^B */ - /* instance number */ + /* Instance number. */ q = symbol_name_temporary; for (*q++ = 0, i = fb_label_instance (n) + augend; i; ++q) { @@ -1514,43 +1733,47 @@ fb_label_name (n, augend) } while ((*p++ = *--q) != '\0');; - /* The label, as a '\0' ended string, starts at symbol_name_build. */ + /* The label, as a '\0' ended string, starts at symbol_name_build. */ return (symbol_name_build); -} /* fb_label_name() */ +} -/* - * decode name that may have been generated by foo_label_name() above. If - * the name wasn't generated by foo_label_name(), then return it unaltered. - * This is used for error messages. - */ +/* Decode name that may have been generated by foo_label_name() above. + If the name wasn't generated by foo_label_name(), then return it + unaltered. This is used for error messages. */ char * -decode_local_label_name (s) - char *s; +decode_local_label_name (char *s) { char *p; char *symbol_decode; int label_number; int instance_number; char *type; - const char *message_format = _("\"%d\" (instance number %d of a %s label)"); + const char *message_format; + int index = 0; - if (s[0] != 'L') +#ifdef LOCAL_LABEL_PREFIX + if (s[index] == LOCAL_LABEL_PREFIX) + ++index; +#endif + + if (s[index] != 'L') return s; - for (label_number = 0, p = s + 1; isdigit ((unsigned char) *p); ++p) + for (label_number = 0, p = s + index + 1; ISDIGIT (*p); ++p) label_number = (10 * label_number) + *p - '0'; - if (*p == 1) + if (*p == DOLLAR_LABEL_CHAR) type = "dollar"; - else if (*p == 2) + else if (*p == LOCAL_LABEL_CHAR) type = "fb"; else return s; - for (instance_number = 0, p++; isdigit ((unsigned char) *p); ++p) + for (instance_number = 0, p++; ISDIGIT (*p); ++p) instance_number = (10 * instance_number) + *p - '0'; + message_format = _("\"%d\" (instance number %d of a %s label)"); symbol_decode = obstack_alloc (¬es, strlen (message_format) + 30); sprintf (symbol_decode, message_format, label_number, instance_number, type); @@ -1560,30 +1783,27 @@ decode_local_label_name (s) /* Get the value of a symbol. */ valueT -S_GET_VALUE (s) - symbolS *s; +S_GET_VALUE (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) - return ((struct local_symbol *) s)->lsy_offset; + return resolve_symbol_value (s); + + if (!s->sy_resolved) + { + valueT val = resolve_symbol_value (s); + if (!finalize_syms) + return val; + } + if (S_IS_WEAKREFR (s)) + return S_GET_VALUE (s->sy_value.X_add_symbol); - if (!s->sy_resolved && s->sy_value.X_op != O_constant) - resolve_symbol_value (s, 1); if (s->sy_value.X_op != O_constant) { - static symbolS *recur; - - /* FIXME: In non BFD assemblers, S_IS_DEFINED and S_IS_COMMON - may call S_GET_VALUE. We use a static symbol to avoid the - immediate recursion. */ - if (recur == s) - return (valueT) s->sy_value.X_add_number; - recur = s; if (! s->sy_resolved || s->sy_value.X_op != O_symbol || (S_IS_DEFINED (s) && ! S_IS_COMMON (s))) - as_bad (_("Attempt to get value of unresolved symbol %s"), + as_bad (_("attempt to get value of unresolved symbol `%s'"), S_GET_NAME (s)); - recur = NULL; } return (valueT) s->sy_value.X_add_number; } @@ -1591,47 +1811,40 @@ S_GET_VALUE (s) /* Set the value of a symbol. */ void -S_SET_VALUE (s, val) - symbolS *s; - valueT val; +S_SET_VALUE (symbolS *s, valueT val) { if (LOCAL_SYMBOL_CHECK (s)) { - ((struct local_symbol *) s)->lsy_offset = val; + ((struct local_symbol *) s)->lsy_value = val; return; } s->sy_value.X_op = O_constant; s->sy_value.X_add_number = (offsetT) val; s->sy_value.X_unsigned = 0; + S_CLEAR_WEAKREFR (s); } void -copy_symbol_attributes (dest, src) - symbolS *dest, *src; +copy_symbol_attributes (symbolS *dest, symbolS *src) { if (LOCAL_SYMBOL_CHECK (dest)) - abort (); + dest = local_symbol_convert ((struct local_symbol *) dest); if (LOCAL_SYMBOL_CHECK (src)) - abort (); + src = local_symbol_convert ((struct local_symbol *) src); -#ifdef BFD_ASSEMBLER /* In an expression, transfer the settings of these flags. The user can override later, of course. */ #define COPIED_SYMFLAGS (BSF_FUNCTION | BSF_OBJECT) dest->bsym->flags |= src->bsym->flags & COPIED_SYMFLAGS; -#endif #ifdef OBJ_COPY_SYMBOL_ATTRIBUTES OBJ_COPY_SYMBOL_ATTRIBUTES (dest, src); #endif } -#ifdef BFD_ASSEMBLER - int -S_IS_FUNCTION (s) - symbolS *s; +S_IS_FUNCTION (symbolS *s) { flagword flags; @@ -1644,8 +1857,7 @@ S_IS_FUNCTION (s) } int -S_IS_EXTERNAL (s) - symbolS *s; +S_IS_EXTERNAL (symbolS *s) { flagword flags; @@ -1654,7 +1866,7 @@ S_IS_EXTERNAL (s) flags = s->bsym->flags; - /* sanity check */ + /* Sanity check. */ if ((flags & BSF_LOCAL) && (flags & BSF_GLOBAL)) abort (); @@ -1662,17 +1874,37 @@ S_IS_EXTERNAL (s) } int -S_IS_WEAK (s) - symbolS *s; +S_IS_WEAK (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 0; + /* Conceptually, a weakrefr is weak if the referenced symbol is. We + could probably handle a WEAKREFR as always weak though. E.g., if + the referenced symbol has lost its weak status, there's no reason + to keep handling the weakrefr as if it was weak. */ + if (S_IS_WEAKREFR (s)) + return S_IS_WEAK (s->sy_value.X_add_symbol); return (s->bsym->flags & BSF_WEAK) != 0; } int -S_IS_COMMON (s) - symbolS *s; +S_IS_WEAKREFR (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return 0; + return s->sy_weakrefr != 0; +} + +int +S_IS_WEAKREFD (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return 0; + return s->sy_weakrefd != 0; +} + +int +S_IS_COMMON (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 0; @@ -1680,17 +1912,37 @@ S_IS_COMMON (s) } int -S_IS_DEFINED (s) - symbolS *s; +S_IS_DEFINED (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return ((struct local_symbol *) s)->lsy_section != undefined_section; return s->bsym->section != undefined_section; } + +#ifndef EXTERN_FORCE_RELOC +#define EXTERN_FORCE_RELOC IS_ELF +#endif + +/* Return true for symbols that should not be reduced to section + symbols or eliminated from expressions, because they may be + overridden by the linker. */ +int +S_FORCE_RELOC (symbolS *s, int strict) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return ((struct local_symbol *) s)->lsy_section == undefined_section; + + return ((strict + && ((s->bsym->flags & BSF_WEAK) != 0 + || (EXTERN_FORCE_RELOC + && (s->bsym->flags & BSF_GLOBAL) != 0))) + || s->bsym->section == undefined_section + || bfd_is_com_section (s->bsym->section)); +} + int -S_IS_DEBUG (s) - symbolS *s; +S_IS_DEBUG (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 0; @@ -1700,8 +1952,7 @@ S_IS_DEBUG (s) } int -S_IS_LOCAL (s) - symbolS *s; +S_IS_LOCAL (symbolS *s) { flagword flags; const char *name; @@ -1711,7 +1962,7 @@ S_IS_LOCAL (s) flags = s->bsym->flags; - /* sanity check */ + /* Sanity check. */ if ((flags & BSF_LOCAL) && (flags & BSF_GLOBAL)) abort (); @@ -1719,15 +1970,17 @@ S_IS_LOCAL (s) return 1; if (flag_strip_local_absolute - && (flags & BSF_GLOBAL) == 0 + /* Keep BSF_FILE symbols in order to allow debuggers to identify + the source file even when the object file is stripped. */ + && (flags & (BSF_GLOBAL | BSF_FILE)) == 0 && bfd_get_section (s->bsym) == absolute_section) return 1; name = S_GET_NAME (s); return (name != NULL && ! S_IS_DEBUG (s) - && (strchr (name, '\001') - || strchr (name, '\002') + && (strchr (name, DOLLAR_LABEL_CHAR) + || strchr (name, LOCAL_LABEL_CHAR) || (! flag_keep_locals && (bfd_is_local_label (stdoutput, s->bsym) || (flag_mri @@ -1736,22 +1989,29 @@ S_IS_LOCAL (s) } int -S_IS_EXTERN (s) - symbolS *s; +S_IS_STABD (symbolS *s) { - return S_IS_EXTERNAL (s); + return S_GET_NAME (s) == 0; } int -S_IS_STABD (s) - symbolS *s; +S_IS_VOLATILE (const symbolS *s) { - return S_GET_NAME (s) == 0; + if (LOCAL_SYMBOL_CHECK (s)) + return 0; + return s->sy_volatile; } -CONST char * -S_GET_NAME (s) - symbolS *s; +int +S_IS_FORWARD_REF (const symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return 0; + return s->sy_forward_ref; +} + +const char * +S_GET_NAME (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return ((struct local_symbol *) s)->lsy_name; @@ -1759,8 +2019,7 @@ S_GET_NAME (s) } segT -S_GET_SEGMENT (s) - symbolS *s; +S_GET_SEGMENT (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return ((struct local_symbol *) s)->lsy_section; @@ -1768,9 +2027,7 @@ S_GET_SEGMENT (s) } void -S_SET_SEGMENT (s, seg) - symbolS *s; - segT seg; +S_SET_SEGMENT (symbolS *s, segT seg) { /* Don't reassign section symbols. The direct reason is to prevent seg faults assigning back to const global symbols such as *ABS*, but it @@ -1790,15 +2047,14 @@ S_SET_SEGMENT (s, seg) if (s->bsym->flags & BSF_SECTION_SYM) { if (s->bsym->section != seg) - abort(); + abort (); } else s->bsym->section = seg; } void -S_SET_EXTERNAL (s) - symbolS *s; +S_SET_EXTERNAL (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); @@ -1807,13 +2063,28 @@ S_SET_EXTERNAL (s) /* Let .weak override .global. */ return; } + if (s->bsym->flags & BSF_SECTION_SYM) + { + char * file; + unsigned int line; + + /* Do not reassign section symbols. */ + as_where (& file, & line); + as_warn_where (file, line, + _("section symbols are already global")); + return; + } s->bsym->flags |= BSF_GLOBAL; - s->bsym->flags &= ~(BSF_LOCAL|BSF_WEAK); + s->bsym->flags &= ~(BSF_LOCAL | BSF_WEAK); + +#ifdef USE_UNIQUE + if (! an_external_name && S_GET_NAME(s)[0] != '.') + an_external_name = S_GET_NAME (s); +#endif } void -S_CLEAR_EXTERNAL (s) - symbolS *s; +S_CLEAR_EXTERNAL (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return; @@ -1823,23 +2094,98 @@ S_CLEAR_EXTERNAL (s) return; } s->bsym->flags |= BSF_LOCAL; - s->bsym->flags &= ~(BSF_GLOBAL|BSF_WEAK); + s->bsym->flags &= ~(BSF_GLOBAL | BSF_WEAK); } void -S_SET_WEAK (s) - symbolS *s; +S_SET_WEAK (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); +#ifdef obj_set_weak_hook + obj_set_weak_hook (s); +#endif s->bsym->flags |= BSF_WEAK; - s->bsym->flags &= ~(BSF_GLOBAL|BSF_LOCAL); + s->bsym->flags &= ~(BSF_GLOBAL | BSF_LOCAL); +} + +void +S_SET_WEAKREFR (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + s = local_symbol_convert ((struct local_symbol *) s); + s->sy_weakrefr = 1; + /* If the alias was already used, make sure we mark the target as + used as well, otherwise it might be dropped from the symbol + table. This may have unintended side effects if the alias is + later redirected to another symbol, such as keeping the unused + previous target in the symbol table. Since it will be weak, it's + not a big deal. */ + if (s->sy_used) + symbol_mark_used (s->sy_value.X_add_symbol); +} + +void +S_CLEAR_WEAKREFR (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return; + s->sy_weakrefr = 0; +} + +void +S_SET_WEAKREFD (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + s = local_symbol_convert ((struct local_symbol *) s); + s->sy_weakrefd = 1; + S_SET_WEAK (s); } void -S_SET_NAME (s, name) - symbolS *s; - char *name; +S_CLEAR_WEAKREFD (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return; + if (s->sy_weakrefd) + { + s->sy_weakrefd = 0; + /* If a weakref target symbol is weak, then it was never + referenced directly before, not even in a .global directive, + so decay it to local. If it remains undefined, it will be + later turned into a global, like any other undefined + symbol. */ + if (s->bsym->flags & BSF_WEAK) + { +#ifdef obj_clear_weak_hook + obj_clear_weak_hook (s); +#endif + s->bsym->flags &= ~BSF_WEAK; + s->bsym->flags |= BSF_LOCAL; + } + } +} + +void +S_SET_THREAD_LOCAL (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + s = local_symbol_convert ((struct local_symbol *) s); + if (bfd_is_com_section (s->bsym->section) + && (s->bsym->flags & BSF_THREAD_LOCAL) != 0) + return; + s->bsym->flags |= BSF_THREAD_LOCAL; + if ((s->bsym->flags & BSF_FUNCTION) != 0) + as_bad (_("Accessing function `%s' as thread-local object"), + S_GET_NAME (s)); + else if (! bfd_is_und_section (s->bsym->section) + && (s->bsym->section->flags & SEC_THREAD_LOCAL) == 0) + as_bad (_("Accessing `%s' as thread-local object"), + S_GET_NAME (s)); +} + +void +S_SET_NAME (symbolS *s, const char *name) { if (LOCAL_SYMBOL_CHECK (s)) { @@ -1848,28 +2194,44 @@ S_SET_NAME (s, name) } s->bsym->name = name; } -#endif /* BFD_ASSEMBLER */ -#ifdef SYMBOLS_NEED_BACKPOINTERS +void +S_SET_VOLATILE (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + s = local_symbol_convert ((struct local_symbol *) s); + s->sy_volatile = 1; +} + +void +S_CLEAR_VOLATILE (symbolS *s) +{ + if (!LOCAL_SYMBOL_CHECK (s)) + s->sy_volatile = 0; +} + +void +S_SET_FORWARD_REF (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + s = local_symbol_convert ((struct local_symbol *) s); + s->sy_forward_ref = 1; +} /* Return the previous symbol in a chain. */ symbolS * -symbol_previous (s) - symbolS *s; +symbol_previous (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) abort (); return s->sy_previous; } -#endif /* SYMBOLS_NEED_BACKPOINTERS */ - /* Return the next symbol in a chain. */ symbolS * -symbol_next (s) - symbolS *s; +symbol_next (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) abort (); @@ -1879,8 +2241,7 @@ symbol_next (s) /* Return a pointer to the value of a symbol as an expression. */ expressionS * -symbol_get_value_expression (s) - symbolS *s; +symbol_get_value_expression (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); @@ -1890,21 +2251,39 @@ symbol_get_value_expression (s) /* Set the value of a symbol to an expression. */ void -symbol_set_value_expression (s, exp) - symbolS *s; - const expressionS *exp; +symbol_set_value_expression (symbolS *s, const expressionS *exp) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); s->sy_value = *exp; + S_CLEAR_WEAKREFR (s); +} + +/* Return a pointer to the X_add_number component of a symbol. */ + +offsetT * +symbol_X_add_number (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return (offsetT *) &((struct local_symbol *) s)->lsy_value; + + return &s->sy_value.X_add_number; +} + +/* Set the value of SYM to the current position in the current segment. */ + +void +symbol_set_value_now (symbolS *sym) +{ + S_SET_SEGMENT (sym, now_seg); + S_SET_VALUE (sym, frag_now_fix ()); + symbol_set_frag (sym, frag_now); } /* Set the frag of a symbol. */ void -symbol_set_frag (s, f) - symbolS *s; - fragS *f; +symbol_set_frag (symbolS *s, fragS *f) { if (LOCAL_SYMBOL_CHECK (s)) { @@ -1912,13 +2291,13 @@ symbol_set_frag (s, f) return; } s->sy_frag = f; + S_CLEAR_WEAKREFR (s); } /* Return the frag of a symbol. */ fragS * -symbol_get_frag (s) - symbolS *s; +symbol_get_frag (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return local_symbol_get_frag ((struct local_symbol *) s); @@ -1928,19 +2307,19 @@ symbol_get_frag (s) /* Mark a symbol as having been used. */ void -symbol_mark_used (s) - symbolS *s; +symbol_mark_used (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return; s->sy_used = 1; + if (S_IS_WEAKREFR (s)) + symbol_mark_used (s->sy_value.X_add_symbol); } /* Clear the mark of whether a symbol has been used. */ void -symbol_clear_used (s) - symbolS *s; +symbol_clear_used (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); @@ -1950,8 +2329,7 @@ symbol_clear_used (s) /* Return whether a symbol has been used. */ int -symbol_used_p (s) - symbolS *s; +symbol_used_p (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 1; @@ -1961,8 +2339,7 @@ symbol_used_p (s) /* Mark a symbol as having been used in a reloc. */ void -symbol_mark_used_in_reloc (s) - symbolS *s; +symbol_mark_used_in_reloc (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); @@ -1972,8 +2349,7 @@ symbol_mark_used_in_reloc (s) /* Clear the mark of whether a symbol has been used in a reloc. */ void -symbol_clear_used_in_reloc (s) - symbolS *s; +symbol_clear_used_in_reloc (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return; @@ -1983,8 +2359,7 @@ symbol_clear_used_in_reloc (s) /* Return whether a symbol has been used in a reloc. */ int -symbol_used_in_reloc_p (s) - symbolS *s; +symbol_used_in_reloc_p (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 0; @@ -1994,8 +2369,7 @@ symbol_used_in_reloc_p (s) /* Mark a symbol as an MRI common symbol. */ void -symbol_mark_mri_common (s) - symbolS *s; +symbol_mark_mri_common (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); @@ -2005,8 +2379,7 @@ symbol_mark_mri_common (s) /* Clear the mark of whether a symbol is an MRI common symbol. */ void -symbol_clear_mri_common (s) - symbolS *s; +symbol_clear_mri_common (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return; @@ -2016,8 +2389,7 @@ symbol_clear_mri_common (s) /* Return whether a symbol is an MRI common symbol. */ int -symbol_mri_common_p (s) - symbolS *s; +symbol_mri_common_p (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 0; @@ -2027,8 +2399,7 @@ symbol_mri_common_p (s) /* Mark a symbol as having been written. */ void -symbol_mark_written (s) - symbolS *s; +symbol_mark_written (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return; @@ -2038,8 +2409,7 @@ symbol_mark_written (s) /* Clear the mark of whether a symbol has been written. */ void -symbol_clear_written (s) - symbolS *s; +symbol_clear_written (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return; @@ -2049,8 +2419,7 @@ symbol_clear_written (s) /* Return whether a symbol has been written. */ int -symbol_written_p (s) - symbolS *s; +symbol_written_p (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 0; @@ -2060,8 +2429,7 @@ symbol_written_p (s) /* Mark a symbol has having been resolved. */ void -symbol_mark_resolved (s) - symbolS *s; +symbol_mark_resolved (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) { @@ -2074,8 +2442,7 @@ symbol_mark_resolved (s) /* Return whether a symbol has been resolved. */ int -symbol_resolved_p (s) - symbolS *s; +symbol_resolved_p (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return local_symbol_resolved_p ((struct local_symbol *) s); @@ -2085,48 +2452,57 @@ symbol_resolved_p (s) /* Return whether a symbol is a section symbol. */ int -symbol_section_p (s) - symbolS *s; +symbol_section_p (symbolS *s ATTRIBUTE_UNUSED) { if (LOCAL_SYMBOL_CHECK (s)) return 0; -#ifdef BFD_ASSEMBLER return (s->bsym->flags & BSF_SECTION_SYM) != 0; -#else - /* FIXME */ - return 0; -#endif } /* Return whether a symbol is equated to another symbol. */ int -symbol_equated_p (s) - symbolS *s; +symbol_equated_p (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 0; return s->sy_value.X_op == O_symbol; } +/* Return whether a symbol is equated to another symbol, and should be + treated specially when writing out relocs. */ + +int +symbol_equated_reloc_p (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return 0; + /* X_op_symbol, normally not used for O_symbol, is set by + resolve_symbol_value to flag expression syms that have been + equated. */ + return (s->sy_value.X_op == O_symbol +#if defined (OBJ_COFF) && defined (TE_PE) + && ! S_IS_WEAK (s) +#endif + && ((s->sy_resolved && s->sy_value.X_op_symbol != NULL) + || ! S_IS_DEFINED (s) + || S_IS_COMMON (s))); +} + /* Return whether a symbol has a constant value. */ int -symbol_constant_p (s) - symbolS *s; +symbol_constant_p (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 1; return s->sy_value.X_op == O_constant; } -#ifdef BFD_ASSEMBLER - /* Return the BFD symbol for a symbol. */ asymbol * -symbol_get_bfdsym (s) - symbolS *s; +symbol_get_bfdsym (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); @@ -2136,24 +2512,28 @@ symbol_get_bfdsym (s) /* Set the BFD symbol for a symbol. */ void -symbol_set_bfdsym (s, bsym) - symbolS *s; - asymbol *bsym; +symbol_set_bfdsym (symbolS *s, asymbol *bsym) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); - s->bsym = bsym; + /* Usually, it is harmless to reset a symbol to a BFD section + symbol. For example, obj_elf_change_section sets the BFD symbol + of an old symbol with the newly created section symbol. But when + we have multiple sections with the same name, the newly created + section may have the same name as an old section. We check if the + old symbol has been already marked as a section symbol before + resetting it. */ + if ((s->bsym->flags & BSF_SECTION_SYM) == 0) + s->bsym = bsym; + /* else XXX - What do we do now ? */ } -#endif /* BFD_ASSEMBLER */ - #ifdef OBJ_SYMFIELD_TYPE /* Get a pointer to the object format information for a symbol. */ OBJ_SYMFIELD_TYPE * -symbol_get_obj (s) - symbolS *s; +symbol_get_obj (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); @@ -2163,9 +2543,7 @@ symbol_get_obj (s) /* Set the object format information for a symbol. */ void -symbol_set_obj (s, o) - symbolS *s; - OBJ_SYMFIELD_TYPE *o; +symbol_set_obj (symbolS *s, OBJ_SYMFIELD_TYPE *o) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); @@ -2179,8 +2557,7 @@ symbol_set_obj (s, o) /* Get a pointer to the processor information for a symbol. */ TC_SYMFIELD_TYPE * -symbol_get_tc (s) - symbolS *s; +symbol_get_tc (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); @@ -2190,9 +2567,7 @@ symbol_get_tc (s) /* Set the processor information for a symbol. */ void -symbol_set_obj (s, o) - symbolS *s; - TC_SYMFIELD_TYPE *o; +symbol_set_tc (symbolS *s, TC_SYMFIELD_TYPE *o) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); @@ -2202,23 +2577,16 @@ symbol_set_obj (s, o) #endif /* TC_SYMFIELD_TYPE */ void -symbol_begin () +symbol_begin (void) { symbol_lastP = NULL; - symbol_rootP = NULL; /* In case we have 0 symbols (!!) */ + symbol_rootP = NULL; /* In case we have 0 symbols (!!) */ sy_hash = hash_new (); -#ifdef BFD_ASSEMBLER local_hash = hash_new (); -#endif memset ((char *) (&abs_symbol), '\0', sizeof (abs_symbol)); -#ifdef BFD_ASSEMBLER #if defined (EMIT_SECTION_SYMBOLS) || !defined (RELOC_REQUIRES_SYMBOL) abs_symbol.bsym = bfd_abs_section.symbol; -#endif -#else - /* Can't initialise a union. Sigh. */ - S_SET_SEGMENT (&abs_symbol, absolute_section); #endif abs_symbol.sy_value.X_op = O_constant; abs_symbol.sy_frag = &zero_address_frag; @@ -2226,29 +2594,15 @@ symbol_begin () if (LOCAL_LABELS_FB) fb_label_init (); } - - int indent_level; /* Maximum indent level. Available for modification inside a gdb session. */ -int max_indent_level = 8; - -#if 0 - -static void -indent () -{ - printf ("%*s", indent_level * 4, ""); -} - -#endif +static int max_indent_level = 8; void -print_symbol_value_1 (file, sym) - FILE *file; - symbolS *sym; +print_symbol_value_1 (FILE *file, symbolS *sym) { const char *name = S_GET_NAME (sym); if (!name || !name[0]) @@ -2281,20 +2635,26 @@ print_symbol_value_1 (file, sym) fprintf (file, " used"); if (S_IS_LOCAL (sym)) fprintf (file, " local"); - if (S_IS_EXTERN (sym)) + if (S_IS_EXTERNAL (sym)) fprintf (file, " extern"); + if (S_IS_WEAK (sym)) + fprintf (file, " weak"); if (S_IS_DEBUG (sym)) fprintf (file, " debug"); if (S_IS_DEFINED (sym)) fprintf (file, " defined"); } + if (S_IS_WEAKREFR (sym)) + fprintf (file, " weakrefr"); + if (S_IS_WEAKREFD (sym)) + fprintf (file, " weakrefd"); fprintf (file, " %s", segment_name (S_GET_SEGMENT (sym))); if (symbol_resolved_p (sym)) { segT s = S_GET_SEGMENT (sym); if (s != undefined_section - && s != expr_section) + && s != expr_section) fprintf (file, " %lx", (long) S_GET_VALUE (sym)); } else if (indent_level < max_indent_level @@ -2304,7 +2664,7 @@ print_symbol_value_1 (file, sym) fprintf (file, "\n%*s<", indent_level * 4, ""); if (LOCAL_SYMBOL_CHECK (sym)) fprintf (file, "constant %lx", - (long) ((struct local_symbol *) sym)->lsy_offset); + (long) ((struct local_symbol *) sym)->lsy_value); else print_expr_1 (file, &sym->sy_value); fprintf (file, ">"); @@ -2314,8 +2674,7 @@ print_symbol_value_1 (file, sym) } void -print_symbol_value (sym) - symbolS *sym; +print_symbol_value (symbolS *sym) { indent_level = 0; print_symbol_value_1 (stderr, sym); @@ -2323,10 +2682,7 @@ print_symbol_value (sym) } static void -print_binary (file, name, exp) - FILE *file; - const char * name; - expressionS *exp; +print_binary (FILE *file, const char *name, expressionS *exp) { indent_level++; fprintf (file, "%s\n%*s<", name, indent_level * 4, ""); @@ -2338,9 +2694,7 @@ print_binary (file, name, exp) } void -print_expr_1 (file, exp) - FILE *file; - expressionS *exp; +print_expr_1 (FILE *file, expressionS *exp) { fprintf (file, "expr %lx ", (long) exp); switch (exp->X_op) @@ -2452,23 +2806,17 @@ print_expr_1 (file, exp) } void -print_expr (exp) - expressionS *exp; +print_expr (expressionS *exp) { print_expr_1 (stderr, exp); fprintf (stderr, "\n"); } void -symbol_print_statistics (file) - FILE *file; +symbol_print_statistics (FILE *file) { hash_print_statistics (file, "symbol table", sy_hash); -#ifdef BFD_ASSEMBLER hash_print_statistics (file, "mini local symbol table", local_hash); fprintf (file, "%lu mini local symbols created, %lu converted\n", local_symbol_count, local_symbol_conversion_count); -#endif } - -/* end of symbols.c */