diff options
Diffstat (limited to 'contrib/binutils/gas/frags.c')
-rw-r--r-- | contrib/binutils/gas/frags.c | 109 |
1 files changed, 51 insertions, 58 deletions
diff --git a/contrib/binutils/gas/frags.c b/contrib/binutils/gas/frags.c index 8d7ed2f..83625d7 100644 --- a/contrib/binutils/gas/frags.c +++ b/contrib/binutils/gas/frags.c @@ -1,6 +1,6 @@ /* frags.c - manage frags - Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000 + 1999, 2000, 2001, 2003 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -30,19 +30,38 @@ extern fragS bss_address_frag; /* Initialization for frag routines. */ void -frag_init () +frag_init (void) { zero_address_frag.fr_type = rs_fill; bss_address_frag.fr_type = rs_fill; } +/* Check that we're not trying to assemble into a section that can't + allocate frags (currently, this is only possible in the absolute + section), or into an mri common. */ + +static void +frag_alloc_check (const struct obstack *ob) +{ + if (ob->chunk_size == 0) + { + as_bad (_("attempt to allocate data in absolute section")); + subseg_set (text_section, 0); + } + + if (mri_common_symbol != NULL) + { + as_bad (_("attempt to allocate data in common section")); + mri_common_symbol = NULL; + } +} + /* Allocate a frag on the specified obstack. Call this routine from everywhere else, so that all the weird alignment hackery can be done in just one place. */ fragS * -frag_alloc (ob) - struct obstack *ob; +frag_alloc (struct obstack *ob) { fragS *ptr; int oalign; @@ -62,8 +81,7 @@ frag_alloc (ob) do not return. Do not set up any fields of *now_frag. */ void -frag_grow (nchars) - unsigned int nchars; +frag_grow (unsigned int nchars) { if (obstack_room (&frchain_now->frch_obstack) < nchars) { @@ -105,10 +123,9 @@ frag_grow (nchars) of frchain_now. */ void -frag_new (old_frags_var_max_size) - /* Number of chars (already allocated on obstack frags) in - variable_length part of frag. */ - int old_frags_var_max_size; +frag_new (int old_frags_var_max_size + /* Number of chars (already allocated on obstack frags) in + variable_length part of frag. */) { fragS *former_last_fragP; frchainS *frchP; @@ -158,23 +175,11 @@ frag_new (old_frags_var_max_size) frag_now_growth past the new chars. */ char * -frag_more (nchars) - int nchars; +frag_more (int nchars) { register char *retval; - if (now_seg == absolute_section) - { - as_bad (_("attempt to allocate data in absolute section")); - subseg_set (text_section, 0); - } - - if (mri_common_symbol != NULL) - { - as_bad (_("attempt to allocate data in common section")); - mri_common_symbol = NULL; - } - + frag_alloc_check (&frchain_now->frch_obstack); frag_grow (nchars); retval = obstack_next_free (&frchain_now->frch_obstack); obstack_blank_fast (&frchain_now->frch_obstack, nchars); @@ -189,14 +194,8 @@ frag_more (nchars) to write into. */ char * -frag_var (type, max_chars, var, subtype, symbol, offset, opcode) - relax_stateT type; - int max_chars; - int var; - relax_substateT subtype; - symbolS *symbol; - offsetT offset; - char *opcode; +frag_var (relax_stateT type, int max_chars, int var, relax_substateT subtype, + symbolS *symbol, offsetT offset, char *opcode) { register char *retval; @@ -227,14 +226,9 @@ frag_var (type, max_chars, var, subtype, symbol, offset, opcode) No call to frag_grow is done. */ char * -frag_variant (type, max_chars, var, subtype, symbol, offset, opcode) - relax_stateT type; - int max_chars; - int var; - relax_substateT subtype; - symbolS *symbol; - offsetT offset; - char *opcode; +frag_variant (relax_stateT type, int max_chars, int var, + relax_substateT subtype, symbolS *symbol, offsetT offset, + char *opcode) { register char *retval; @@ -261,14 +255,21 @@ frag_variant (type, max_chars, var, subtype, symbol, offset, opcode) /* Reduce the variable end of a frag to a harmless state. */ void -frag_wane (fragP) - register fragS *fragP; +frag_wane (register fragS *fragP) { fragP->fr_type = rs_fill; fragP->fr_offset = 0; fragP->fr_var = 0; } +/* Return the number of bytes by which the current frag can be grown. */ + +int +frag_room (void) +{ + return obstack_room (&frchain_now->frch_obstack); +} + /* Make an alignment frag. The size of this frag will be adjusted to force the next frag to have the appropriate alignment. ALIGNMENT is the power of two to which to align. FILL_CHARACTER is the @@ -277,10 +278,7 @@ frag_wane (fragP) or 0 if there is no maximum. */ void -frag_align (alignment, fill_character, max) - int alignment; - int fill_character; - int max; +frag_align (int alignment, int fill_character, int max) { if (now_seg == absolute_section) { @@ -310,11 +308,8 @@ frag_align (alignment, fill_character, max) doing the alignment, or 0 if there is no maximum. */ void -frag_align_pattern (alignment, fill_pattern, n_fill, max) - int alignment; - const char *fill_pattern; - int n_fill; - int max; +frag_align_pattern (int alignment, const char *fill_pattern, + int n_fill, int max) { char *p; @@ -344,9 +339,7 @@ frag_align_pattern (alignment, fill_pattern, n_fill, max) #endif void -frag_align_code (alignment, max) - int alignment; - int max; +frag_align_code (int alignment, int max) { char *p; @@ -357,7 +350,7 @@ frag_align_code (alignment, max) } addressT -frag_now_fix_octets () +frag_now_fix_octets (void) { if (now_seg == absolute_section) return abs_section_offset; @@ -367,15 +360,15 @@ frag_now_fix_octets () } addressT -frag_now_fix () +frag_now_fix (void) { return frag_now_fix_octets () / OCTETS_PER_BYTE; } void -frag_append_1_char (datum) - int datum; +frag_append_1_char (int datum) { + frag_alloc_check (&frchain_now->frch_obstack); if (obstack_room (&frchain_now->frch_obstack) <= 1) { frag_wane (frag_now); |