projects
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Teach non-stop to do in-line step-overs (stop all, step, restart)
[binutils-gdb.git]
/
gas
/
input-scrub.c
diff --git
a/gas/input-scrub.c
b/gas/input-scrub.c
index c6169b3146ad1dd011b7febee8fb2aacf6521e10..c8e1e29c7ff7227f53b0748e9cfb13adb22adeb4 100644
(file)
--- a/
gas/input-scrub.c
+++ b/
gas/input-scrub.c
@@
-1,7
+1,5
@@
/* input_scrub.c - Break up input buffers into whole numbers of lines.
/* input_scrub.c - Break up input buffers into whole numbers of lines.
- Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 2000, 2001, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 1987-2015 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
This file is part of GAS, the GNU Assembler.
@@
-75,7
+73,7
@@
static char save_source[AFTER_SIZE];
static unsigned int buffer_length;
/* The index into an sb structure we are reading from. -1 if none. */
static unsigned int buffer_length;
/* The index into an sb structure we are reading from. -1 if none. */
-static
in
t sb_index = -1;
+static
size_
t sb_index = -1;
/* If we are reading from an sb structure, this is it. */
static sb from_sb;
/* If we are reading from an sb structure, this is it. */
static sb from_sb;
@@
-111,12
+109,12
@@
struct input_save {
char * partial_where;
int partial_size;
char save_source[AFTER_SIZE];
char * partial_where;
int partial_size;
char save_source[AFTER_SIZE];
-
unsigned int
buffer_length;
+
size_t
buffer_length;
char * physical_input_file;
char * logical_input_file;
unsigned int physical_input_line;
int logical_input_line;
char * physical_input_file;
char * logical_input_file;
unsigned int physical_input_line;
int logical_input_line;
-
int
sb_index;
+
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. */
sb from_sb;
int from_sb_is_expansion; /* Should we do a conditional check? */
struct input_save * next_saved_file; /* Chain of input_saves. */
@@
-139,7
+137,7
@@
static struct input_save *next_saved_file;
static struct input_save *
input_scrub_push (char *saved_position)
{
static struct input_save *
input_scrub_push (char *saved_position)
{
-
register
struct input_save *saved;
+ struct input_save *saved;
saved = (struct input_save *) xmalloc (sizeof *saved);
saved = (struct input_save *) xmalloc (sizeof *saved);
@@
-166,7
+164,7
@@
input_scrub_push (char *saved_position)
sb_index = -1;
buffer_start = (char *) xmalloc ((BEFORE_SIZE + buffer_length
sb_index = -1;
buffer_start = (char *) xmalloc ((BEFORE_SIZE + buffer_length
- + buffer_length + AFTER_SIZE));
+ + buffer_length + AFTER_SIZE
+ 1
));
memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
return saved;
memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
return saved;
@@
-211,7
+209,7
@@
input_scrub_begin (void)
buffer_length = input_file_buffer_size ();
buffer_start = (char *) xmalloc ((BEFORE_SIZE + buffer_length
buffer_length = input_file_buffer_size ();
buffer_start = (char *) xmalloc ((BEFORE_SIZE + buffer_length
- + buffer_length + AFTER_SIZE));
+ + buffer_length + AFTER_SIZE
+ 1
));
memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
/* Line number things. */
memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
/* Line number things. */
@@
-264,6
+262,8
@@
input_scrub_include_file (char *filename, char *position)
void
input_scrub_include_sb (sb *from, char *position, int is_expansion)
{
void
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;
if (macro_nest > max_macro_nest)
as_fatal (_("macros nested too deeply"));
++macro_nest;
@@
-277,9
+277,11
@@
input_scrub_include_sb (sb *from, char *position, int is_expansion)
next_saved_file = input_scrub_push (position);
next_saved_file = input_scrub_push (position);
- sb_new (&from_sb);
+ /* 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;
from_sb_is_expansion = is_expansion;
- if (
from->len >= 1 && from->ptr[0] != '\n'
)
+ if (
newline
)
{
/* Add the sentinel required by read.c. */
sb_add_char (&from_sb, '\n');
{
/* Add the sentinel required by read.c. */
sb_add_char (&from_sb, '\n');
@@
-288,8
+290,7
@@
input_scrub_include_sb (sb *from, char *position, int is_expansion)
/* Make sure the parser looks at defined contents when it scans for
e.g. end-of-line at the end of a macro. */
/* Make sure the parser looks at defined contents when it scans for
e.g. end-of-line at the end of a macro. */
- sb_add_char (&from_sb, 0);
- from_sb.len--;
+ sb_terminate (&from_sb);
sb_index = 1;
sb_index = 1;
@@
-310,15
+311,14
@@
input_scrub_close (void)
char *
input_scrub_next_buffer (char **bufp)
{
char *
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);
{
if (sb_index >= from_sb.len)
{
sb_kill (&from_sb);
- if (from_sb_is_expansion
- )
+ if (from_sb_is_expansion)
{
cond_finish_check (macro_nest);
#ifdef md_macro_end
{
cond_finish_check (macro_nest);
#ifdef md_macro_end
@@
-329,6
+329,7
@@
input_scrub_next_buffer (char **bufp)
}
--macro_nest;
partial_where = NULL;
}
--macro_nest;
partial_where = NULL;
+ partial_size = 0;
if (next_saved_file != NULL)
*bufp = input_scrub_pop (next_saved_file);
return partial_where;
if (next_saved_file != NULL)
*bufp = input_scrub_pop (next_saved_file);
return partial_where;
@@
-341,79
+342,68
@@
input_scrub_next_buffer (char **bufp)
return partial_where;
}
return partial_where;
}
- *bufp = buffer_start + BEFORE_SIZE;
-
if (partial_size)
{
memmove (buffer_start + BEFORE_SIZE, partial_where,
(unsigned int) partial_size);
memcpy (buffer_start + BEFORE_SIZE, save_source, AFTER_SIZE);
}
if (partial_size)
{
memmove (buffer_start + BEFORE_SIZE, partial_where,
(unsigned int) 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)
+
+ while (1)
{
{
- register char *p; /* Find last newline. */
- /* Terminate the buffer to avoid confusing TC_EOL_IN_INSN. */
- *limit = '\0';
- for (p = limit - 1; *p != '\n' || TC_EOL_IN_INSN (p); --p)
- ;
- ++p;
-
- while (p <= buffer_start + BEFORE_SIZE)
+ char *p;
+
+ *bufp = buffer_start + BEFORE_SIZE;
+ limit = input_file_give_next_buffer (buffer_start
+ + BEFORE_SIZE
+ + partial_size);
+ if (!limit)
{
{
- int limoff;
-
- limoff = limit - buffer_start;
- buffer_length += input_file_buffer_size ();
- buffer_start = (char *) 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 == 0)
+ 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';
/* Terminate the buffer to avoid confusing TC_EOL_IN_INSN. */
*limit = '\0';
+
+ /* Find last newline. */
for (p = limit - 1; *p != '\n' || TC_EOL_IN_INSN (p); --p)
;
++p;
}
for (p = limit - 1; *p != '\n' || TC_EOL_IN_INSN (p); --p)
;
++p;
}
- partial_where = p;
- partial_size = limit - p;
- memcpy (save_source, partial_where, (int) AFTER_SIZE);
- memcpy (partial_where, AFTER_STRING, (int) AFTER_SIZE);
- }
- else
- {
- partial_where = 0;
- if (partial_size > 0)
+ if (p != buffer_start + BEFORE_SIZE)
{
{
- as_warn (_("partial line at end of file ignored"));
+ partial_where = p;
+ partial_size = limit - p;
+ memcpy (save_source, partial_where, (int) AFTER_SIZE);
+ memcpy (partial_where, AFTER_STRING, (int) AFTER_SIZE);
+ return partial_where;
}
}
- /* Tell the listing we've finished the file. */
- LISTING_EOF ();
-
- /* If we should pop to another file at EOF, do it. */
- if (next_saved_file)
- {
- *bufp = input_scrub_pop (next_saved_file); /* Pop state */
- /* partial_where is now correct to return, since we popped it. */
- }
+ partial_size = limit - (buffer_start + BEFORE_SIZE);
+ buffer_length += input_file_buffer_size ();
+ buffer_start = (char *) xrealloc (buffer_start,
+ (BEFORE_SIZE
+ + 2 * buffer_length
+ + AFTER_SIZE + 1));
}
}
- return (partial_where);
+
+ /* 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
}
\f
/* The remaining part of this file deals with line numbers, error
@@
-428,7
+418,7
@@
seen_at_least_1_file (void)
void
bump_line_counters (void)
{
void
bump_line_counters (void)
{
- if (sb_index
< 0
)
+ if (sb_index
== (size_t) -1
)
{
++physical_input_line;
if (logical_input_line >= 0)
{
++physical_input_line;
if (logical_input_line >= 0)