diff options
Diffstat (limited to 'gas/struc-symbol.h')
| -rw-r--r-- | gas/struc-symbol.h | 124 |
1 files changed, 50 insertions, 74 deletions
diff --git a/gas/struc-symbol.h b/gas/struc-symbol.h index aeb04050670..1087c2b9f44 100644 --- a/gas/struc-symbol.h +++ b/gas/struc-symbol.h @@ -1,5 +1,5 @@ /* struct_symbol.h - Internal symbol structure - Copyright (C) 1987, 92, 93, 94, 95, 1998 Free Software Foundation, Inc. + Copyright (C) 1987, 92, 93, 94, 95, 98, 1999 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -21,16 +21,16 @@ #ifndef __struc_symbol_h__ #define __struc_symbol_h__ -#ifdef BFD_ASSEMBLER -/* The BFD code wants to walk the list in both directions. */ -#undef SYMBOLS_NEED_BACKPOINTERS -#define SYMBOLS_NEED_BACKPOINTERS -#endif +/* The information we keep for a symbol. Note that the symbol table + holds pointers both to this and to local_symbol structures. See + below. */ -/* our version of an nlist node */ struct symbol { -#ifndef BFD_ASSEMBLER +#ifdef BFD_ASSEMBLER + /* BFD symbol */ + asymbol *bsym; +#else /* The (4-origin) position of sy_name in the symbol table of the object file. This will be 0 for (nameless) .stabd symbols. @@ -42,9 +42,6 @@ struct symbol /* The 24 bit symbol number. Symbol numbers start at 0 and are unsigned. */ long sy_number; -#else - /* BFD symbol */ - asymbol *bsym; #endif /* The value of the symbol. */ @@ -91,75 +88,54 @@ struct symbol #ifdef TC_SYMFIELD_TYPE TC_SYMFIELD_TYPE sy_tc; #endif - -#ifdef TARGET_SYMBOL_FIELDS - TARGET_SYMBOL_FIELDS -#endif }; -typedef struct symbol symbolS; +/* A pointer in the symbol may point to either a complete symbol + (struct symbol above) or to a local symbol (struct local_symbol + defined here). The symbol code can detect the case by examining + the first field. It is always NULL for a local symbol. -#ifndef WORKING_DOT_WORD -struct broken_word - { - /* Linked list -- one of these structures per ".word x-y+C" - expression. */ - struct broken_word *next_broken_word; - /* Segment and subsegment for broken word. */ - segT seg; - subsegT subseg; - /* Which frag is this broken word in? */ - fragS *frag; - /* Where in the frag is it? */ - char *word_goes_here; - /* Where to add the break. */ - fragS *dispfrag; /* where to add the break */ - /* Operands of expression. */ - symbolS *add; - symbolS *sub; - offsetT addnum; - - int added; /* nasty thing happend yet? */ - /* 1: added and has a long-jump */ - /* 2: added but uses someone elses long-jump */ - - /* Pointer to broken_word with a similar long-jump. */ - struct broken_word *use_jump; - }; -extern struct broken_word *broken_words; -#endif /* ndef WORKING_DOT_WORD */ - -/* - * Current means for getting from symbols to segments and vice verse. - * This will change for infinite-segments support (e.g. COFF). - */ -extern const segT N_TYPE_seg[]; /* subseg.c */ - -#define SEGMENT_TO_SYMBOL_TYPE(seg) ( seg_N_TYPE [(int) (seg)] ) -extern const short seg_N_TYPE[];/* subseg.c */ - -#define N_REGISTER 30 /* Fake N_TYPE value for SEG_REGISTER */ - -void symbol_clear_list_pointers PARAMS ((symbolS * symbolP)); - -#ifdef SYMBOLS_NEED_BACKPOINTERS - -void symbol_insert PARAMS ((symbolS * addme, symbolS * target, - symbolS ** rootP, symbolS ** lastP)); -void symbol_remove PARAMS ((symbolS * symbolP, symbolS ** rootP, - symbolS ** lastP)); - -#define symbol_previous(s) ((s)->sy_previous) + We do this because we ordinarily only need a small amount of + information for a local symbol. The symbol table takes up a lot of + space, and storing less information for a local symbol can make a + big difference in assembler memory usage when assembling a large + file. */ -#endif /* SYMBOLS_NEED_BACKPOINTERS */ - -void verify_symbol_chain PARAMS ((symbolS * rootP, symbolS * lastP)); -void verify_symbol_chain_2 PARAMS ((symbolS * symP)); +struct local_symbol +{ + /* This pointer is always NULL to indicate that this is a local + symbol. */ + asymbol *lsy_marker; + + /* The symbol section. This also serves as a flag. If this is + reg_section, then this symbol has been converted into a regular + symbol, and sy_sym points to it. */ + segT lsy_section; + + /* The symbol name. */ + const char *lsy_name; + + /* The symbol frag or the real symbol, depending upon the value in + sy_section. If the symbol has been fully resolved, lsy_frag is + set to NULL. */ + union + { + fragS *lsy_frag; + symbolS *lsy_sym; + } u; -void symbol_append PARAMS ((symbolS * addme, symbolS * target, - symbolS ** rootP, symbolS ** lastP)); + /* The offset within the frag. */ + valueT lsy_offset; +}; -#define symbol_next(s) ((s)->sy_next) +#define local_symbol_converted_p(l) ((l)->lsy_section == reg_section) +#define local_symbol_mark_converted(l) ((l)->lsy_section = reg_section) +#define local_symbol_resolved_p(l) ((l)->u.lsy_frag == NULL) +#define local_symbol_mark_resolved(l) ((l)->u.lsy_frag = NULL) +#define local_symbol_get_frag(l) ((l)->u.lsy_frag) +#define local_symbol_set_frag(l, f) ((l)->u.lsy_frag = (f)) +#define local_symbol_get_real_symbol(l) ((l)->u.lsy_sym) +#define local_symbol_set_real_symbol(l, s) ((l)->u.lsy_sym = (s)) #endif /* __struc_symbol_h__ */ |