projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rx: make the type of a variable bfd_reloc_code_real_type
[deliverable/binutils-gdb.git]
/
gas
/
app.c
diff --git
a/gas/app.c
b/gas/app.c
index 86685194cd09249d612feec46273890cfdb4f5c0..38d8e78f211f9deefe28ccd3e3fbc14cc2a82c38 100644
(file)
--- a/
gas/app.c
+++ b/
gas/app.c
@@
-1,7
+1,5
@@
/* This is the Assembler Pre-Processor
/* This is the Assembler Pre-Processor
- Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2008
- Free Software Foundation, Inc.
+ Copyright (C) 1987-2016 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
This file is part of GAS, the GNU Assembler.
@@
-160,7
+158,10
@@
do_scrub_begin (int m68k_mri ATTRIBUTE_UNUSED)
for (p = line_comment_chars; *p; p++)
lex[(unsigned char) *p] = LEX_IS_LINE_COMMENT_START;
for (p = line_comment_chars; *p; p++)
lex[(unsigned char) *p] = LEX_IS_LINE_COMMENT_START;
- for (p = line_separator_chars; *p; p++)
+#ifndef tc_line_separator_chars
+#define tc_line_separator_chars line_separator_chars
+#endif
+ for (p = tc_line_separator_chars; *p; p++)
lex[(unsigned char) *p] = LEX_IS_LINE_SEPARATOR;
#ifdef tc_parallel_separator_chars
lex[(unsigned char) *p] = LEX_IS_LINE_SEPARATOR;
#ifdef tc_parallel_separator_chars
@@
-210,11
+211,11
@@
do_scrub_begin (int m68k_mri ATTRIBUTE_UNUSED)
/* Saved state of the scrubber. */
static int state;
static int old_state;
/* Saved state of the scrubber. */
static int state;
static int old_state;
-static char *out_string;
+static c
onst c
har *out_string;
static char out_buf[20];
static int add_newlines;
static char *saved_input;
static char out_buf[20];
static int add_newlines;
static char *saved_input;
-static
in
t saved_input_len;
+static
size_
t saved_input_len;
static char input_buffer[32 * 1024];
static const char *mri_state;
static char mri_last_ch;
static char input_buffer[32 * 1024];
static const char *mri_state;
static char mri_last_ch;
@@
-228,11
+229,11
@@
struct app_save
{
int state;
int old_state;
{
int state;
int old_state;
- c
har *
out_string;
+ c
onst char *
out_string;
char out_buf[sizeof (out_buf)];
int add_newlines;
char * saved_input;
char out_buf[sizeof (out_buf)];
int add_newlines;
char * saved_input;
-
int
saved_input_len;
+
size_t
saved_input_len;
#ifdef TC_M68K
int scrub_m68k_mri;
#endif
#ifdef TC_M68K
int scrub_m68k_mri;
#endif
@@
-246,9
+247,9
@@
struct app_save
char *
app_push (void)
{
char *
app_push (void)
{
-
register
struct app_save *saved;
+ struct app_save *saved;
- saved =
(struct app_save *) xmalloc (sizeof (*saved)
);
+ saved =
XNEW (struct app_save
);
saved->state = state;
saved->old_state = old_state;
saved->out_string = out_string;
saved->state = state;
saved->old_state = old_state;
saved->out_string = out_string;
@@
-258,7
+259,7
@@
app_push (void)
saved->saved_input = NULL;
else
{
saved->saved_input = NULL;
else
{
- saved->saved_input =
xmalloc (
saved_input_len);
+ saved->saved_input =
XNEWVEC (char,
saved_input_len);
memcpy (saved->saved_input, saved_input, saved_input_len);
saved->saved_input_len = saved_input_len;
}
memcpy (saved->saved_input, saved_input, saved_input_len);
saved->saved_input_len = saved_input_len;
}
@@
-275,6
+276,7
@@
app_push (void)
state = 0;
saved_input = NULL;
state = 0;
saved_input = NULL;
+ add_newlines = 0;
return (char *) saved;
}
return (char *) saved;
}
@@
-282,7
+284,7
@@
app_push (void)
void
app_pop (char *arg)
{
void
app_pop (char *arg)
{
-
register
struct app_save *saved = (struct app_save *) arg;
+ struct app_save *saved = (struct app_save *) arg;
/* There is no do_scrub_end (). */
state = saved->state;
/* There is no do_scrub_end (). */
state = saved->state;
@@
-294,7
+296,7
@@
app_pop (char *arg)
saved_input = NULL;
else
{
saved_input = NULL;
else
{
- gas_assert (saved->saved_input_len <=
(int) (sizeof
input_buffer));
+ gas_assert (saved->saved_input_len <=
sizeof (
input_buffer));
memcpy (input_buffer, saved->saved_input, saved->saved_input_len);
saved_input = input_buffer;
saved_input_len = saved->saved_input_len;
memcpy (input_buffer, saved->saved_input, saved->saved_input_len);
saved_input = input_buffer;
saved_input_len = saved->saved_input_len;
@@
-350,15
+352,15
@@
process_escape (int ch)
machine, and saves its state so that it may return at any point.
This is the way the old code used to work. */
machine, and saves its state so that it may return at any point.
This is the way the old code used to work. */
-
in
t
-do_scrub_chars (
int (*get) (char *, int), char *tostart, in
t tolen)
+
size_
t
+do_scrub_chars (
size_t (*get) (char *, size_t), char *tostart, size_
t tolen)
{
char *to = tostart;
char *toend = tostart + tolen;
char *from;
char *fromend;
{
char *to = tostart;
char *toend = tostart + tolen;
char *from;
char *fromend;
-
in
t fromlen;
-
register
int ch, ch2 = 0;
+
size_
t fromlen;
+ int ch, ch2 = 0;
/* Character that started the string we're working on. */
static char quotechar;
/* Character that started the string we're working on. */
static char quotechar;
@@
-384,11
+386,11
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
13: After seeing a vertical bar, looking for a second
vertical bar as a parallel expression separator.
#endif
13: After seeing a vertical bar, looking for a second
vertical bar as a parallel expression separator.
#endif
-#ifdef TC_
IA64
- 14: After seeing a
`(' at state 0, looking for a `)' as
- predicate.
- 15: After seeing a
`(' at state 1, looking for a `)' as
- predicate.
+#ifdef TC_
PREDICATE_START_CHAR
+ 14: After seeing a
predicate start character at state 0, looking
+
for a predicate end character as
predicate.
+ 15: After seeing a
predicate start character at state 1, looking
+
for a predicate end character as
predicate.
#endif
#ifdef TC_Z80
16: After seeing an 'a' or an 'A' at the start of a symbol
#endif
#ifdef TC_Z80
16: After seeing an 'a' or an 'A' at the start of a symbol
@@
-547,7
+549,7
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
GET and PUT macros. */
{
char *s;
GET and PUT macros. */
{
char *s;
-
in
t len;
+
ptrdiff_
t len;
for (s = from; s < fromend; s++)
{
for (s = from; s < fromend; s++)
{
@@
-667,13
+669,23
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
line from just after the first white space. */
state = 1;
PUT ('|');
line from just after the first white space. */
state = 1;
PUT ('|');
+#ifdef TC_TIC6X
+ /* "||^" is used for SPMASKed instructions. */
+ ch = GET ();
+ if (ch == EOF)
+ goto fromeof;
+ else if (ch == '^')
+ PUT ('^');
+ else
+ UNGET (ch);
+#endif
continue;
#endif
#ifdef TC_Z80
case 16:
/* We have seen an 'a' at the start of a symbol, look for an 'f'. */
ch = GET ();
continue;
#endif
#ifdef TC_Z80
case 16:
/* We have seen an 'a' at the start of a symbol, look for an 'f'. */
ch = GET ();
- if (ch == 'f' || ch == 'F')
+ if (ch == 'f' || ch == 'F')
{
state = 17;
PUT (ch);
{
state = 17;
PUT (ch);
@@
-702,8
+714,8
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
/* flushchar: */
ch = GET ();
/* flushchar: */
ch = GET ();
-#ifdef TC_
IA64
- if (ch ==
'('
&& (state == 0 || state == 1))
+#ifdef TC_
PREDICATE_START_CHAR
+ if (ch ==
TC_PREDICATE_START_CHAR
&& (state == 0 || state == 1))
{
state += 14;
PUT (ch);
{
state += 14;
PUT (ch);
@@
-711,7
+723,7
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
}
else if (state == 14 || state == 15)
{
}
else if (state == 14 || state == 15)
{
- if (ch ==
')'
)
+ if (ch ==
TC_PREDICATE_END_CHAR
)
{
state -= 14;
PUT (ch);
{
state -= 14;
PUT (ch);
@@
-905,7
+917,11
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
PUT (' ');
break;
case 3:
PUT (' ');
break;
case 3:
+#ifndef TC_KEEP_OPERAND_SPACES
+ /* For TI C6X, we keep these spaces as they may separate
+ functional unit specifiers from operands. */
if (scrub_m68k_mri)
if (scrub_m68k_mri)
+#endif
{
/* In MRI mode, we keep these spaces. */
UNGET (ch);
{
/* In MRI mode, we keep these spaces. */
UNGET (ch);
@@
-915,7
+931,9
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
goto recycle; /* Sp in operands */
case 9:
case 10:
goto recycle; /* Sp in operands */
case 9:
case 10:
+#ifndef TC_KEEP_OPERAND_SPACES
if (scrub_m68k_mri)
if (scrub_m68k_mri)
+#endif
{
/* In MRI mode, we keep these spaces. */
state = 3;
{
/* In MRI mode, we keep these spaces. */
state = 3;
@@
-1200,9
+1218,16
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
while (ch != EOF && !IS_NEWLINE (ch))
ch = GET ();
if (ch == EOF)
while (ch != EOF && !IS_NEWLINE (ch))
ch = GET ();
if (ch == EOF)
- as_warn (_("end of file in comment; newline inserted"));
+ {
+ as_warn (_("end of file in comment; newline inserted"));
+ PUT ('\n');
+ }
+ else /* IS_NEWLINE (ch) */
+ {
+ /* To process non-zero add_newlines. */
+ UNGET (ch);
+ }
state = 0;
state = 0;
- PUT ('\n');
break;
}
/* Looks like `# 123 "filename"' from cpp. */
break;
}
/* Looks like `# 123 "filename"' from cpp. */
@@
-1266,7
+1291,7
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
#ifdef WARN_COMMENTS
if (!found_comment)
#ifdef WARN_COMMENTS
if (!found_comment)
-
as_where (&found_comment_file,
&found_comment);
+
found_comment_file = as_where (
&found_comment);
#endif
do
{
#endif
do
{
@@
-1313,12
+1338,12
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
#ifdef TC_Z80
/* "af'" is a symbol containing '\''. */
#ifdef TC_Z80
/* "af'" is a symbol containing '\''. */
- if (state == 3 && (ch == 'a' || ch == 'A'))
+ if (state == 3 && (ch == 'a' || ch == 'A'))
{
state = 16;
PUT (ch);
ch = GET ();
{
state = 16;
PUT (ch);
ch = GET ();
- if (ch == 'f' || ch == 'F')
+ if (ch == 'f' || ch == 'F')
{
state = 17;
PUT (ch);
{
state = 17;
PUT (ch);
@@
-1327,7
+1352,7
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
else
{
state = 9;
else
{
state = 9;
- if (
!IS_SYMBOL_COMPONENT (ch))
+ if (
ch == EOF || !IS_SYMBOL_COMPONENT (ch))
{
if (ch != EOF)
UNGET (ch);
{
if (ch != EOF)
UNGET (ch);
@@
-1349,7
+1374,7
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
)
{
char *s;
)
{
char *s;
-
in
t len;
+
ptrdiff_
t len;
for (s = from; s < fromend; s++)
{
for (s = from; s < fromend; s++)
{
This page took
0.02888 seconds
and
4
git commands to generate.