X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fsb.c;h=8d5e8dde2fb8e8a9da2d3fb2d20471272132c9d6;hb=9c4ea6c5a9607f76721259469ca229957bca2e0b;hp=dea3f76c433f35e649ea3dfcb5b8e220629c5a9c;hpb=87c245cccce4a84d53381ea7a8247330608eba7f;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/sb.c b/gas/sb.c index dea3f76c43..8d5e8dde2f 100644 --- a/gas/sb.c +++ b/gas/sb.c @@ -1,5 +1,6 @@ /* sb.c - string buffer manipulation routines - Copyright 1994, 1995, 2000, 2003 Free Software Foundation, Inc. + Copyright 1994, 1995, 2000, 2003, 2005, 2006, 2007, 2009 + Free Software Foundation, Inc. Written by Steve and Judy Chamberlain of Cygnus Support, sac@cygnus.com @@ -8,7 +9,7 @@ GAS is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + the Free Software Foundation; either version 3, or (at your option) any later version. GAS is distributed in the hope that it will be useful, @@ -18,20 +19,10 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free - Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ - -#include "config.h" -#include -#ifdef HAVE_STDLIB_H -#include -#endif -#ifdef HAVE_STRING_H -#include -#else -#include -#endif -#include "libiberty.h" + Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ + +#include "as.h" #include "sb.h" /* These routines are about manipulating strings. @@ -46,9 +37,7 @@ sb_new (&foo); sb_grow... (&foo,...); use foo->ptr[*]; - sb_kill (&foo); - -*/ + sb_kill (&foo); */ static int dsize = 5; static void sb_check (sb *, int); @@ -57,23 +46,25 @@ static void sb_check (sb *, int); static int string_count[sb_max_power_two]; /* Free list of sb structures. */ -static sb_list_vector free_list; +static struct +{ + sb_element *size[sb_max_power_two]; +} free_list; -/* initializes an sb. */ +/* Initializes an sb. */ static void sb_build (sb *ptr, int size) { - /* see if we can find one to allocate */ + /* See if we can find one to allocate. */ sb_element *e; - if (size > sb_max_power_two) - abort (); + gas_assert (size < sb_max_power_two); e = free_list.size[size]; if (!e) { - /* nothing there, allocate one and stick into the free list */ + /* Nothing there, allocate one and stick into the free list. */ e = (sb_element *) xmalloc (sizeof (sb_element) + (1 << size)); e->next = free_list.size[size]; e->size = 1 << size; @@ -81,11 +72,10 @@ sb_build (sb *ptr, int size) string_count[size]++; } - /* remove from free list */ - + /* Remove from free list. */ free_list.size[size] = e->next; - /* copy into callers world */ + /* Copy into callers world. */ ptr->ptr = e->data; ptr->pot = size; ptr->len = 0; @@ -98,17 +88,17 @@ sb_new (sb *ptr) sb_build (ptr, dsize); } -/* deallocate the sb at ptr */ +/* Deallocate the sb at ptr. */ void sb_kill (sb *ptr) { - /* return item to free list */ + /* Return item to free list. */ ptr->item->next = free_list.size[ptr->pot]; free_list.size[ptr->pot] = ptr->item; } -/* add the sb at s to the end of the sb at ptr */ +/* Add the sb at s to the end of the sb at ptr. */ void sb_add_sb (sb *ptr, sb *s) @@ -118,7 +108,39 @@ sb_add_sb (sb *ptr, sb *s) ptr->len += s->len; } -/* make sure that the sb at ptr has room for another len characters, +/* Helper for sb_scrub_and_add_sb. */ + +static sb *sb_to_scrub; +static char *scrub_position; +static int +scrub_from_sb (char *buf, int buflen) +{ + int copy; + copy = sb_to_scrub->len - (scrub_position - sb_to_scrub->ptr); + if (copy > buflen) + copy = buflen; + memcpy (buf, scrub_position, copy); + scrub_position += copy; + return copy; +} + +/* Run the sb at s through do_scrub_chars and add the result to the sb + at ptr. */ + +void +sb_scrub_and_add_sb (sb *ptr, sb *s) +{ + sb_to_scrub = s; + scrub_position = s->ptr; + + sb_check (ptr, s->len); + ptr->len += do_scrub_chars (scrub_from_sb, ptr->ptr + ptr->len, s->len); + + sb_to_scrub = 0; + scrub_position = 0; +} + +/* Make sure that the sb at ptr has room for another len characters, and grow it if it doesn't. */ static void @@ -128,6 +150,7 @@ sb_check (sb *ptr, int len) { sb tmp; int pot = ptr->pot; + while (ptr->len + len >= 1 << pot) pot++; sb_build (&tmp, pot); @@ -137,7 +160,7 @@ sb_check (sb *ptr, int len) } } -/* make the sb at ptr point back to the beginning. */ +/* Make the sb at ptr point back to the beginning. */ void sb_reset (sb *ptr) @@ -145,7 +168,7 @@ sb_reset (sb *ptr) ptr->len = 0; } -/* add character c to the end of the sb at ptr. */ +/* Add character c to the end of the sb at ptr. */ void sb_add_char (sb *ptr, int c) @@ -154,7 +177,7 @@ sb_add_char (sb *ptr, int c) ptr->ptr[ptr->len++] = c; } -/* add null terminated string s to the end of sb at ptr. */ +/* Add null terminated string s to the end of sb at ptr. */ void sb_add_string (sb *ptr, const char *s) @@ -165,7 +188,17 @@ sb_add_string (sb *ptr, const char *s) ptr->len += len; } -/* like sb_name, but don't include the null byte in the string. */ +/* Add string at s of length len to sb at ptr */ + +void +sb_add_buffer (sb *ptr, const char *s, int len) +{ + sb_check (ptr, len); + memcpy (ptr->ptr + ptr->len, s, len); + ptr->len += len; +} + +/* Like sb_name, but don't include the null byte in the string. */ char * sb_terminate (sb *in) @@ -175,8 +208,8 @@ sb_terminate (sb *in) return in->ptr; } -/* start at the index idx into the string in sb at ptr and skip - whitespace. return the index of the first non whitespace character */ +/* Start at the index idx into the string in sb at ptr and skip + whitespace. return the index of the first non whitespace character. */ int sb_skip_white (int idx, sb *ptr) @@ -188,7 +221,7 @@ sb_skip_white (int idx, sb *ptr) return idx; } -/* start at the index idx into the sb at ptr. skips whitespace, +/* Start at the index idx into the sb at ptr. skips whitespace, a comma and any following whitespace. returns the index of the next character. */