X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Ffrags.h;h=df259b8fe5583dcb779154766f801bd788106d7c;hb=8bf549a8c4cf576db65789048d14f6d803f59855;hp=dcd9a2f813ae8fb47427d80eb75900b4173c72bf;hpb=5a327c7ac240f0d61153acf965fb9ddfbfa1fa27;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/frags.h b/gas/frags.h index dcd9a2f813..df259b8fe5 100644 --- a/gas/frags.h +++ b/gas/frags.h @@ -1,5 +1,5 @@ /* frags.h - Header file for the frag concept. - Copyright (C) 1987, 92, 93, 94, 95, 97, 98, 99, 2000 + Copyright 1987, 1992, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -26,45 +26,54 @@ struct obstack; #endif -/* - * A code fragment (frag) is some known number of chars, followed by some - * unknown number of chars. Typically the unknown number of chars is an - * instruction address whose size is yet unknown. We always know the greatest - * possible size the unknown number of chars may become, and reserve that - * much room at the end of the frag. - * Once created, frags do not change address during assembly. - * We chain the frags in (a) forward-linked list(s). The object-file address - * of the 1st char of a frag is generally not known until after relax(). - * Many things at assembly time describe an address by {object-file-address - * of a particular frag}+offset. - - BUG: it may be smarter to have a single pointer off to various different - notes for different frag kinds. See how code pans - */ - -struct frag -{ - /* Object file address (as an octet offset). */ +/* A code fragment (frag) is some known number of chars, followed by some + unknown number of chars. Typically the unknown number of chars is an + instruction address whose size is yet unknown. We always know the greatest + possible size the unknown number of chars may become, and reserve that + much room at the end of the frag. + Once created, frags do not change address during assembly. + We chain the frags in (a) forward-linked list(s). The object-file address + of the 1st char of a frag is generally not known until after relax(). + Many things at assembly time describe an address by {object-file-address + of a particular frag}+offset. + + BUG: it may be smarter to have a single pointer off to various different + notes for different frag kinds. See how code pans. */ + +struct frag { + /* Object file address (as an octet offset). */ addressT fr_address; - /* Chain forward; ascending address order. Rooted in frch_root. */ - struct frag *fr_next; + /* When relaxing multiple times, remember the address the frag had + in the last relax pass. */ + addressT last_fr_address; - /* (Fixed) number of octets we know we have. May be 0. */ + /* (Fixed) number of octets we know we have. May be 0. */ offsetT fr_fix; /* May be used for (Variable) number of octets after above. The generic frag handling code no longer makes any use of fr_var. */ offsetT fr_var; - /* For variable-length tail. */ - symbolS *fr_symbol; - /* For variable-length tail. */ + /* For variable-length tail. */ offsetT fr_offset; + /* For variable-length tail. */ + symbolS *fr_symbol; /* Points to opcode low addr byte, for relaxation. */ char *fr_opcode; + /* Chain forward; ascending address order. Rooted in frch_root. */ + struct frag *fr_next; + + /* Where the frag was created, or where it became a variant frag. */ + char *fr_file; + unsigned int fr_line; + #ifndef NO_LISTING struct list_info_struct *line; #endif + /* Flipped each relax pass so we can easily determine whether + fr_address has been adjusted. */ + unsigned int relax_marker:1; + /* What state is my tail in? */ relax_stateT fr_type; relax_substateT fr_subtype; @@ -85,17 +94,13 @@ struct frag TC_FRAG_TYPE tc_frag_data; #endif - /* Where the frag was created, or where it became a variant frag. */ - char *fr_file; - unsigned int fr_line; - /* Data begins here. */ char fr_literal[1]; }; #define SIZEOF_STRUCT_FRAG \ -((char *)zero_address_frag.fr_literal-(char *)&zero_address_frag) -/* We want to say fr_literal[0] above. */ +((char *) zero_address_frag.fr_literal - (char *) &zero_address_frag) +/* We want to say fr_literal[0] above. */ /* Current frag we are building. This frag is incomplete. It is, however, included in frchain_now. The fr_fix field is bogus; @@ -104,31 +109,28 @@ COMMON fragS *frag_now; extern addressT frag_now_fix PARAMS ((void)); extern addressT frag_now_fix_octets PARAMS ((void)); -/* For foreign-segment symbol fixups. */ +/* For foreign-segment symbol fixups. */ COMMON fragS zero_address_frag; -/* For local common (N_BSS segment) fixups. */ +/* For local common (N_BSS segment) fixups. */ COMMON fragS bss_address_frag; #if 0 -/* - * A macro to speed up appending exactly 1 char - * to current frag. - */ -/* JF changed < 1 to <= 1 to avoid a race conditon */ -#define FRAG_APPEND_1_CHAR(datum) \ -{ \ - if (obstack_room( &frags ) <= 1) {\ - frag_wane (frag_now); \ - frag_new (0); \ - } \ - obstack_1grow( &frags, datum ); \ +/* A macro to speed up appending exactly 1 char to current frag. */ +/* JF changed < 1 to <= 1 to avoid a race conditon. */ +#define FRAG_APPEND_1_CHAR(datum) \ +{ \ + if (obstack_room (&frags) <= 1) \ + { \ + frag_wane (frag_now); \ + frag_new (0); \ + } \ + obstack_1grow (&frags, datum); \ } #else extern void frag_append_1_char PARAMS ((int)); #define FRAG_APPEND_1_CHAR(X) frag_append_1_char (X) #endif - void frag_init PARAMS ((void)); fragS *frag_alloc PARAMS ((struct obstack *)); void frag_grow PARAMS ((unsigned int nchars)); @@ -138,6 +140,7 @@ void frag_align_pattern PARAMS ((int alignment, const char *fill_pattern, int n_fill, int max)); +void frag_align_code PARAMS ((int alignment, int max)); void frag_new PARAMS ((int old_frags_var_max_size)); void frag_wane PARAMS ((fragS * fragP));