X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fsymbols.c;h=be48f87c35490f8d70d3fde17c3c04c3f1698106;hb=0bff6e2d6942690d81ce1f33728de07835b0f5b7;hp=1f4e98816ecb182c91732f04e4163ff05d3843b5;hpb=8d28c9d7bee620b6a40001772dad8a1ec3448c49;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/symbols.c b/gas/symbols.c index 1f4e98816e..be48f87c35 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 - 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, @@ -17,18 +15,15 @@ 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 - #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 @@ -49,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 @@ -59,14 +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 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 PARAMS ((const char *)); -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 *); /* 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 @@ -78,22 +83,16 @@ static void print_binary PARAMS ((FILE *, const char *, expressionS *)); 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 { extern int symbol_table_frozen; if (symbol_table_frozen) abort (); } -#endif symbol_append (symbolP, symbol_lastP, &symbol_rootP, &symbol_lastP); return symbolP; @@ -103,20 +102,14 @@ 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; + size_t name_length; char *ret; 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 + ret = (char *) obstack_finish (¬es); #ifdef tc_canonicalize_symbol_name ret = tc_canonicalize_symbol_name (ret); @@ -124,22 +117,20 @@ save_symbol_name (name) 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; @@ -151,12 +142,9 @@ symbol_create (name, segment, valu, frag) /* 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 + 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); @@ -164,10 +152,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); @@ -178,14 +162,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. */ @@ -197,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) \ @@ -206,12 +187,8 @@ 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, value, frag) - 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; struct local_symbol *ret; @@ -221,13 +198,14 @@ local_symbol_make (name, section, value, 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; } @@ -236,12 +214,11 @@ local_symbol_make (name, section, value, 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; - 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); @@ -251,10 +228,10 @@ local_symbol_convert (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); @@ -269,41 +246,32 @@ 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 */ +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. 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. */ + 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 +281,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); @@ -343,8 +315,13 @@ colon (sym_name) /* 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; @@ -352,7 +329,6 @@ colon (sym_name) /* Just seen "x:" - rattle symbols & frags. */ /* Now check for undefined symbols. */ if (LOCAL_SYMBOL_CHECK (symbolP)) { -#ifdef BFD_ASSEMBLER struct local_symbol *locsym = (struct local_symbol *) symbolP; if (locsym->lsy_section != undefined_section @@ -367,18 +343,20 @@ colon (sym_name) /* Just seen "x:" - rattle symbols & frags. */ locsym->lsy_section = now_seg; local_symbol_set_frag (locsym, frag_now); locsym->lsy_value = frag_now_fix (); -#endif } - 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. */ @@ -402,6 +380,7 @@ colon (sym_name) /* 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. */ @@ -422,12 +401,7 @@ colon (sym_name) /* 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 @@ -438,12 +412,10 @@ colon (sym_name) /* Just seen "x:" - rattle symbols & frags. */ #else char od_buf[100]; od_buf[0] = '\0'; -#ifdef BFD_ASSEMBLER if (OUTPUT_FLAVOR == bfd_target_aout_flavour) -#endif - sprintf(od_buf, "%d.%d.", - S_GET_OTHER (symbolP), - S_GET_DESC (symbolP)); + 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, @@ -459,25 +431,24 @@ colon (sym_name) /* 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); + } } } -#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 (), frag_now); -#ifdef OBJ_VMS - S_SET_OTHER (symbolP, const_flag); -#endif /* OBJ_VMS */ symbol_table_insert (symbolP); } @@ -485,7 +456,7 @@ colon (sym_name) /* Just seen "x:" - rattle symbols & frags. */ 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; @@ -493,7 +464,7 @@ colon (sym_name) /* 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 @@ -509,10 +480,9 @@ colon (sym_name) /* Just seen "x:" - rattle symbols & frags. */ /* Die if we can't insert the symbol. */ void -symbol_table_insert (symbolP) - symbolS *symbolP; +symbol_table_insert (symbolS *symbolP) { - register const char *error_string; + const char *error_string; know (symbolP); know (S_GET_NAME (symbolP)); @@ -520,14 +490,14 @@ symbol_table_insert (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); @@ -538,16 +508,14 @@ symbol_table_insert (symbolP) 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; + symbolS *symbolP; symbolP = symbol_find (name); if (symbolP == NULL) { -#ifdef BFD_ASSEMBLER if (! flag_keep_locals && bfd_is_local_label_name (stdoutput, name)) { symbolP = md_undefined_symbol ((char *) name); @@ -559,7 +527,6 @@ symbol_find_or_make (name) &zero_address_frag); return symbolP; } -#endif symbolP = symbol_make (name); @@ -570,8 +537,7 @@ symbol_find_or_make (name) } symbolS * -symbol_make (name) - CONST char *name; +symbol_make (const char *name) { symbolS *symbolP; @@ -584,30 +550,199 @@ symbol_make (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) +{ + return symbol_new (FAKE_LABEL_NAME, seg, ofs, frag); +} + +symbolS * +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 (name) - CONST char *name; +symbol_find_exact (const char *name) { -#ifdef STRIP_UNDERSCORE - return (symbol_find_base (name, 1)); -#else /* STRIP_UNDERSCORE */ - return (symbol_find_base (name, 0)); -#endif /* STRIP_UNDERSCORE */ + return symbol_find_exact_noref (name, 0); } symbolS * -symbol_find_base (name, strip_underscore) - CONST char *name; - int strip_underscore; +symbol_find_exact_noref (const char *name, int noref) { - if (strip_underscore && *name == '_') - name++; + struct local_symbol *locsym; + symbolS* sym; + + 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; @@ -630,24 +765,12 @@ symbol_find_base (name, strip_underscore) while ((c = *orig++) != '\0') { - if (islower (c)) - c = toupper (c); - *copy++ = c; + *copy++ = TOUPPER (c); } *copy = '\0'; } -#ifdef BFD_ASSEMBLER - { - struct local_symbol *locsym; - - locsym = (struct local_symbol *) hash_find (local_hash, name); - if (locsym != NULL) - return (symbolS *) locsym; - } -#endif - - 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 @@ -659,11 +782,8 @@ symbol_find_base (name, strip_underscore) /* Link symbol ADDME after symbol TARGET in the chain. */ void -symbol_append (addme, target, rootPP, lastPP) - symbolS *addme; - symbolS *target; - symbolS **rootPP; - symbolS **lastPP; +symbol_append (symbolS *addme, symbolS *target, + symbolS **rootPP, symbolS **lastPP) { if (LOCAL_SYMBOL_CHECK (addme)) abort (); @@ -675,9 +795,7 @@ 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; @@ -685,9 +803,7 @@ symbol_append (addme, target, rootPP, lastPP) if (target->sy_next != NULL) { -#ifdef SYMBOLS_NEED_BACKPOINTERS target->sy_next->sy_previous = addme; -#endif /* SYMBOLS_NEED_BACKPOINTERS */ } else { @@ -697,10 +813,7 @@ symbol_append (addme, target, rootPP, lastPP) 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); } @@ -708,25 +821,18 @@ symbol_append (addme, target, rootPP, lastPP) /* Set the chain pointers of SYMBOL to null. */ void -symbol_clear_list_pointers (symbolP) - symbolS *symbolP; +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; +symbol_remove (symbolS *symbolP, symbolS **rootPP, symbolS **lastPP) { if (LOCAL_SYMBOL_CHECK (symbolP)) abort (); @@ -757,11 +863,8 @@ symbol_remove (symbolP, 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 ATTRIBUTE_UNUSED; +symbol_insert (symbolS *addme, symbolS *target, + symbolS **rootPP, symbolS **lastPP ATTRIBUTE_UNUSED) { if (LOCAL_SYMBOL_CHECK (addme)) abort (); @@ -785,12 +888,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; +verify_symbol_chain (symbolS *rootP, symbolS *lastP) { symbolS *symbolP = rootP; @@ -799,32 +898,138 @@ 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 */ + 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); } -void -verify_symbol_chain_2 (sym) - symbolS *sym; +#ifdef OBJ_COMPLEX_RELC + +static int +use_complex_relocs_for (symbolS * symp) { - symbolS *p = sym, *n = sym; -#ifdef SYMBOLS_NEED_BACKPOINTERS - while (symbol_previous (p)) - p = symbol_previous (p); + 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 - while (symbol_next (n)) - n = symbol_next (n); - verify_symbol_chain (p, n); + +static void +report_op_error (symbolS *symp, symbolS *left, operatorT op, symbolS *right) +{ + char *file; + unsigned int line; + 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 (left) + as_bad_where (file, line, + _("invalid operands (%s and %s sections) for `%s'"), + seg_left->name, seg_right->name, opname); + else + as_bad_where (file, line, + _("invalid operand (%s section) for `%s'"), + seg_right->name, opname); + } + else + { + 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); + } } /* Resolve the value of a symbol. This is called during the final @@ -832,14 +1037,12 @@ verify_symbol_chain_2 (sym) values. */ valueT -resolve_symbol_value (symp) - symbolS *symp; +resolve_symbol_value (symbolS *symp) { int resolved; - valueT final_val; + valueT final_val = 0; segT final_seg; -#ifdef BFD_ASSEMBLER if (LOCAL_SYMBOL_CHECK (symp)) { struct local_symbol *locsym = (struct local_symbol *) symp; @@ -858,9 +1061,8 @@ resolve_symbol_value (symp) return final_val; } -#endif - 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; @@ -871,7 +1073,7 @@ resolve_symbol_value (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'"), @@ -879,14 +1081,62 @@ resolve_symbol_value (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; offsetT left, right; segT seg_left, seg_right; 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; @@ -908,19 +1158,38 @@ resolve_symbol_value (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; case O_symbol: case O_symbol_rva: 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)) + { + 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_mri_common) + 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. - 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; } @@ -933,40 +1202,79 @@ resolve_symbol_value (symp) 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_syms) { - final_seg = 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; + symp->sy_flags.sy_resolving = 0; + goto exit_dont_set_value; + } + 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 + "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_flags.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); + 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, NULL, op, add_symbol); + + if (final_seg == expr_section || final_seg == undefined_section) + final_seg = absolute_section; if (op == O_uminus) left = -left; @@ -976,8 +1284,6 @@ resolve_symbol_value (symp) 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; @@ -1008,84 +1314,69 @@ resolve_symbol_value (symp) /* 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 - || seg_left == undefined_section) - && finalize_syms) + 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, 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. */ + already issued a warning about using a bad symbol. */ if (seg_right == absolute_section && finalize_syms) { char *file; @@ -1114,8 +1405,15 @@ resolve_symbol_value (symp) 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; @@ -1127,12 +1425,19 @@ resolve_symbol_value (symp) 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; - case O_register: case O_big: case O_illegal: /* Give an error (below) if not in expr_section. We don't @@ -1143,7 +1448,7 @@ resolve_symbol_value (symp) break; } - symp->sy_resolving = 0; + symp->sy_flags.sy_resolving = 0; } if (finalize_syms) @@ -1152,54 +1457,106 @@ resolve_symbol_value (symp) 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. */ -#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); /* Don't worry if we can't resolve an expr_section symbol. */ 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; } -#ifdef BFD_ASSEMBLER - -static void resolve_local_symbol PARAMS ((const char *, PTR)); +static void resolve_local_symbol (const char *, void *); /* A static function passed to hash_traverse. */ static void -resolve_local_symbol (key, value) - 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); } -#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 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$". @@ -1216,8 +1573,7 @@ static unsigned long dollar_label_count; static unsigned long dollar_label_max; int -dollar_label_defined (label) - long label; +dollar_label_defined (long label) { long *i; @@ -1232,8 +1588,7 @@ dollar_label_defined (label) } static long -dollar_label_instance (label) - long label; +dollar_label_instance (long label) { long *i; @@ -1249,7 +1604,7 @@ dollar_label_instance (label) } void -dollar_label_clear () +dollar_label_clear (void) { memset (dollar_label_defines, '\0', (unsigned int) dollar_label_count); } @@ -1257,8 +1612,7 @@ dollar_label_clear () #define DOLLAR_LABEL_BUMP_BY 10 void -define_dollar_label (label) - long label; +define_dollar_label (long label) { long *i; @@ -1276,7 +1630,7 @@ define_dollar_label (label) { 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_label_defines = (char *) xmalloc (DOLLAR_LABEL_BUMP_BY); dollar_label_max = DOLLAR_LABEL_BUMP_BY; dollar_label_count = 0; } @@ -1287,7 +1641,7 @@ define_dollar_label (label) 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_label_defines = (char *) xrealloc (dollar_label_defines, dollar_label_max); } /* if we needed to grow */ dollar_labels[dollar_label_count] = label; @@ -1308,15 +1662,14 @@ define_dollar_label (label) 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. */ +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); @@ -1347,13 +1700,13 @@ dollar_label_name (n, augend) *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; } -/* Sombody else's idea of local labels. They are made by "n:" where n +/* 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:. @@ -1382,7 +1735,7 @@ static long fb_label_max; #define FB_LABEL_BUMP_BY (FB_LABEL_SPECIAL + 6) static void -fb_label_init () +fb_label_init (void) { memset ((void *) fb_low_counter, '\0', sizeof (fb_low_counter)); } @@ -1390,12 +1743,11 @@ fb_label_init () /* Add one to the instance number of this fb label. */ void -fb_label_instance_inc (label) - long label; +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; @@ -1439,12 +1791,11 @@ fb_label_instance_inc (label) } static long -fb_label_instance (label) - long label; +fb_label_instance (long label) { long *i; - if (label < FB_LABEL_SPECIAL) + if ((unsigned long) label < FB_LABEL_SPECIAL) { return (fb_low_counter[label]); } @@ -1478,19 +1829,22 @@ fb_label_instance (label) 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. */ +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"). */ 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); - 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; @@ -1517,7 +1871,7 @@ fb_label_name (n, augend) *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); @@ -1528,8 +1882,7 @@ fb_label_name (n, augend) 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; @@ -1537,17 +1890,17 @@ decode_local_label_name (s) int instance_number; 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 ((unsigned char) *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) @@ -1557,11 +1910,11 @@ decode_local_label_name (s) 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); + symbol_decode = (char *) obstack_alloc (¬es, strlen (message_format) + 30); sprintf (symbol_decode, message_format, label_number, instance_number, type); return symbol_decode; @@ -1570,36 +1923,27 @@ decode_local_label_name (s) /* Get the value of a symbol. */ valueT -S_GET_VALUE (s) - symbolS *s; +S_GET_VALUE (symbolS *s) { -#ifdef BFD_ASSEMBLER if (LOCAL_SYMBOL_CHECK (s)) return resolve_symbol_value (s); -#endif - 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; } @@ -1607,49 +1951,45 @@ 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) { -#ifdef BFD_ASSEMBLER if (LOCAL_SYMBOL_CHECK (s)) { ((struct local_symbol *) s)->lsy_value = val; return; } -#endif 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)) dest = local_symbol_convert ((struct local_symbol *) dest); if (LOCAL_SYMBOL_CHECK (src)) 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) +#define COPIED_SYMFLAGS (BSF_FUNCTION | BSF_OBJECT \ + | BSF_GNU_INDIRECT_FUNCTION) dest->bsym->flags |= src->bsym->flags & COPIED_SYMFLAGS; -#endif #ifdef OBJ_COPY_SYMBOL_ATTRIBUTES OBJ_COPY_SYMBOL_ATTRIBUTES (dest, src); #endif -} -#ifdef BFD_ASSEMBLER +#ifdef TC_COPY_SYMBOL_ATTRIBUTES + TC_COPY_SYMBOL_ATTRIBUTES (dest, src); +#endif +} int -S_IS_FUNCTION (s) - symbolS *s; +S_IS_FUNCTION (symbolS *s) { flagword flags; @@ -1662,8 +2002,7 @@ S_IS_FUNCTION (s) } int -S_IS_EXTERNAL (s) - symbolS *s; +S_IS_EXTERNAL (symbolS *s) { flagword flags; @@ -1680,17 +2019,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_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) { if (LOCAL_SYMBOL_CHECK (s)) return 0; @@ -1698,17 +2057,38 @@ 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_IS_DEBUG (s) - symbolS *s; +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->flags & BSF_GNU_INDIRECT_FUNCTION) != 0 + || s->bsym->section == undefined_section + || bfd_is_com_section (s->bsym->section)); +} + +int +S_IS_DEBUG (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) return 0; @@ -1718,8 +2098,7 @@ S_IS_DEBUG (s) } int -S_IS_LOCAL (s) - symbolS *s; +S_IS_LOCAL (symbolS *s) { flagword flags; const char *name; @@ -1737,7 +2116,9 @@ 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; @@ -1746,6 +2127,7 @@ S_IS_LOCAL (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 @@ -1754,22 +2136,39 @@ 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_CAN_BE_REDEFINED (const symbolS *s) { - return S_GET_NAME (s) == 0; + 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; } -CONST char * -S_GET_NAME (s) - symbolS *s; +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) { if (LOCAL_SYMBOL_CHECK (s)) return ((struct local_symbol *) s)->lsy_name; @@ -1777,8 +2176,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; @@ -1786,9 +2184,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 @@ -1815,8 +2211,7 @@ S_SET_SEGMENT (s, 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); @@ -1829,20 +2224,32 @@ S_SET_EXTERNAL (s) { 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; } +#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 TE_PE + 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; @@ -1856,19 +2263,94 @@ S_CLEAR_EXTERNAL (s) } 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); } void -S_SET_NAME (s, name) - symbolS *s; - char *name; +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) +{ + 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)) { @@ -1877,28 +2359,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_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 * -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 (); @@ -1908,8 +2406,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); @@ -1919,251 +2416,283 @@ 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 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. */ + +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) { -#ifdef BFD_ASSEMBLER if (LOCAL_SYMBOL_CHECK (s)) { local_symbol_set_frag ((struct local_symbol *) s, f); return; } -#endif 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) { -#ifdef BFD_ASSEMBLER if (LOCAL_SYMBOL_CHECK (s)) return local_symbol_get_frag ((struct local_symbol *) s); -#endif return s->sy_frag; } /* 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; + 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. */ 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); - s->sy_used = 0; + s->sy_flags.sy_used = 0; } /* 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; - return s->sy_used; + return s->sy_flags.sy_used; } /* 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); - 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. */ void -symbol_clear_used_in_reloc (s) - symbolS *s; +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. */ int -symbol_used_in_reloc_p (s) - symbolS *s; +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. */ 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); - s->sy_mri_common = 1; + s->sy_flags.sy_mri_common = 1; } /* 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; - s->sy_mri_common = 0; + s->sy_flags.sy_mri_common = 0; } /* 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; - return s->sy_mri_common; + return s->sy_flags.sy_mri_common; } /* 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; - s->written = 1; + s->sy_flags.sy_written = 1; } /* 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; - s->written = 0; + s->sy_flags.sy_written = 0; } /* 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; - return s->written; + return s->sy_flags.sy_written; } /* Mark a symbol has having been resolved. */ void -symbol_mark_resolved (s) - symbolS *s; +symbol_mark_resolved (symbolS *s) { -#ifdef BFD_ASSEMBLER if (LOCAL_SYMBOL_CHECK (s)) { local_symbol_mark_resolved ((struct local_symbol *) s); return; } -#endif - s->sy_resolved = 1; + s->sy_flags.sy_resolved = 1; } /* Return whether a symbol has been resolved. */ int -symbol_resolved_p (s) - symbolS *s; +symbol_resolved_p (symbolS *s) { -#ifdef BFD_ASSEMBLER if (LOCAL_SYMBOL_CHECK (s)) return local_symbol_resolved_p ((struct local_symbol *) s); -#endif - return s->sy_resolved; + return s->sy_flags.sy_resolved; } /* Return whether a symbol is a section symbol. */ int -symbol_section_p (s) - symbolS *s ATTRIBUTE_UNUSED; +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_flags.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 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 * -symbol_get_bfdsym (s) - symbolS *s; +symbol_get_bfdsym (symbolS *s) { if (LOCAL_SYMBOL_CHECK (s)) s = local_symbol_convert ((struct local_symbol *) s); @@ -2173,24 +2702,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); @@ -2200,9 +2733,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); @@ -2216,8 +2747,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); @@ -2227,9 +2757,7 @@ symbol_get_tc (s) /* Set the processor information for a symbol. */ void -symbol_set_tc (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); @@ -2239,23 +2767,16 @@ symbol_set_tc (s, o) #endif /* TC_SYMFIELD_TYPE */ void -symbol_begin () +symbol_begin (void) { symbol_lastP = NULL; 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); + abs_symbol.bsym = bfd_abs_section_ptr->symbol; #endif abs_symbol.sy_value.X_op = O_constant; abs_symbol.sy_frag = &zero_address_frag; @@ -2263,88 +2784,98 @@ symbol_begin () 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; /* 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]) 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)) { -#ifdef BFD_ASSEMBLER 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"); -#endif } 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_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) - fprintf (file, " %lx", (long) S_GET_VALUE (sym)); + && s != expr_section) + fprintf (file, " %lx", (unsigned long) S_GET_VALUE (sym)); } else if (indent_level < max_indent_level && S_GET_SEGMENT (sym) != undefined_section) { indent_level++; fprintf (file, "\n%*s<", indent_level * 4, ""); -#ifdef BFD_ASSEMBLER 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 -#endif print_expr_1 (file, &sym->sy_value); fprintf (file, ">"); indent_level--; @@ -2353,8 +2884,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); @@ -2362,10 +2892,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, ""); @@ -2377,11 +2904,11 @@ 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); + fprintf (file, "expr "); + fprintf_vma (file, (bfd_vma) ((bfd_hostptr_t) exp)); + fprintf (file, " "); switch (exp->X_op) { case O_illegal: @@ -2391,7 +2918,7 @@ print_expr_1 (file, 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++; @@ -2401,7 +2928,7 @@ print_expr_1 (file, 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: @@ -2491,21 +3018,233 @@ 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 } + +#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 = xmalloc (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) +{ + 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