X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fsymbols.c;h=4c3137a12786f0da059195e6c81bcbf2f2952e05;hb=5be33403c378ceb9487ad14a1309392dc03a1263;hp=49d546d8332fb00712279150a9352dc4b8bfb193;hpb=7be1c4891a2036c31e706908d43f33f7f59ae5a9;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/symbols.c b/gas/symbols.c index 49d546d833..4c3137a127 100644 --- a/gas/symbols.c +++ b/gas/symbols.c @@ -1,13 +1,11 @@ /* symbols.c -symbol table- - Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. + Copyright (C) 1987-2016 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + the Free Software Foundation; either version 3, or (at your option) any later version. GAS is distributed in the hope that it will be useful, @@ -23,11 +21,9 @@ /* #define DEBUG_SYMS / * to debug symbol list maintenance. */ #include "as.h" - #include "safe-ctype.h" #include "obstack.h" /* For "symbols.h" */ #include "subsegs.h" - #include "struc-symbol.h" /* This is non-zero if symbols are case sensitive, which is the @@ -48,6 +44,7 @@ static struct hash_control *local_hash; symbolS *symbol_rootP; symbolS *symbol_lastP; symbolS abs_symbol; +symbolS dot_symbol; #ifdef DEBUG_SYMS #define debug_verify_symchain verify_symbol_chain @@ -58,20 +55,23 @@ symbolS abs_symbol; #define DOLLAR_LABEL_CHAR '\001' #define LOCAL_LABEL_CHAR '\002' +#ifndef TC_LABEL_IS_LOCAL +#define TC_LABEL_IS_LOCAL(name) 0 +#endif + struct obstack notes; -#ifdef USE_UNIQUE +#ifdef TE_PE /* The name of an external symbol which is used to make weak PE symbol names unique. */ const char * an_external_name; #endif -static char *save_symbol_name (const char *); +static const 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 (FILE *, const char *, expressionS *); -static void report_op_error (symbolS *, symbolS *, symbolS *); /* 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 @@ -101,15 +101,15 @@ symbol_new (const char *name, segT segment, valueT valu, fragS *frag) /* Save a symbol name on a permanent obstack, and convert it according to the object file format. */ -static char * +static const char * save_symbol_name (const char *name) { - unsigned int name_length; + size_t name_length; char *ret; name_length = strlen (name) + 1; /* +1 for \0. */ obstack_grow (¬es, name, name_length); - ret = obstack_finish (¬es); + ret = (char *) obstack_finish (¬es); #ifdef tc_canonicalize_symbol_name ret = tc_canonicalize_symbol_name (ret); @@ -132,7 +132,7 @@ symbol_create (const char *name, /* It is copied, the caller can destroy/modify. valueT valu, /* Symbol value. */ fragS *frag /* Associated fragment. */) { - char *preserved_copy_of_name; + const char *preserved_copy_of_name; symbolS *symbolP; preserved_copy_of_name = save_symbol_name (name); @@ -144,8 +144,7 @@ symbol_create (const char *name, /* It is copied, the caller can destroy/modify. symbolP->bsym = bfd_make_empty_symbol (stdoutput); if (symbolP->bsym == NULL) - as_perror ("%s", "bfd_make_empty_symbol"); - symbolP->bsym->udata.p = (PTR) symbolP; + as_fatal ("bfd_make_empty_symbol: %s", bfd_errmsg (bfd_get_error ())); S_SET_NAME (symbolP, preserved_copy_of_name); S_SET_SEGMENT (symbolP, segment); @@ -179,7 +178,7 @@ static unsigned long local_symbol_conversion_count; changes its argument to the real symbol. */ #define LOCAL_SYMBOL_CHECK(s) \ - (s->bsym == NULL \ + (s->sy_flags.sy_local_symbol \ ? (local_symbol_converted_p ((struct local_symbol *) s) \ ? (s = local_symbol_get_real_symbol ((struct local_symbol *) s), \ 0) \ @@ -188,10 +187,10 @@ 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 (const char *name, segT section, valueT value, fragS *frag) +struct local_symbol * +local_symbol_make (const char *name, segT section, valueT val, fragS *frag) { - char *name_copy; + const char *name_copy; struct local_symbol *ret; ++local_symbol_count; @@ -199,13 +198,14 @@ local_symbol_make (const char *name, segT section, valueT value, fragS *frag) name_copy = save_symbol_name (name); ret = (struct local_symbol *) obstack_alloc (¬es, sizeof *ret); - ret->lsy_marker = NULL; + ret->lsy_flags.sy_local_symbol = 1; + ret->lsy_flags.sy_resolved = 0; ret->lsy_name = name_copy; ret->lsy_section = section; local_symbol_set_frag (ret, frag); - ret->lsy_value = value; + ret->lsy_value = val; - hash_jam (local_hash, name_copy, (PTR) ret); + hash_jam (local_hash, name_copy, (void *) ret); return ret; } @@ -218,7 +218,7 @@ local_symbol_convert (struct local_symbol *locsym) { symbolS *ret; - assert (locsym->lsy_marker == NULL); + gas_assert (locsym->lsy_flags.sy_local_symbol); if (local_symbol_converted_p (locsym)) return local_symbol_get_real_symbol (locsym); @@ -228,10 +228,10 @@ local_symbol_convert (struct local_symbol *locsym) local_symbol_get_frag (locsym)); if (local_symbol_resolved_p (locsym)) - ret->sy_resolved = 1; + ret->sy_flags.sy_resolved = 1; /* Local symbols are always either defined or used. */ - ret->sy_used = 1; + ret->sy_flags.sy_used = 1; #ifdef TC_LOCAL_SYMFIELD_CONVERT TC_LOCAL_SYMFIELD_CONVERT (locsym, ret); @@ -247,6 +247,14 @@ local_symbol_convert (struct local_symbol *locsym) return ret; } +static void +define_sym_at_dot (symbolS *symbolP) +{ + symbolP->sy_frag = frag_now; + S_SET_VALUE (symbolP, (valueT) frag_now_fix ()); + S_SET_SEGMENT (symbolP, now_seg); +} + /* We have just seen ":". Creates a struct symbol unless it already exists. @@ -257,7 +265,7 @@ 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. */ + symbolS *symbolP; /* Symbol we are working with. */ /* Sun local labels go out of scope whenever a non-local symbol is defined. */ @@ -307,8 +315,13 @@ colon (/* Just seen "x:" - rattle symbols & frags. */ } #endif /* WORKING_DOT_WORD */ +#ifdef obj_frob_colon + obj_frob_colon (sym_name); +#endif + if ((symbolP = symbol_find (sym_name)) != 0) { + S_CLEAR_WEAKREFR (symbolP); #ifdef RESOLVE_SYMBOL_REDEFINITION if (RESOLVE_SYMBOL_REDEFINITION (symbolP)) return symbolP; @@ -331,16 +344,19 @@ colon (/* Just seen "x:" - rattle symbols & frags. */ local_symbol_set_frag (locsym, frag_now); 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)) + { + 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); -#endif - S_SET_VALUE (symbolP, (valueT) frag_now_fix ()); - S_SET_SEGMENT (symbolP, now_seg); + define_sym_at_dot (symbolP); #ifdef N_UNDF know (N_UNDF == 0); #endif /* if we have one, it better be zero. */ @@ -364,6 +380,7 @@ colon (/* Just seen "x:" - rattle symbols & frags. */ && 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. */ @@ -384,12 +401,7 @@ colon (/* Just seen "x:" - rattle symbols & frags. */ { /* It is a .comm/.lcomm being converted to initialized data. */ - symbolP->sy_frag = frag_now; -#ifdef OBJ_VMS - 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. */ + define_sym_at_dot (symbolP); } } else @@ -419,7 +431,11 @@ colon (/* Just seen "x:" - rattle symbols & frags. */ if (!(frag_now == symbolP->sy_frag && S_GET_VALUE (symbolP) == frag_now_fix () && S_GET_SEGMENT (symbolP) == now_seg)) - as_bad (_("symbol `%s' is already defined"), sym_name); + { + as_bad (_("symbol `%s' is already defined"), sym_name); + symbolP = symbol_clone (symbolP, 0); + define_sym_at_dot (symbolP); + } } } @@ -433,9 +449,6 @@ colon (/* Just seen "x:" - rattle symbols & frags. */ { symbolP = symbol_new (sym_name, now_seg, (valueT) frag_now_fix (), frag_now); -#ifdef OBJ_VMS - S_SET_OTHER (symbolP, const_flag); -#endif /* OBJ_VMS */ symbol_table_insert (symbolP); } @@ -451,7 +464,7 @@ colon (/* Just seen "x:" - rattle symbols & frags. */ symbolP->sy_value.X_add_number = S_GET_VALUE (mri_common_symbol); symbolP->sy_frag = &zero_address_frag; S_SET_SEGMENT (symbolP, expr_section); - symbolP->sy_mri_common = 1; + symbolP->sy_flags.sy_mri_common = 1; } #ifdef tc_frob_label @@ -469,7 +482,7 @@ colon (/* Just seen "x:" - rattle symbols & frags. */ void symbol_table_insert (symbolS *symbolP) { - register const char *error_string; + const char *error_string; know (symbolP); know (S_GET_NAME (symbolP)); @@ -477,14 +490,14 @@ symbol_table_insert (symbolS *symbolP) if (LOCAL_SYMBOL_CHECK (symbolP)) { error_string = hash_jam (local_hash, S_GET_NAME (symbolP), - (PTR) symbolP); + (void *) symbolP); if (error_string != NULL) 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))) + if ((error_string = hash_jam (sy_hash, S_GET_NAME (symbolP), (void *) symbolP))) { as_fatal (_("inserting \"%s\" into symbol table failed: %s"), S_GET_NAME (symbolP), error_string); @@ -497,7 +510,7 @@ symbol_table_insert (symbolS *symbolP) symbolS * symbol_find_or_make (const char *name) { - register symbolS *symbolP; + symbolS *symbolP; symbolP = symbol_find (name); @@ -537,6 +550,138 @@ symbol_make (const char *name) return (symbolP); } +symbolS * +symbol_clone (symbolS *orgsymP, int replace) +{ + symbolS *newsymP; + asymbol *bsymorg, *bsymnew; + + /* Make sure we never clone the dot special symbol. */ + gas_assert (orgsymP != &dot_symbol); + + /* 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; + + newsymP = (symbolS *) obstack_alloc (¬es, sizeof (*newsymP)); + *newsymP = *orgsymP; + bsymnew = bfd_make_empty_symbol (bfd_asymbol_bfd (bsymorg)); + if (bsymnew == NULL) + as_fatal ("bfd_make_empty_symbol: %s", bfd_errmsg (bfd_get_error ())); + newsymP->bsym = bsymnew; + bsymnew->name = bsymorg->name; + bsymnew->flags = bsymorg->flags & ~BSF_SECTION_SYM; + bsymnew->section = bsymorg->section; + 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; + + /* Symbols that won't be output can't be external. */ + S_CLEAR_EXTERNAL (orgsymP); + orgsymP->sy_previous = orgsymP->sy_next = orgsymP; + debug_verify_symchain (symbol_rootP, symbol_lastP); + + symbol_table_insert (newsymP); + } + else + { + /* Symbols that won't be output can't be external. */ + S_CLEAR_EXTERNAL (newsymP); + newsymP->sy_previous = newsymP->sy_next = 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_clone_if_forward_ref (symbolS *symbolP, int is_forward) +{ + 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_flags.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_flags.sy_forward_ref) + && !symbolP->sy_flags.sy_resolving) + { + symbolP->sy_flags.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_flags.sy_resolving = 0; + } + + if (symbolP->sy_flags.sy_forward_ref + || add_symbol != symbolP->sy_value.X_add_symbol + || op_symbol != symbolP->sy_value.X_op_symbol) + { + if (symbolP != &dot_symbol) + { + symbolP = symbol_clone (symbolP, 0); + symbolP->sy_flags.sy_resolving = 0; + } + else + { + symbolP = symbol_temp_new_now (); +#ifdef tc_new_dot_label + tc_new_dot_label (symbolP); +#endif + } + } + + 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) { @@ -562,47 +707,76 @@ symbol_temp_make (void) 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; locsym = (struct local_symbol *) hash_find (local_hash, name); if (locsym != NULL) return (symbolS *) locsym; - return ((symbolS *) hash_find (sy_hash, name)); + 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) +{ + symbolS * result; + char * copy = NULL; + #ifdef tc_canonicalize_symbol_name { - char *copy; - size_t len = strlen (name) + 1; - - copy = (char *) alloca (len); - memcpy (copy, name, len); + copy = xstrdup (name); name = tc_canonicalize_symbol_name (copy); } #endif if (! symbols_case_sensitive) { - char *copy; const char *orig; + char *copy2 = NULL; unsigned char c; orig = name; - name = copy = (char *) alloca (strlen (name) + 1); + if (copy != NULL) + copy2 = copy; + name = copy = XNEWVEC (char, strlen (name) + 1); while ((c = *orig++) != '\0') - { - *copy++ = TOUPPER (c); - } + *copy++ = TOUPPER (c); *copy = '\0'; + + if (copy2 != NULL) + free (copy2); + copy = (char *) name; } - return symbol_find_exact (name); + result = symbol_find_exact_noref (name, noref); + if (copy != NULL) + free (copy); + return result; } /* Once upon a time, symbols were kept in a singly linked list. At @@ -730,65 +904,137 @@ verify_symbol_chain (symbolS *rootP, symbolS *lastP) for (; symbol_next (symbolP) != NULL; symbolP = symbol_next (symbolP)) { - assert (symbolP->bsym != NULL); - assert (symbolP->sy_next->sy_previous == symbolP); + gas_assert (symbolP->bsym != NULL); + gas_assert (symbolP->sy_flags.sy_local_symbol == 0); + gas_assert (symbolP->sy_next->sy_previous == symbolP); } - assert (lastP == symbolP); + gas_assert (lastP == symbolP); +} + +#ifdef OBJ_COMPLEX_RELC + +static int +use_complex_relocs_for (symbolS * symp) +{ + switch (symp->sy_value.X_op) + { + case O_constant: + return 0; + + case O_symbol: + case O_symbol_rva: + case O_uminus: + case O_bit_not: + case O_logical_not: + if ( (S_IS_COMMON (symp->sy_value.X_add_symbol) + || S_IS_LOCAL (symp->sy_value.X_add_symbol)) + && + (S_IS_DEFINED (symp->sy_value.X_add_symbol) + && S_GET_SEGMENT (symp->sy_value.X_add_symbol) != expr_section)) + return 0; + break; + + case O_multiply: + case O_divide: + case O_modulus: + case O_left_shift: + case O_right_shift: + case O_bit_inclusive_or: + case O_bit_or_not: + case O_bit_exclusive_or: + case O_bit_and: + case O_add: + case O_subtract: + case O_eq: + case O_ne: + case O_lt: + case O_le: + case O_ge: + case O_gt: + case O_logical_and: + case O_logical_or: + + if ( (S_IS_COMMON (symp->sy_value.X_add_symbol) + || S_IS_LOCAL (symp->sy_value.X_add_symbol)) + && + (S_IS_COMMON (symp->sy_value.X_op_symbol) + || S_IS_LOCAL (symp->sy_value.X_op_symbol)) + + && S_IS_DEFINED (symp->sy_value.X_add_symbol) + && S_IS_DEFINED (symp->sy_value.X_op_symbol) + && S_GET_SEGMENT (symp->sy_value.X_add_symbol) != expr_section + && S_GET_SEGMENT (symp->sy_value.X_op_symbol) != expr_section) + return 0; + break; + + default: + break; + } + return 1; } +#endif static void -report_op_error (symbolS *symp, symbolS *left, symbolS *right) +report_op_error (symbolS *symp, symbolS *left, operatorT op, symbolS *right) { - char *file; + const char *file; unsigned int line; - segT seg_left = S_GET_SEGMENT (left); - segT seg_right = right ? S_GET_SEGMENT (right) : 0; + segT seg_left = left ? S_GET_SEGMENT (left) : 0; + segT seg_right = S_GET_SEGMENT (right); + const char *opname; + + switch (op) + { + default: + abort (); + return; + + case O_uminus: opname = "-"; break; + case O_bit_not: opname = "~"; break; + case O_logical_not: opname = "!"; break; + case O_multiply: opname = "*"; break; + case O_divide: opname = "/"; break; + case O_modulus: opname = "%"; break; + case O_left_shift: opname = "<<"; break; + case O_right_shift: opname = ">>"; break; + case O_bit_inclusive_or: opname = "|"; break; + case O_bit_or_not: opname = "|~"; break; + case O_bit_exclusive_or: opname = "^"; break; + case O_bit_and: opname = "&"; break; + case O_add: opname = "+"; break; + case O_subtract: opname = "-"; break; + case O_eq: opname = "=="; break; + case O_ne: opname = "!="; break; + case O_lt: opname = "<"; break; + case O_le: opname = "<="; break; + case O_ge: opname = ">="; break; + case O_gt: opname = ">"; break; + case O_logical_and: opname = "&&"; break; + case O_logical_or: opname = "||"; break; + } if (expr_symbol_where (symp, &file, &line)) { - if (seg_left == undefined_section) + if (left) as_bad_where (file, line, - _("undefined symbol `%s' in operation"), - S_GET_NAME (left)); - if (seg_right == undefined_section) + _("invalid operands (%s and %s sections) for `%s'"), + seg_left->name, seg_right->name, opname); + else 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)); - } - + _("invalid operand (%s section) for `%s'"), + seg_right->name, opname); } 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)); - } + const char *sname = S_GET_NAME (symp); + + if (left) + as_bad (_("invalid operands (%s and %s sections) for `%s' when setting `%s'"), + seg_left->name, seg_right->name, opname, sname); + else + as_bad (_("invalid operand (%s section) for `%s' when setting `%s'"), + seg_right->name, opname, sname); } } @@ -822,7 +1068,7 @@ resolve_symbol_value (symbolS *symp) return final_val; } - if (symp->sy_resolved) + if (symp->sy_flags.sy_resolved) { if (symp->sy_value.X_op == O_constant) return (valueT) symp->sy_value.X_add_number; @@ -833,7 +1079,7 @@ resolve_symbol_value (symbolS *symp) resolved = 0; final_seg = S_GET_SEGMENT (symp); - if (symp->sy_resolving) + if (symp->sy_flags.sy_resolving) { if (finalize_syms) as_bad (_("symbol definition loop encountered at `%s'"), @@ -841,6 +1087,53 @@ resolve_symbol_value (symbolS *symp) final_val = 0; resolved = 1; } +#ifdef OBJ_COMPLEX_RELC + else if (final_seg == expr_section + && use_complex_relocs_for (symp)) + { + symbolS * relc_symbol = NULL; + char * relc_symbol_name = NULL; + + relc_symbol_name = symbol_relc_make_expr (& symp->sy_value); + + /* For debugging, print out conversion input & output. */ +#ifdef DEBUG_SYMS + print_expr (& symp->sy_value); + if (relc_symbol_name) + fprintf (stderr, "-> relc symbol: %s\n", relc_symbol_name); +#endif + + if (relc_symbol_name != NULL) + relc_symbol = symbol_new (relc_symbol_name, undefined_section, + 0, & zero_address_frag); + + if (relc_symbol == NULL) + { + as_bad (_("cannot convert expression symbol %s to complex relocation"), + S_GET_NAME (symp)); + resolved = 0; + } + else + { + symbol_table_insert (relc_symbol); + + /* S_CLEAR_EXTERNAL (relc_symbol); */ + if (symp->bsym->flags & BSF_SRELC) + relc_symbol->bsym->flags |= BSF_SRELC; + else + relc_symbol->bsym->flags |= BSF_RELC; + /* symp->bsym->flags |= BSF_RELC; */ + copy_symbol_attributes (symp, relc_symbol); + symp->sy_value.X_op = O_symbol; + symp->sy_value.X_add_symbol = relc_symbol; + symp->sy_value.X_add_number = 0; + resolved = 1; + } + + final_seg = undefined_section; + goto exit_dont_set_value; + } +#endif else { symbolS *add_symbol, *op_symbol; @@ -849,7 +1142,7 @@ resolve_symbol_value (symbolS *symp) operatorT op; int move_seg_ok; - symp->sy_resolving = 1; + symp->sy_flags.sy_resolving = 1; /* Help out with CSE. */ add_symbol = symp->sy_value.X_add_symbol; @@ -871,6 +1164,9 @@ resolve_symbol_value (symbolS *symp) final_val += symp->sy_frag->fr_address / OCTETS_PER_BYTE; if (final_seg == expr_section) final_seg = absolute_section; + /* Fall through. */ + + case O_register: resolved = 1; break; @@ -882,7 +1178,20 @@ resolve_symbol_value (symbolS *symp) symp->sy_value.X_op_symbol = NULL; do_symbol: - if (symp->sy_mri_common) + if (S_IS_WEAKREFR (symp)) + { + gas_assert (final_val == 0); + if (S_IS_WEAKREFR (add_symbol)) + { + gas_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; + gas_assert (! S_IS_WEAKREFR (add_symbol)); + symp->sy_value.X_add_symbol = add_symbol; + } + } + + if (symp->sy_flags.sy_mri_common) { /* This is a symbol inside an MRI common section. The relocation routines are going to handle it specially. @@ -918,15 +1227,16 @@ resolve_symbol_value (symbolS *symp) 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_seg = seg_left; final_val = 0; resolved = symbol_resolved_p (add_symbol); - symp->sy_resolving = 0; + symp->sy_flags.sy_resolving = 0; goto exit_dont_set_value; } - else if (finalize_syms && final_seg == expr_section - && seg_left != expr_section) + else if (finalize_syms + && ((final_seg == expr_section && seg_left != expr_section) + || symbol_shadow_p (symp))) { /* If the symbol is an expression symbol, do similarly as for undefined and common syms above. Handles @@ -940,7 +1250,7 @@ resolve_symbol_value (symbolS *symp) final_seg = seg_left; final_val += symp->sy_frag->fr_address + left; resolved = symbol_resolved_p (add_symbol); - symp->sy_resolving = 0; + symp->sy_flags.sy_resolving = 0; goto exit_dont_set_value; } else @@ -951,6 +1261,11 @@ resolve_symbol_value (symbolS *symp) } resolved = symbol_resolved_p (add_symbol); + if (S_IS_WEAKREFR (symp)) + { + symp->sy_flags.sy_resolving = 0; + goto exit_dont_set_value; + } break; case O_uminus: @@ -965,7 +1280,7 @@ resolve_symbol_value (symbolS *symp) ~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); + report_op_error (symp, NULL, op, add_symbol); if (final_seg == expr_section || final_seg == undefined_section) final_seg = absolute_section; @@ -1042,7 +1357,7 @@ resolve_symbol_value (symbolS *symp) 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) + && 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) @@ -1053,7 +1368,7 @@ resolve_symbol_value (symbolS *symp) /* 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); + report_op_error (symp, add_symbol, op, 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 @@ -1073,7 +1388,7 @@ resolve_symbol_value (symbolS *symp) already issued a warning about using a bad symbol. */ if (seg_right == absolute_section && finalize_syms) { - char *file; + const char *file; unsigned int line; if (expr_symbol_where (symp, &file, &line)) @@ -1132,7 +1447,6 @@ resolve_symbol_value (symbolS *symp) && symbol_resolved_p (op_symbol)); break; - case O_register: case O_big: case O_illegal: /* Give an error (below) if not in expr_section. We don't @@ -1143,7 +1457,7 @@ resolve_symbol_value (symbolS *symp) break; } - symp->sy_resolving = 0; + symp->sy_flags.sy_resolving = 0; } if (finalize_syms) @@ -1158,27 +1472,27 @@ exit_dont_set_value: if (finalize_syms) { if (resolved) - symp->sy_resolved = 1; + symp->sy_flags.sy_resolved = 1; else if (S_GET_SEGMENT (symp) != expr_section) { as_bad (_("can't resolve value for symbol `%s'"), S_GET_NAME (symp)); - symp->sy_resolved = 1; + symp->sy_flags.sy_resolved = 1; } } return final_val; } -static void resolve_local_symbol (const char *, PTR); +static void resolve_local_symbol (const char *, void *); /* A static function passed to hash_traverse. */ static void -resolve_local_symbol (const char *key ATTRIBUTE_UNUSED, PTR value) +resolve_local_symbol (const char *key ATTRIBUTE_UNUSED, void *value) { if (value != NULL) - resolve_symbol_value (value); + resolve_symbol_value ((symbolS *) value); } /* Resolve all local symbols. */ @@ -1189,6 +1503,71 @@ resolve_local_symbol_values (void) hash_traverse (local_hash, resolve_local_symbol); } +/* 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 exp = symbolP->sy_value; + + if (!symbolP->sy_flags.sy_resolved && exp.X_op != O_illegal) + { + int resolved; + + if (symbolP->sy_flags.sy_resolving) + return 0; + symbolP->sy_flags.sy_resolving = 1; + resolved = resolve_expression (&exp); + symbolP->sy_flags.sy_resolving = 0; + if (!resolved) + return 0; + + switch (exp.X_op) + { + case O_constant: + case O_register: + if (!symbol_equated_p (symbolP)) + break; + /* Fall thru. */ + case O_symbol: + case O_symbol_rva: + symbolP = exp.X_add_symbol; + break; + default: + return 0; + } + } + + *symbolPP = symbolP; + *valueP = exp.X_add_number; + *segP = symbolP->bsym->section; + *fragPP = symbolP->sy_frag; + + if (*segP == expr_section) + switch (exp.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$". They are *really* local. That is, they go out of scope whenever we see a label that isn't local. Also, like fb labels, there can be multiple @@ -1258,20 +1637,19 @@ define_dollar_label (long label) if (dollar_labels == NULL) { - dollar_labels = (long *) xmalloc (DOLLAR_LABEL_BUMP_BY * sizeof (long)); - dollar_label_instances = (long *) xmalloc (DOLLAR_LABEL_BUMP_BY * sizeof (long)); - dollar_label_defines = xmalloc (DOLLAR_LABEL_BUMP_BY); + dollar_labels = XNEWVEC (long, DOLLAR_LABEL_BUMP_BY); + dollar_label_instances = XNEWVEC (long, DOLLAR_LABEL_BUMP_BY); + dollar_label_defines = (char *) xmalloc (DOLLAR_LABEL_BUMP_BY); dollar_label_max = DOLLAR_LABEL_BUMP_BY; dollar_label_count = 0; } else if (dollar_label_count == dollar_label_max) { dollar_label_max += DOLLAR_LABEL_BUMP_BY; - dollar_labels = (long *) xrealloc ((char *) dollar_labels, - dollar_label_max * sizeof (long)); - dollar_label_instances = (long *) xrealloc ((char *) dollar_label_instances, - dollar_label_max * sizeof (long)); - dollar_label_defines = xrealloc (dollar_label_defines, dollar_label_max); + dollar_labels = XRESIZEVEC (long, dollar_labels, dollar_label_max); + dollar_label_instances = XRESIZEVEC (long, dollar_label_instances, + dollar_label_max); + dollar_label_defines = (char *) xrealloc (dollar_label_defines, dollar_label_max); } /* if we needed to grow */ dollar_labels[dollar_label_count] = label; @@ -1292,14 +1670,14 @@ define_dollar_label (long label) 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. */) +dollar_label_name (long n, /* we just saw "n$:" : n a number. */ + int augend /* 0 for current instance, 1 for new instance. */) { long i; /* Returned to caller, then copied. Used for created names ("4f"). */ static char symbol_name_build[24]; - register char *p; - register char *q; + char *p; + char *q; char symbol_name_temporary[20]; /* Build up a number, BACKWARDS. */ know (n >= 0); @@ -1330,7 +1708,7 @@ dollar_label_name (register long n, /* we just saw "n$:" : n a number. */ *q = i % 10 + '0'; i /= 10; } - while ((*p++ = *--q) != '\0');; + while ((*p++ = *--q) != '\0'); /* The label, as a '\0' ended string, starts at symbol_name_build. */ return symbol_name_build; @@ -1377,7 +1755,7 @@ fb_label_instance_inc (long label) { long *i; - if (label < FB_LABEL_SPECIAL) + if ((unsigned long) label < FB_LABEL_SPECIAL) { ++fb_low_counter[label]; return; @@ -1400,8 +1778,8 @@ fb_label_instance_inc (long label) if (fb_labels == NULL) { - fb_labels = (long *) xmalloc (FB_LABEL_BUMP_BY * sizeof (long)); - fb_label_instances = (long *) xmalloc (FB_LABEL_BUMP_BY * sizeof (long)); + fb_labels = XNEWVEC (long, FB_LABEL_BUMP_BY); + fb_label_instances = XNEWVEC (long, FB_LABEL_BUMP_BY); fb_label_max = FB_LABEL_BUMP_BY; fb_label_count = FB_LABEL_SPECIAL; @@ -1409,10 +1787,8 @@ fb_label_instance_inc (long label) else if (fb_label_count == fb_label_max) { fb_label_max += FB_LABEL_BUMP_BY; - fb_labels = (long *) xrealloc ((char *) fb_labels, - fb_label_max * sizeof (long)); - fb_label_instances = (long *) xrealloc ((char *) fb_label_instances, - fb_label_max * sizeof (long)); + fb_labels = XRESIZEVEC (long, fb_labels, fb_label_max); + fb_label_instances = XRESIZEVEC (long, fb_label_instances, fb_label_max); } /* if we needed to grow */ fb_labels[fb_label_count] = label; @@ -1425,7 +1801,7 @@ fb_label_instance (long label) { long *i; - if (label < FB_LABEL_SPECIAL) + if ((unsigned long) label < FB_LABEL_SPECIAL) { return (fb_low_counter[label]); } @@ -1465,8 +1841,8 @@ fb_label_name (long n, /* We just saw "n:", "nf" or "nb" : n a number. */ long i; /* Returned to caller, then copied. Used for created names ("4f"). */ static char symbol_name_build[24]; - register char *p; - register char *q; + char *p; + char *q; char symbol_name_temporary[20]; /* Build up a number, BACKWARDS. */ know (n >= 0); @@ -1501,7 +1877,7 @@ fb_label_name (long n, /* We just saw "n:", "nf" or "nb" : n a number. */ *q = i % 10 + '0'; i /= 10; } - while ((*p++ = *--q) != '\0');; + while ((*p++ = *--q) != '\0'); /* The label, as a '\0' ended string, starts at symbol_name_build. */ return (symbol_name_build); @@ -1518,19 +1894,19 @@ decode_local_label_name (char *s) char *symbol_decode; int label_number; int instance_number; - char *type; + const char *type; const char *message_format; - int index = 0; + int lindex = 0; #ifdef LOCAL_LABEL_PREFIX - if (s[index] == LOCAL_LABEL_PREFIX) - ++index; + if (s[lindex] == LOCAL_LABEL_PREFIX) + ++lindex; #endif - if (s[index] != 'L') + if (s[lindex] != 'L') return s; - for (label_number = 0, p = s + index + 1; ISDIGIT (*p); ++p) + for (label_number = 0, p = s + lindex + 1; ISDIGIT (*p); ++p) label_number = (10 * label_number) + *p - '0'; if (*p == DOLLAR_LABEL_CHAR) @@ -1544,7 +1920,7 @@ decode_local_label_name (char *s) 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); + symbol_decode = (char *) obstack_alloc (¬es, strlen (message_format) + 30); sprintf (symbol_decode, message_format, label_number, instance_number, type); return symbol_decode; @@ -1558,28 +1934,22 @@ S_GET_VALUE (symbolS *s) if (LOCAL_SYMBOL_CHECK (s)) return resolve_symbol_value (s); - if (!s->sy_resolved) + if (!s->sy_flags.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_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 + if (! s->sy_flags.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'"), S_GET_NAME (s)); - recur = NULL; } return (valueT) s->sy_value.X_add_number; } @@ -1598,6 +1968,7 @@ S_SET_VALUE (symbolS *s, valueT val) 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 @@ -1610,12 +1981,17 @@ copy_symbol_attributes (symbolS *dest, symbolS *src) /* In an expression, transfer the settings of these flags. The user can override later, of course. */ -#define COPIED_SYMFLAGS (BSF_FUNCTION | BSF_OBJECT) +#define COPIED_SYMFLAGS (BSF_FUNCTION | BSF_OBJECT \ + | BSF_GNU_INDIRECT_FUNCTION) dest->bsym->flags |= src->bsym->flags & COPIED_SYMFLAGS; #ifdef OBJ_COPY_SYMBOL_ATTRIBUTES OBJ_COPY_SYMBOL_ATTRIBUTES (dest, src); #endif + +#ifdef TC_COPY_SYMBOL_ATTRIBUTES + TC_COPY_SYMBOL_ATTRIBUTES (dest, src); +#endif } int @@ -1653,9 +2029,31 @@ 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_WEAKREFR (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return 0; + return s->sy_flags.sy_weakrefr != 0; +} + +int +S_IS_WEAKREFD (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return 0; + return s->sy_flags.sy_weakrefd != 0; +} + int S_IS_COMMON (symbolS *s) { @@ -1690,6 +2088,7 @@ S_FORCE_RELOC (symbolS *s, int strict) && ((s->bsym->flags & BSF_WEAK) != 0 || (EXTERN_FORCE_RELOC && (s->bsym->flags & BSF_GLOBAL) != 0))) + || (s->bsym->flags & BSF_GNU_INDIRECT_FUNCTION) != 0 || s->bsym->section == undefined_section || bfd_is_com_section (s->bsym->section)); } @@ -1734,6 +2133,7 @@ S_IS_LOCAL (symbolS *s) && ! S_IS_DEBUG (s) && (strchr (name, DOLLAR_LABEL_CHAR) || strchr (name, LOCAL_LABEL_CHAR) + || TC_LABEL_IS_LOCAL (name) || (! flag_keep_locals && (bfd_is_local_label (stdoutput, s->bsym) || (flag_mri @@ -1747,6 +2147,32 @@ S_IS_STABD (symbolS *s) return S_GET_NAME (s) == 0; } +int +S_CAN_BE_REDEFINED (const symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return (local_symbol_get_frag ((struct local_symbol *) s) + == &predefined_address_frag); + /* Permit register names to be redefined. */ + return s->bsym->section == reg_section; +} + +int +S_IS_VOLATILE (const symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return 0; + return s->sy_flags.sy_volatile; +} + +int +S_IS_FORWARD_REF (const symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return 0; + return s->sy_flags.sy_forward_ref; +} + const char * S_GET_NAME (symbolS *s) { @@ -1802,19 +2228,22 @@ S_SET_EXTERNAL (symbolS *s) } 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")); + as_warn (_("section symbols are already global")); return; } +#ifndef TC_GLOBAL_REGISTER_SYMBOL_OK + if (S_GET_SEGMENT (s) == reg_section) + { + as_bad ("can't make register symbol `%s' global", + S_GET_NAME (s)); + return; + } +#endif s->bsym->flags |= BSF_GLOBAL; s->bsym->flags &= ~(BSF_LOCAL | BSF_WEAK); -#ifdef USE_UNIQUE +#ifdef TE_PE if (! an_external_name && S_GET_NAME(s)[0] != '.') an_external_name = S_GET_NAME (s); #endif @@ -1839,10 +2268,70 @@ 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); } +void +S_SET_WEAKREFR (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + s = local_symbol_convert ((struct local_symbol *) s); + s->sy_flags.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_flags.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_flags.sy_weakrefr = 0; +} + +void +S_SET_WEAKREFD (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + s = local_symbol_convert ((struct local_symbol *) s); + s->sy_flags.sy_weakrefd = 1; + S_SET_WEAK (s); +} + +void +S_CLEAR_WEAKREFD (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return; + if (s->sy_flags.sy_weakrefd) + { + s->sy_flags.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) { @@ -1872,6 +2361,29 @@ S_SET_NAME (symbolS *s, const char *name) s->bsym->name = name; } +void +S_SET_VOLATILE (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + s = local_symbol_convert ((struct local_symbol *) s); + s->sy_flags.sy_volatile = 1; +} + +void +S_CLEAR_VOLATILE (symbolS *s) +{ + if (!LOCAL_SYMBOL_CHECK (s)) + s->sy_flags.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_flags.sy_forward_ref = 1; +} + /* Return the previous symbol in a chain. */ symbolS * @@ -1910,6 +2422,21 @@ 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 whether 2 symbols are the same. */ + +int +symbol_same_p (symbolS *s1, symbolS *s2) +{ + if (s1->sy_flags.sy_local_symbol + && local_symbol_converted_p ((struct local_symbol *) s1)) + s1 = local_symbol_get_real_symbol ((struct local_symbol *) s1); + if (s2->sy_flags.sy_local_symbol + && local_symbol_converted_p ((struct local_symbol *) s2)) + s2 = local_symbol_get_real_symbol ((struct local_symbol *) s2); + return s1 == s2; } /* Return a pointer to the X_add_number component of a symbol. */ @@ -1944,6 +2471,7 @@ symbol_set_frag (symbolS *s, fragS *f) return; } s->sy_frag = f; + S_CLEAR_WEAKREFR (s); } /* Return the frag of a symbol. */ @@ -1963,7 +2491,9 @@ symbol_mark_used (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return; - s->sy_used = 1; + s->sy_flags.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. */ @@ -1973,7 +2503,7 @@ symbol_clear_used (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); - s->sy_used = 0; + s->sy_flags.sy_used = 0; } /* Return whether a symbol has been used. */ @@ -1983,7 +2513,7 @@ symbol_used_p (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 1; - return s->sy_used; + return s->sy_flags.sy_used; } /* Mark a symbol as having been used in a reloc. */ @@ -1993,7 +2523,7 @@ symbol_mark_used_in_reloc (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); - s->sy_used_in_reloc = 1; + s->sy_flags.sy_used_in_reloc = 1; } /* Clear the mark of whether a symbol has been used in a reloc. */ @@ -2003,7 +2533,7 @@ symbol_clear_used_in_reloc (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return; - s->sy_used_in_reloc = 0; + s->sy_flags.sy_used_in_reloc = 0; } /* Return whether a symbol has been used in a reloc. */ @@ -2013,7 +2543,7 @@ symbol_used_in_reloc_p (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 0; - return s->sy_used_in_reloc; + return s->sy_flags.sy_used_in_reloc; } /* Mark a symbol as an MRI common symbol. */ @@ -2023,7 +2553,7 @@ symbol_mark_mri_common (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); - s->sy_mri_common = 1; + s->sy_flags.sy_mri_common = 1; } /* Clear the mark of whether a symbol is an MRI common symbol. */ @@ -2033,7 +2563,7 @@ symbol_clear_mri_common (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return; - s->sy_mri_common = 0; + s->sy_flags.sy_mri_common = 0; } /* Return whether a symbol is an MRI common symbol. */ @@ -2043,7 +2573,7 @@ symbol_mri_common_p (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 0; - return s->sy_mri_common; + return s->sy_flags.sy_mri_common; } /* Mark a symbol as having been written. */ @@ -2053,7 +2583,7 @@ symbol_mark_written (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return; - s->written = 1; + s->sy_flags.sy_written = 1; } /* Clear the mark of whether a symbol has been written. */ @@ -2063,7 +2593,7 @@ symbol_clear_written (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return; - s->written = 0; + s->sy_flags.sy_written = 0; } /* Return whether a symbol has been written. */ @@ -2073,7 +2603,7 @@ symbol_written_p (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 0; - return s->written; + return s->sy_flags.sy_written; } /* Mark a symbol has having been resolved. */ @@ -2086,7 +2616,7 @@ symbol_mark_resolved (symbolS *s) local_symbol_mark_resolved ((struct local_symbol *) s); return; } - s->sy_resolved = 1; + s->sy_flags.sy_resolved = 1; } /* Return whether a symbol has been resolved. */ @@ -2096,7 +2626,7 @@ symbol_resolved_p (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return local_symbol_resolved_p ((struct local_symbol *) s); - return s->sy_resolved; + return s->sy_flags.sy_resolved; } /* Return whether a symbol is a section symbol. */ @@ -2134,7 +2664,7 @@ symbol_equated_reloc_p (symbolS *s) #if defined (OBJ_COFF) && defined (TE_PE) && ! S_IS_WEAK (s) #endif - && ((s->sy_resolved && s->sy_value.X_op_symbol != NULL) + && ((s->sy_flags.sy_resolved && s->sy_value.X_op_symbol != NULL) || ! S_IS_DEFINED (s) || S_IS_COMMON (s))); } @@ -2149,6 +2679,17 @@ symbol_constant_p (symbolS *s) return s->sy_value.X_op == O_constant; } +/* Return whether a symbol was cloned and thus removed from the global + symbol list. */ + +int +symbol_shadow_p (symbolS *s) +{ + if (LOCAL_SYMBOL_CHECK (s)) + return 0; + return s->sy_next == s; +} + /* Return the BFD symbol for a symbol. */ asymbol * @@ -2236,7 +2777,7 @@ symbol_begin (void) memset ((char *) (&abs_symbol), '\0', sizeof (abs_symbol)); #if defined (EMIT_SECTION_SYMBOLS) || !defined (RELOC_REQUIRES_SYMBOL) - abs_symbol.bsym = bfd_abs_section.symbol; + abs_symbol.bsym = bfd_abs_section_ptr->symbol; #endif abs_symbol.sy_value.X_op = O_constant; abs_symbol.sy_frag = &zero_address_frag; @@ -2244,6 +2785,17 @@ symbol_begin (void) if (LOCAL_LABELS_FB) fb_label_init (); } + +void +dot_symbol_init (void) +{ + dot_symbol.bsym = bfd_make_empty_symbol (stdoutput); + if (dot_symbol.bsym == NULL) + as_fatal ("bfd_make_empty_symbol: %s", bfd_errmsg (bfd_get_error ())); + dot_symbol.bsym->name = "."; + dot_symbol.sy_flags.sy_forward_ref = 1; + dot_symbol.sy_value.X_op = O_constant; +} int indent_level; @@ -2257,14 +2809,20 @@ print_symbol_value_1 (FILE *file, symbolS *sym) const char *name = S_GET_NAME (sym); if (!name || !name[0]) name = "(unnamed)"; - fprintf (file, "sym %lx %s", (unsigned long) sym, name); + fprintf (file, "sym "); + fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) sym)); + fprintf (file, " %s", name); if (LOCAL_SYMBOL_CHECK (sym)) { struct local_symbol *locsym = (struct local_symbol *) sym; - if (local_symbol_get_frag (locsym) != &zero_address_frag + + if (local_symbol_get_frag (locsym) != & zero_address_frag && local_symbol_get_frag (locsym) != NULL) - fprintf (file, " frag %lx", (long) local_symbol_get_frag (locsym)); + { + fprintf (file, " frag "); + fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) local_symbol_get_frag (locsym))); + } if (local_symbol_resolved_p (locsym)) fprintf (file, " resolved"); fprintf (file, " local"); @@ -2272,26 +2830,35 @@ print_symbol_value_1 (FILE *file, symbolS *sym) else { if (sym->sy_frag != &zero_address_frag) - fprintf (file, " frag %lx", (long) sym->sy_frag); - if (sym->written) + { + fprintf (file, " frag "); + fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) sym->sy_frag)); + } + if (sym->sy_flags.sy_written) fprintf (file, " written"); - if (sym->sy_resolved) + if (sym->sy_flags.sy_resolved) fprintf (file, " resolved"); - else if (sym->sy_resolving) + else if (sym->sy_flags.sy_resolving) fprintf (file, " resolving"); - if (sym->sy_used_in_reloc) + if (sym->sy_flags.sy_used_in_reloc) fprintf (file, " used-in-reloc"); - if (sym->sy_used) + if (sym->sy_flags.sy_used) fprintf (file, " used"); if (S_IS_LOCAL (sym)) fprintf (file, " local"); 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)) { @@ -2299,7 +2866,7 @@ print_symbol_value_1 (FILE *file, symbolS *sym) if (s != undefined_section && s != expr_section) - fprintf (file, " %lx", (long) S_GET_VALUE (sym)); + fprintf (file, " %lx", (unsigned long) S_GET_VALUE (sym)); } else if (indent_level < max_indent_level && S_GET_SEGMENT (sym) != undefined_section) @@ -2308,7 +2875,7 @@ print_symbol_value_1 (FILE *file, symbolS *sym) fprintf (file, "\n%*s<", indent_level * 4, ""); if (LOCAL_SYMBOL_CHECK (sym)) fprintf (file, "constant %lx", - (long) ((struct local_symbol *) sym)->lsy_value); + (unsigned long) ((struct local_symbol *) sym)->lsy_value); else print_expr_1 (file, &sym->sy_value); fprintf (file, ">"); @@ -2340,7 +2907,9 @@ print_binary (FILE *file, const char *name, expressionS *exp) void print_expr_1 (FILE *file, expressionS *exp) { - fprintf (file, "expr %lx ", (long) exp); + fprintf (file, "expr "); + fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) exp)); + fprintf (file, " "); switch (exp->X_op) { case O_illegal: @@ -2350,7 +2919,7 @@ print_expr_1 (FILE *file, expressionS *exp) fprintf (file, "absent"); break; case O_constant: - fprintf (file, "constant %lx", (long) exp->X_add_number); + fprintf (file, "constant %lx", (unsigned long) exp->X_add_number); break; case O_symbol: indent_level++; @@ -2360,7 +2929,7 @@ print_expr_1 (FILE *file, expressionS *exp) maybe_print_addnum: if (exp->X_add_number) fprintf (file, "\n%*s%lx", indent_level * 4, "", - (long) exp->X_add_number); + (unsigned long) exp->X_add_number); indent_level--; break; case O_register: @@ -2464,3 +3033,219 @@ symbol_print_statistics (FILE *file) fprintf (file, "%lu mini local symbols created, %lu converted\n", local_symbol_count, local_symbol_conversion_count); } + +#ifdef OBJ_COMPLEX_RELC + +/* Convert given symbol to a new complex-relocation symbol name. This + may be a recursive function, since it might be called for non-leaf + nodes (plain symbols) in the expression tree. The caller owns the + returning string, so should free it eventually. Errors are + indicated via as_bad and a NULL return value. The given symbol + is marked with sy_used_in_reloc. */ + +char * +symbol_relc_make_sym (symbolS * sym) +{ + char * terminal = NULL; + const char * sname; + char typetag; + int sname_len; + + gas_assert (sym != NULL); + + /* Recurse to symbol_relc_make_expr if this symbol + is defined as an expression or a plain value. */ + if ( S_GET_SEGMENT (sym) == expr_section + || S_GET_SEGMENT (sym) == absolute_section) + return symbol_relc_make_expr (& sym->sy_value); + + /* This may be a "fake symbol" L0\001, referring to ".". + Write out a special null symbol to refer to this position. */ + if (! strcmp (S_GET_NAME (sym), FAKE_LABEL_NAME)) + return xstrdup ("."); + + /* We hope this is a plain leaf symbol. Construct the encoding + as {S,s}II...:CCCCCCC.... + where 'S'/'s' means section symbol / plain symbol + III is decimal for the symbol name length + CCC is the symbol name itself. */ + symbol_mark_used_in_reloc (sym); + + sname = S_GET_NAME (sym); + sname_len = strlen (sname); + typetag = symbol_section_p (sym) ? 'S' : 's'; + + terminal = xmalloc (1 /* S or s */ + + 8 /* sname_len in decimal */ + + 1 /* _ spacer */ + + sname_len /* name itself */ + + 1 /* \0 */ ); + + sprintf (terminal, "%c%d:%s", typetag, sname_len, sname); + return terminal; +} + +/* Convert given value to a new complex-relocation symbol name. This + is a non-recursive function, since it is be called for leaf nodes + (plain values) in the expression tree. The caller owns the + returning string, so should free() it eventually. No errors. */ + +char * +symbol_relc_make_value (offsetT val) +{ + char * terminal = XNEWVEC (char, 28); /* Enough for long long. */ + + terminal[0] = '#'; + bfd_sprintf_vma (stdoutput, terminal + 1, val); + return terminal; +} + +/* Convert given expression to a new complex-relocation symbol name. + This is a recursive function, since it traverses the entire given + expression tree. The caller owns the returning string, so should + free() it eventually. Errors are indicated via as_bad() and a NULL + return value. */ + +char * +symbol_relc_make_expr (expressionS * exp) +{ + const char * opstr = NULL; /* Operator prefix string. */ + int arity = 0; /* Arity of this operator. */ + char * operands[3]; /* Up to three operands. */ + char * concat_string = NULL; + + operands[0] = operands[1] = operands[2] = NULL; + + gas_assert (exp != NULL); + + /* Match known operators -> fill in opstr, arity, operands[] and fall + through to construct subexpression fragments; may instead return + string directly for leaf nodes. */ + + /* See expr.h for the meaning of all these enums. Many operators + have an unnatural arity (X_add_number implicitly added). The + conversion logic expands them to explicit "+" subexpressions. */ + + switch (exp->X_op) + { + default: + as_bad ("Unknown expression operator (enum %d)", exp->X_op); + break; + + /* Leaf nodes. */ + case O_constant: + return symbol_relc_make_value (exp->X_add_number); + + case O_symbol: + if (exp->X_add_number) + { + arity = 2; + opstr = "+"; + operands[0] = symbol_relc_make_sym (exp->X_add_symbol); + operands[1] = symbol_relc_make_value (exp->X_add_number); + break; + } + else + return symbol_relc_make_sym (exp->X_add_symbol); + + /* Helper macros for nesting nodes. */ + +#define HANDLE_XADD_OPT1(str_) \ + if (exp->X_add_number) \ + { \ + arity = 2; \ + opstr = "+:" str_; \ + operands[0] = symbol_relc_make_sym (exp->X_add_symbol); \ + operands[1] = symbol_relc_make_value (exp->X_add_number); \ + break; \ + } \ + else \ + { \ + arity = 1; \ + opstr = str_; \ + operands[0] = symbol_relc_make_sym (exp->X_add_symbol); \ + } \ + break + +#define HANDLE_XADD_OPT2(str_) \ + if (exp->X_add_number) \ + { \ + arity = 3; \ + opstr = "+:" str_; \ + operands[0] = symbol_relc_make_sym (exp->X_add_symbol); \ + operands[1] = symbol_relc_make_sym (exp->X_op_symbol); \ + operands[2] = symbol_relc_make_value (exp->X_add_number); \ + } \ + else \ + { \ + arity = 2; \ + opstr = str_; \ + operands[0] = symbol_relc_make_sym (exp->X_add_symbol); \ + operands[1] = symbol_relc_make_sym (exp->X_op_symbol); \ + } \ + break + + /* Nesting nodes. */ + + case O_uminus: HANDLE_XADD_OPT1 ("0-"); + case O_bit_not: HANDLE_XADD_OPT1 ("~"); + case O_logical_not: HANDLE_XADD_OPT1 ("!"); + case O_multiply: HANDLE_XADD_OPT2 ("*"); + case O_divide: HANDLE_XADD_OPT2 ("/"); + case O_modulus: HANDLE_XADD_OPT2 ("%"); + case O_left_shift: HANDLE_XADD_OPT2 ("<<"); + case O_right_shift: HANDLE_XADD_OPT2 (">>"); + case O_bit_inclusive_or: HANDLE_XADD_OPT2 ("|"); + case O_bit_exclusive_or: HANDLE_XADD_OPT2 ("^"); + case O_bit_and: HANDLE_XADD_OPT2 ("&"); + case O_add: HANDLE_XADD_OPT2 ("+"); + case O_subtract: HANDLE_XADD_OPT2 ("-"); + case O_eq: HANDLE_XADD_OPT2 ("=="); + case O_ne: HANDLE_XADD_OPT2 ("!="); + case O_lt: HANDLE_XADD_OPT2 ("<"); + case O_le: HANDLE_XADD_OPT2 ("<="); + case O_ge: HANDLE_XADD_OPT2 (">="); + case O_gt: HANDLE_XADD_OPT2 (">"); + case O_logical_and: HANDLE_XADD_OPT2 ("&&"); + case O_logical_or: HANDLE_XADD_OPT2 ("||"); + } + + /* Validate & reject early. */ + if (arity >= 1 && ((operands[0] == NULL) || (strlen (operands[0]) == 0))) + opstr = NULL; + if (arity >= 2 && ((operands[1] == NULL) || (strlen (operands[1]) == 0))) + opstr = NULL; + if (arity >= 3 && ((operands[2] == NULL) || (strlen (operands[2]) == 0))) + opstr = NULL; + + if (opstr == NULL) + concat_string = NULL; + else + { + /* Allocate new string; include inter-operand padding gaps etc. */ + concat_string = xmalloc (strlen (opstr) + + 1 + + (arity >= 1 ? (strlen (operands[0]) + 1 ) : 0) + + (arity >= 2 ? (strlen (operands[1]) + 1 ) : 0) + + (arity >= 3 ? (strlen (operands[2]) + 0 ) : 0) + + 1); + gas_assert (concat_string != NULL); + + /* Format the thing. */ + sprintf (concat_string, + (arity == 0 ? "%s" : + arity == 1 ? "%s:%s" : + arity == 2 ? "%s:%s:%s" : + /* arity == 3 */ "%s:%s:%s:%s"), + opstr, operands[0], operands[1], operands[2]); + } + + /* Free operand strings (not opstr). */ + if (arity >= 1) xfree (operands[0]); + if (arity >= 2) xfree (operands[1]); + if (arity >= 3) xfree (operands[2]); + + return concat_string; +} + +#endif