aboutsummaryrefslogtreecommitdiff
path: root/gas/frags.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2003-07-15 01:33:54 +0000
committerAlan Modra <amodra@gmail.com>2003-07-15 01:33:54 +0000
commite85ca5bb794d1fc2b3e94ff443a88683cc630822 (patch)
treee9a91e3610412b8110fb4714a72d9e6fd82d46e4 /gas/frags.c
parent1df8af7012779780a06879f3e836a66c1189f7f8 (diff)
downloadgdb-e85ca5bb794d1fc2b3e94ff443a88683cc630822.zip
gdb-e85ca5bb794d1fc2b3e94ff443a88683cc630822.tar.gz
gdb-e85ca5bb794d1fc2b3e94ff443a88683cc630822.tar.bz2
* frags.c (frag_more): Move segment checks to..
(frag_alloc_check): ..here. New function. (frag_append_1_char): Call frag_alloc_check.
Diffstat (limited to 'gas/frags.c')
-rw-r--r--gas/frags.c36
1 files changed, 23 insertions, 13 deletions
diff --git a/gas/frags.c b/gas/frags.c
index 8d7ed2f..47f828a 100644
--- a/gas/frags.c
+++ b/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.
@@ -36,6 +36,26 @@ frag_init ()
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. */
@@ -163,18 +183,7 @@ frag_more (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);
@@ -376,6 +385,7 @@ void
frag_append_1_char (datum)
int datum;
{
+ frag_alloc_check (&frchain_now->frch_obstack);
if (obstack_room (&frchain_now->frch_obstack) <= 1)
{
frag_wane (frag_now);