aboutsummaryrefslogtreecommitdiff
path: root/gas/frags.c
diff options
context:
space:
mode:
authorTristan Gingold <gingold@adacore.com>2011-07-27 06:54:12 +0000
committerTristan Gingold <gingold@adacore.com>2011-07-27 06:54:12 +0000
commit088b3cd0cecf4795b1b58224c03bcffeebe2dc73 (patch)
tree0d7e30d5f89c5226ad9cccb68c81596e7fb45266 /gas/frags.c
parent0a02ef29b51625c3229ed749cf89ca7d148dfc49 (diff)
downloadgdb-088b3cd0cecf4795b1b58224c03bcffeebe2dc73.zip
gdb-088b3cd0cecf4795b1b58224c03bcffeebe2dc73.tar.gz
gdb-088b3cd0cecf4795b1b58224c03bcffeebe2dc73.tar.bz2
2011-07-27 Tristan Gingold <gingold@adacore.com>
* frags.c (frag_grow): Revert previous patch.
Diffstat (limited to 'gas/frags.c')
-rw-r--r--gas/frags.c46
1 files changed, 20 insertions, 26 deletions
diff --git a/gas/frags.c b/gas/frags.c
index a0a0a29..fe3b4cc 100644
--- a/gas/frags.c
+++ b/gas/frags.c
@@ -75,47 +75,41 @@ frag_alloc (struct obstack *ob)
return ptr;
}
-/* Try to augment current frag by NCHARS chars.
+/* Try to augment current frag by nchars chars.
If there is no room, close of the current frag with a ".fill 0"
- and begin a new frag. Do not set up any fields of *now_frag. */
+ and begin a new frag. Unless the new frag has nchars chars available
+ do not return. Do not set up any fields of *now_frag. */
void
frag_grow (unsigned int nchars)
{
if (obstack_room (&frchain_now->frch_obstack) < nchars)
{
+ unsigned int n;
long oldc;
- long newc;
- /* Not enough room in this frag. Close it. */
frag_wane (frag_now);
-
+ frag_new (0);
+ oldc = frchain_now->frch_obstack.chunk_size;
/* Try to allocate a bit more than needed right now. But don't do
this if we would waste too much memory. Especially necessary
- for extremely big (like 2GB initialized) frags. */
+ for extremely big (like 2GB initialized) frags. */
if (nchars < 0x10000)
- newc = 2 * nchars;
+ frchain_now->frch_obstack.chunk_size = 2 * nchars;
else
- newc = nchars + 0x10000;
- newc += SIZEOF_STRUCT_FRAG;
-
- if (newc > 0)
- {
- /* Force to allocate at least NEWC bytes. */
- oldc = obstack_chunk_size (&frchain_now->frch_obstack);
- obstack_chunk_size (&frchain_now->frch_obstack) = newc;
-
- /* Do the real work: create a new frag. */
- frag_new (0);
-
- /* Restore the old chunk size. */
- obstack_chunk_size (&frchain_now->frch_obstack) = oldc;
- }
-
- /* Check for success (also handles negative values of NEWC). */
- if (obstack_room (&frchain_now->frch_obstack) < nchars)
- as_fatal (_("can't extend frag %u chars"), nchars);
+ frchain_now->frch_obstack.chunk_size = nchars + 0x10000;
+ frchain_now->frch_obstack.chunk_size += SIZEOF_STRUCT_FRAG;
+ if (frchain_now->frch_obstack.chunk_size > 0)
+ while ((n = obstack_room (&frchain_now->frch_obstack)) < nchars
+ && (unsigned long) frchain_now->frch_obstack.chunk_size > nchars)
+ {
+ frag_wane (frag_now);
+ frag_new (0);
+ }
+ frchain_now->frch_obstack.chunk_size = oldc;
}
+ if (obstack_room (&frchain_now->frch_obstack) < nchars)
+ as_fatal (_("can't extend frag %u chars"), nchars);
}
/* Call this to close off a completed frag, and start up a new (empty)