X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Finput-scrub.c;h=7407741b3fa538c398f60e12cc9d3818abafb335;hb=2d447fcaa923b78068b74b162a8de91219c03b78;hp=ee5bdc894f87c23841daede030c859a467a42af8;hpb=7152f1dc4515cb14067fed4c5d5b5374f0d475b4;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/input-scrub.c b/gas/input-scrub.c index ee5bdc894f..7407741b3f 100644 --- a/gas/input-scrub.c +++ b/gas/input-scrub.c @@ -1,5 +1,6 @@ /* input_scrub.c - Break up input buffers into whole numbers of lines. - Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 96, 97, 2000 + Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, + 2000, 2001, 2003, 2006 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -16,10 +17,9 @@ 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. */ + Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ -#include /* Need this to make errno declaration right */ #include "as.h" #include "input-file.h" #include "sb.h" @@ -32,7 +32,7 @@ * were broken across buffers, and return a buffer of full lines to * the caller. * The last partial line begins the next buffer we build and return to caller. - * The buffer returned to caller is preceeded by BEFORE_STRING and followed + * The buffer returned to caller is preceded by BEFORE_STRING and followed * by AFTER_STRING, as sentinels. The last character before AFTER_STRING * is a newline. * Also looks after line numbers, for e.g. error messages. @@ -103,26 +103,25 @@ static int logical_input_line; /* Struct used to save the state of the input handler during include files */ struct input_save { - char *buffer_start; - char *partial_where; - int partial_size; - char save_source[AFTER_SIZE]; - unsigned int buffer_length; - char *physical_input_file; - char *logical_input_file; - line_numberT physical_input_line; - int logical_input_line; - int sb_index; - sb from_sb; - int from_sb_is_expansion; /* Should we do a conditional check? */ - struct input_save *next_saved_file; /* Chain of input_saves */ - char *input_file_save; /* Saved state of input routines */ - char *saved_position; /* Caller's saved position in buf */ + char * buffer_start; + char * partial_where; + int partial_size; + char save_source[AFTER_SIZE]; + unsigned int buffer_length; + char * physical_input_file; + char * logical_input_file; + line_numberT physical_input_line; + int logical_input_line; + int sb_index; + sb from_sb; + int from_sb_is_expansion; /* Should we do a conditional check? */ + struct input_save * next_saved_file; /* Chain of input_saves. */ + char * input_file_save; /* Saved state of input routines. */ + char * saved_position; /* Caller's saved position in buf. */ }; -static struct input_save *input_scrub_push PARAMS ((char *saved_position)); -static char *input_scrub_pop PARAMS ((struct input_save *arg)); -static void as_1_char PARAMS ((unsigned int c, FILE * stream)); +static struct input_save *input_scrub_push (char *saved_position); +static char *input_scrub_pop (struct input_save *arg); /* Saved information about the file that .include'd this one. When we hit EOF, we automatically pop to that file. */ @@ -134,8 +133,7 @@ static struct input_save *next_saved_file; area, which can be restored by passing it to input_scrub_pop(). */ static struct input_save * -input_scrub_push (saved_position) - char *saved_position; +input_scrub_push (char *saved_position) { register struct input_save *saved; @@ -170,8 +168,7 @@ input_scrub_push (saved_position) } static char * -input_scrub_pop (saved) - struct input_save *saved; +input_scrub_pop (struct input_save *saved) { char *saved_position; @@ -198,7 +195,7 @@ input_scrub_pop (saved) } void -input_scrub_begin () +input_scrub_begin (void) { know (strlen (BEFORE_STRING) == BEFORE_SIZE); know (strlen (AFTER_STRING) == AFTER_SIZE @@ -220,7 +217,7 @@ input_scrub_begin () } void -input_scrub_end () +input_scrub_end (void) { if (buffer_start) { @@ -234,8 +231,7 @@ input_scrub_end () Return start of caller's part of buffer. */ char * -input_scrub_new_file (filename) - char *filename; +input_scrub_new_file (char *filename) { input_file_open (filename, !flag_no_comments); physical_input_file = filename[0] ? filename : _("{standard input}"); @@ -250,9 +246,7 @@ input_scrub_new_file (filename) input_scrub_new_file. */ char * -input_scrub_include_file (filename, position) - char *filename; - char *position; +input_scrub_include_file (char *filename, char *position) { next_saved_file = input_scrub_push (position); return input_scrub_new_file (filename); @@ -262,10 +256,7 @@ input_scrub_include_file (filename, position) expanding a macro. */ void -input_scrub_include_sb (from, position, is_expansion) - sb *from; - char *position; - int is_expansion; +input_scrub_include_sb (sb *from, char *position, int is_expansion) { if (macro_nest > max_macro_nest) as_fatal (_("macros nested too deeply")); @@ -287,7 +278,7 @@ input_scrub_include_sb (from, position, is_expansion) /* Add the sentinel required by read.c. */ sb_add_char (&from_sb, '\n'); } - sb_add_sb (&from_sb, from); + sb_scrub_and_add_sb (&from_sb, from); sb_index = 1; /* These variables are reset by input_scrub_push. Restore them @@ -297,14 +288,13 @@ input_scrub_include_sb (from, position, is_expansion) } void -input_scrub_close () +input_scrub_close (void) { input_file_close (); } char * -input_scrub_next_buffer (bufp) - char **bufp; +input_scrub_next_buffer (char **bufp) { register char *limit; /*->just after last char of buffer. */ @@ -393,7 +383,7 @@ input_scrub_next_buffer (bufp) partial_where = 0; if (partial_size > 0) { - as_warn (_("Partial line at end of file ignored")); + as_warn (_("partial line at end of file ignored")); } /* Tell the listing we've finished the file. */ @@ -413,13 +403,13 @@ input_scrub_next_buffer (bufp) messages and so on. Return TRUE if we opened any file. */ int -seen_at_least_1_file () +seen_at_least_1_file (void) { return (physical_input_file != NULL); } void -bump_line_counters () +bump_line_counters (void) { if (sb_index < 0) { @@ -438,9 +428,8 @@ bump_line_counters () Returns nonzero if the filename actually changes. */ int -new_logical_line (fname, line_number) - char *fname; /* DON'T destroy it! We point to it! */ - int line_number; +new_logical_line (char *fname, /* DON'T destroy it! We point to it! */ + int line_number) { if (line_number >= 0) logical_input_line = line_number; @@ -463,9 +452,7 @@ new_logical_line (fname, line_number) up declarations like that, and it's easier to avoid it. */ void -as_where (namep, linep) - char **namep; - unsigned int *linep; +as_where (char **namep, unsigned int *linep) { if (logical_input_file != NULL && (linep == NULL || logical_input_line >= 0)) @@ -487,42 +474,3 @@ as_where (namep, linep) *linep = 0; } } - -/* Output to given stream how much of line we have scanned so far. - Assumes we have scanned up to and including input_line_pointer. - No free '\n' at end of line. */ - -void -as_howmuch (stream) - FILE *stream; /* Opened for write please. */ -{ - register char *p; /* Scan input line. */ - - for (p = input_line_pointer - 1; *p != '\n'; --p) - { - } - ++p; /* p->1st char of line. */ - for (; p <= input_line_pointer; p++) - { - /* Assume ASCII. EBCDIC & other micro-computer char sets ignored. */ - as_1_char ((unsigned char) *p, stream); - } -} - -static void -as_1_char (c, stream) - unsigned int c; - FILE *stream; -{ - if (c > 127) - { - (void) putc ('%', stream); - c -= 128; - } - if (c < 32) - { - (void) putc ('^', stream); - c += '@'; - } - (void) putc (c, stream); -}