/* input_scrub.c - Break up input buffers into whole numbers of lines.
- Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 96, 1997
- Free Software Foundation, Inc.
+ Copyright (C) 1987-2020 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
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,
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 <errno.h> /* Need this to make errno declaration right */
#include "as.h"
+#include "filenames.h"
#include "input-file.h"
#include "sb.h"
#include "listing.h"
* 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.
*/
\f
#define BEFORE_STRING ("\n")
-#define AFTER_STRING ("\0") /* memcpy of 0 chars might choke. */
+#define AFTER_STRING ("\0") /* memcpy of 0 chars might choke. */
#define BEFORE_SIZE (1)
#define AFTER_SIZE (1)
-static char *buffer_start; /*->1st char of full buffer area. */
-static char *partial_where; /*->after last full line in buffer. */
-static int partial_size; /* >=0. Number of chars in partial line in buffer. */
+#ifndef TC_EOL_IN_INSN
+#define TC_EOL_IN_INSN(P) 0
+#endif
+
+static char *buffer_start; /*->1st char of full buffer area. */
+static char *partial_where; /*->after last full line in buffer. */
+static size_t partial_size; /* >=0. Number of chars in partial line in buffer. */
+
+/* Because we need AFTER_STRING just after last full line, it clobbers
+ 1st part of partial line. So we preserve 1st part of partial line
+ here. */
static char save_source[AFTER_SIZE];
-/* Because we need AFTER_STRING just after last */
-/* full line, it clobbers 1st part of partial */
-/* line. So we preserve 1st part of partial */
-/* line here. */
-static unsigned int buffer_length; /* What is the largest size buffer that */
-/* input_file_give_next_buffer() could */
-/* return to us? */
+
+/* The size of the input buffer we concatenate
+ input_file_give_next_buffer chunks into. Excludes the BEFORE and
+ AFTER counts. */
+static size_t buffer_length;
/* The index into an sb structure we are reading from. -1 if none. */
-static int sb_index = -1;
+static size_t sb_index = -1;
/* If we are reading from an sb structure, this is it. */
static sb from_sb;
+/* Should we do a conditional check on from_sb? */
+static int from_sb_is_expansion = 1;
+
/* The number of nested sb structures we have included. */
int macro_nest;
but the latest one are saved off in a struct input_save. These files remain
open, so we are limited by the number of open files allowed by the
underlying OS. We may also sequentially read more than one source file in an
- assembly. */
+ assembly. */
/* We must track the physical file and line number for error messages. We also
track a "logical" file and line number corresponding to (C?) compiler
source line numbers. Whenever we open a file we must fill in
- physical_input_file. So if it is NULL we have not opened any files yet. */
+ physical_input_file. So if it is NULL we have not opened any files yet. */
-static char *physical_input_file;
-static char *logical_input_file;
+static const char *physical_input_file;
+static const char *logical_input_file;
-typedef unsigned int line_numberT; /* 1-origin line number in a source file. */
-/* A line ends in '\n' or eof. */
-
-static line_numberT physical_input_line;
+/* 1-origin line number in a source file. */
+/* A line ends in '\n' or eof. */
+static unsigned int physical_input_line;
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;
- 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));
+struct input_save {
+ char * buffer_start;
+ char * partial_where;
+ size_t partial_size;
+ char save_source[AFTER_SIZE];
+ size_t buffer_length;
+ const char * physical_input_file;
+ const char * logical_input_file;
+ unsigned int physical_input_line;
+ int logical_input_line;
+ size_t 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 (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. */
+ we automatically pop to that file. */
static struct input_save *next_saved_file;
+/* Initialize input buffering. */
+
+static void
+input_scrub_reinit (void)
+{
+ input_file_begin (); /* Reinitialize! */
+ logical_input_line = -1;
+ logical_input_file = NULL;
+
+ buffer_length = input_file_buffer_size () * 2;
+ buffer_start = XNEWVEC (char, BEFORE_SIZE + AFTER_SIZE + 1 + buffer_length);
+ memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
+}
+
/* Push the state of input reading and scrubbing so that we can #include.
The return value is a 'void *' (fudged for old compilers) to a save
- area, which can be restored by passing it to input_scrub_pop(). */
+ 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;
+ struct input_save *saved;
- saved = (struct input_save *) xmalloc (sizeof *saved);
+ saved = XNEW (struct input_save);
saved->saved_position = saved_position;
saved->buffer_start = buffer_start;
saved->logical_input_line = logical_input_line;
saved->sb_index = sb_index;
saved->from_sb = from_sb;
+ saved->from_sb_is_expansion = from_sb_is_expansion;
memcpy (saved->save_source, save_source, sizeof (save_source));
saved->next_saved_file = next_saved_file;
saved->input_file_save = input_file_push ();
- input_file_begin (); /* Reinitialize! */
- logical_input_line = -1;
- logical_input_file = (char *) NULL;
- buffer_length = input_file_buffer_size ();
sb_index = -1;
- buffer_start = xmalloc ((BEFORE_SIZE + buffer_length + buffer_length + AFTER_SIZE));
- memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
+ input_scrub_reinit ();
return saved;
-} /* input_scrub_push() */
+}
static char *
-input_scrub_pop (saved)
- struct input_save *saved;
+input_scrub_pop (struct input_save *saved)
{
char *saved_position;
logical_input_line = saved->logical_input_line;
sb_index = saved->sb_index;
from_sb = saved->from_sb;
+ from_sb_is_expansion = saved->from_sb_is_expansion;
partial_where = saved->partial_where;
partial_size = saved->partial_size;
next_saved_file = saved->next_saved_file;
return saved_position;
}
\f
-
void
-input_scrub_begin ()
+input_scrub_begin (void)
{
know (strlen (BEFORE_STRING) == BEFORE_SIZE);
- know (strlen (AFTER_STRING) == AFTER_SIZE || (AFTER_STRING[0] == '\0' && AFTER_SIZE == 1));
-
- input_file_begin ();
-
- buffer_length = input_file_buffer_size ();
+ know (strlen (AFTER_STRING) == AFTER_SIZE
+ || (AFTER_STRING[0] == '\0' && AFTER_SIZE == 1));
- buffer_start = xmalloc ((BEFORE_SIZE + buffer_length + buffer_length + AFTER_SIZE));
- memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
-
- /* Line number things. */
- logical_input_line = -1;
- logical_input_file = (char *) NULL;
- physical_input_file = NULL; /* No file read yet. */
+ physical_input_file = NULL; /* No file read yet. */
next_saved_file = NULL; /* At EOF, don't pop to any other file */
+ input_scrub_reinit ();
do_scrub_begin (flag_m68k_mri);
}
void
-input_scrub_end ()
+input_scrub_end (void)
{
if (buffer_start)
{
}
}
-/* Start reading input from a new file. */
+/* Start reading input from a new file.
+ Return start of caller's part of buffer. */
-char * /* Return start of caller's part of buffer. */
-input_scrub_new_file (filename)
- char *filename;
+char *
+input_scrub_new_file (const char *filename)
{
input_file_open (filename, !flag_no_comments);
physical_input_file = filename[0] ? filename : _("{standard input}");
return (buffer_start + BEFORE_SIZE);
}
-
/* Include a file from the current file. Save our state, cause it to
be restored on EOF, and begin handling a new file. Same result as
- input_scrub_new_file. */
+ input_scrub_new_file. */
char *
-input_scrub_include_file (filename, position)
- char *filename;
- char *position;
+input_scrub_include_file (const char *filename, char *position)
{
next_saved_file = input_scrub_push (position);
return input_scrub_new_file (filename);
expanding a macro. */
void
-input_scrub_include_sb (from, position)
- sb *from;
- char *position;
+input_scrub_include_sb (sb *from, char *position, int is_expansion)
{
+ int newline;
+
if (macro_nest > max_macro_nest)
as_fatal (_("macros nested too deeply"));
++macro_nest;
+#ifdef md_macro_start
+ if (is_expansion)
+ {
+ md_macro_start ();
+ }
+#endif
+
next_saved_file = input_scrub_push (position);
- sb_new (&from_sb);
- if (from->len >= 1 && from->ptr[0] != '\n')
+ /* Allocate sufficient space: from->len + optional newline. */
+ newline = from->len >= 1 && from->ptr[0] != '\n';
+ sb_build (&from_sb, from->len + newline);
+ from_sb_is_expansion = is_expansion;
+ if (newline)
{
/* 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);
+
+ /* Make sure the parser looks at defined contents when it scans for
+ e.g. end-of-line at the end of a macro. */
+ sb_terminate (&from_sb);
+
sb_index = 1;
/* These variables are reset by input_scrub_push. Restore them
}
void
-input_scrub_close ()
+input_scrub_close (void)
{
input_file_close ();
+ physical_input_line = 0;
+ logical_input_line = -1;
}
char *
-input_scrub_next_buffer (bufp)
- char **bufp;
+input_scrub_next_buffer (char **bufp)
{
- register char *limit; /*->just after last char of buffer. */
+ char *limit; /*->just after last char of buffer. */
- if (sb_index >= 0)
+ if (sb_index != (size_t) -1)
{
if (sb_index >= from_sb.len)
{
sb_kill (&from_sb);
- cond_finish_check (macro_nest);
+ if (from_sb_is_expansion)
+ {
+ cond_finish_check (macro_nest);
+#ifdef md_macro_end
+ /* Allow the target to clean up per-macro expansion
+ data. */
+ md_macro_end ();
+#endif
+ }
--macro_nest;
partial_where = NULL;
+ partial_size = 0;
if (next_saved_file != NULL)
*bufp = input_scrub_pop (next_saved_file);
return partial_where;
return partial_where;
}
- *bufp = buffer_start + BEFORE_SIZE;
-
if (partial_size)
{
- memcpy (buffer_start + BEFORE_SIZE, partial_where,
- (unsigned int) partial_size);
+ memmove (buffer_start + BEFORE_SIZE, partial_where, partial_size);
memcpy (buffer_start + BEFORE_SIZE, save_source, AFTER_SIZE);
}
- limit = input_file_give_next_buffer (buffer_start
- + BEFORE_SIZE
- + partial_size);
- if (limit)
- {
- register char *p; /* Find last newline. */
- for (p = limit - 1; *p != '\n'; --p)
- ;
- ++p;
+ while (1)
+ {
+ char *p;
+ char *start = buffer_start + BEFORE_SIZE + partial_size;
- while (p <= buffer_start + BEFORE_SIZE)
+ *bufp = buffer_start + BEFORE_SIZE;
+ limit = input_file_give_next_buffer (start);
+ if (!limit)
{
- int limoff;
-
- limoff = limit - buffer_start;
- buffer_length += input_file_buffer_size ();
- buffer_start = xrealloc (buffer_start,
- (BEFORE_SIZE
- + 2 * buffer_length
- + AFTER_SIZE));
- *bufp = buffer_start + BEFORE_SIZE;
- limit = input_file_give_next_buffer (buffer_start + limoff);
-
- if (limit == NULL)
- {
- as_warn (_("partial line at end of file ignored"));
- partial_where = NULL;
- if (next_saved_file)
- *bufp = input_scrub_pop (next_saved_file);
- return NULL;
- }
+ if (!partial_size)
+ /* End of this file. */
+ break;
+
+ as_warn (_("end of file not at end of a line; newline inserted"));
+ p = buffer_start + BEFORE_SIZE + partial_size;
+ *p++ = '\n';
+ limit = p;
+ }
+ else
+ {
+ /* Terminate the buffer to avoid confusing TC_EOL_IN_INSN. */
+ *limit = '\0';
- for (p = limit - 1; *p != '\n'; --p)
- ;
+ /* Find last newline. */
+ for (p = limit - 1; *p != '\n' || TC_EOL_IN_INSN (p); --p)
+ if (p < start)
+ goto read_more;
++p;
}
+ /* We found a newline in the newly read chars. */
partial_where = p;
partial_size = limit - p;
+
+ /* Save the fragment after that last newline. */
memcpy (save_source, partial_where, (int) AFTER_SIZE);
memcpy (partial_where, AFTER_STRING, (int) AFTER_SIZE);
- }
- else
- {
- partial_where = 0;
- if (partial_size > 0)
- {
- as_warn (_("Partial line at end of file ignored"));
- }
-
- /* Tell the listing we've finished the file. */
- LISTING_EOF ();
+ return partial_where;
- /* If we should pop to another file at EOF, do it. */
- if (next_saved_file)
+ read_more:
+ /* Didn't find a newline. Read more text. */
+ partial_size = limit - (buffer_start + BEFORE_SIZE);
+ if (buffer_length - input_file_buffer_size () < partial_size)
{
- *bufp = input_scrub_pop (next_saved_file); /* Pop state */
- /* partial_where is now correct to return, since we popped it. */
+ /* Increase the buffer when it doesn't have room for the
+ next block of input. */
+ buffer_length *= 2;
+ buffer_start = XRESIZEVEC (char, buffer_start,
+ (buffer_length
+ + BEFORE_SIZE + AFTER_SIZE + 1));
}
}
- return (partial_where);
-} /* input_scrub_next_buffer() */
-\f
-/*
- * The remaining part of this file deals with line numbers, error
- * messages and so on.
- */
+ /* Tell the listing we've finished the file. */
+ LISTING_EOF ();
+
+ /* If we should pop to another file at EOF, do it. */
+ partial_where = NULL;
+ if (next_saved_file)
+ *bufp = input_scrub_pop (next_saved_file);
+
+ return partial_where;
+}
+\f
+/* The remaining part of this file deals with line numbers, error
+ messages and so on. Return TRUE if we opened any file. */
int
-seen_at_least_1_file () /* TRUE if we opened any file. */
+seen_at_least_1_file (void)
{
return (physical_input_file != NULL);
}
void
-bump_line_counters ()
+bump_line_counters (void)
{
- if (sb_index < 0)
+ if (sb_index == (size_t) -1)
{
++physical_input_line;
if (logical_input_line >= 0)
}
}
\f
-/*
- * new_logical_line()
- *
- * Tells us what the new logical line number and file are.
- * If the line_number is -1, we don't change the current logical line
- * number. If it is -2, we decrement the logical line number (this is
- * to support the .appfile pseudo-op inserted into the stream by
- * do_scrub_chars).
- * If the fname is NULL, we don't change the current logical file name.
- * Returns nonzero if the filename actually changes.
- */
+/* Tells us what the new logical line number and file are.
+ If the line_number is -1, we don't change the current logical line
+ number. If it is -2, we decrement the logical line number (this is
+ to support the .appfile pseudo-op inserted into the stream by
+ do_scrub_chars).
+ If the fname is NULL, we don't change the current logical file name.
+ 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_flags (const char *fname, /* DON'T destroy it! We point to it! */
+ int line_number,
+ int flags)
{
+ switch (flags)
+ {
+ case 0:
+ break;
+ case 1:
+ if (line_number != -1)
+ abort ();
+ break;
+ case 1 << 1:
+ case 1 << 2:
+ /* FIXME: we could check that include nesting is correct. */
+ break;
+ default:
+ abort ();
+ }
+
if (line_number >= 0)
logical_input_line = line_number;
- else if (line_number == -2 && logical_input_line > 0)
- --logical_input_line;
+ else if (line_number == -1 && fname && !*fname && (flags & (1 << 2)))
+ {
+ logical_input_file = physical_input_file;
+ logical_input_line = physical_input_line;
+ fname = NULL;
+ }
if (fname
&& (logical_input_file == NULL
- || strcmp (logical_input_file, fname)))
+ || filename_cmp (logical_input_file, fname)))
{
logical_input_file = fname;
return 1;
}
else
return 0;
-} /* new_logical_line() */
+}
+
+int
+new_logical_line (const char *fname, int line_number)
+{
+ return new_logical_line_flags (fname, line_number, 0);
+}
+
\f
-/*
- * a s _ w h e r e ()
- *
- * Return the current file name and line number.
- * namep should be char * const *, but there are compilers which screw
- * up declarations like that, and it's easier to avoid it.
- */
-void
-as_where (namep, linep)
- char **namep;
- unsigned int *linep;
+/* Return the current physical input file name and line number, if known */
+
+const char *
+as_where_physical (unsigned int *linep)
{
- if (logical_input_file != NULL
- && (linep == NULL || logical_input_line >= 0))
+ if (physical_input_file != NULL)
{
- *namep = logical_input_file;
- if (linep != NULL)
- *linep = logical_input_line;
- }
- else if (physical_input_file != NULL)
- {
- *namep = physical_input_file;
if (linep != NULL)
*linep = physical_input_line;
+ return physical_input_file;
}
- else
- {
- *namep = 0;
- if (linep != NULL)
- *linep = 0;
- }
-} /* as_where() */
-\f
+ if (linep != NULL)
+ *linep = 0;
+ return NULL;
+}
+/* Return the current file name and line number. */
-/*
- * a s _ h o w m u c h ()
- *
- * 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. */
+const char *
+as_where (unsigned int *linep)
{
- register char *p; /* Scan input line. */
- /* register char c; JF unused */
-
- for (p = input_line_pointer - 1; *p != '\n'; --p)
- {
- }
- ++p; /* p->1st char of line. */
- for (; p <= input_line_pointer; p++)
+ if (logical_input_file != NULL
+ && (linep == NULL || logical_input_line >= 0))
{
- /* Assume ASCII. EBCDIC & other micro-computer char sets ignored. */
- as_1_char ((unsigned char) *p, stream);
+ if (linep != NULL)
+ *linep = logical_input_line;
+ return logical_input_file;
}
-}
-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);
+ return as_where_physical (linep);
}
-/* end of input_scrub.c */
projects / thirdparty / binutils-gdb.git / blobdiff