projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove IEEE 695 object support
[deliverable/binutils-gdb.git]
/
gas
/
app.c
diff --git
a/gas/app.c
b/gas/app.c
index e5a768716e97f3b2ab7d591a5756e3eb9814b050..64541c40d7917fac6f67af0d7a58b44f40981d55 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, 2009, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 1987-2018 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
This file is part of GAS, the GNU Assembler.
@@
-57,6
+55,9
@@
static const char mri_pseudo[] = ".mri 0";
static const char symver_pseudo[] = ".symver";
static const char * symver_state;
#endif
static const char symver_pseudo[] = ".symver";
static const char * symver_state;
#endif
+#ifdef TC_ARM
+static char last_char;
+#endif
static char lex[256];
static const char symbol_chars[] =
static char lex[256];
static const char symbol_chars[] =
@@
-160,7
+161,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
+214,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
+232,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
@@
-241,14
+245,17
@@
struct app_save
#if defined TC_ARM && defined OBJ_ELF
const char * symver_state;
#endif
#if defined TC_ARM && defined OBJ_ELF
const char * symver_state;
#endif
+#ifdef TC_ARM
+ char last_char;
+#endif
};
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
+265,7
@@
app_push (void)
saved->saved_input = NULL;
else
{
saved->saved_input = NULL;
else
{
- saved->saved_input =
(char *) 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;
}
@@
-270,6
+277,9
@@
app_push (void)
#if defined TC_ARM && defined OBJ_ELF
saved->symver_state = symver_state;
#endif
#if defined TC_ARM && defined OBJ_ELF
saved->symver_state = symver_state;
#endif
+#ifdef TC_ARM
+ saved->last_char = last_char;
+#endif
/* do_scrub_begin() is not useful, just wastes time. */
/* do_scrub_begin() is not useful, just wastes time. */
@@
-283,7
+293,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;
@@
-295,7
+305,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;
@@
-309,6
+319,9
@@
app_pop (char *arg)
#if defined TC_ARM && defined OBJ_ELF
symver_state = saved->symver_state;
#endif
#if defined TC_ARM && defined OBJ_ELF
symver_state = saved->symver_state;
#endif
+#ifdef TC_ARM
+ last_char = saved->last_char;
+#endif
free (arg);
}
free (arg);
}
@@
-351,15
+364,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;
@@
-548,7
+561,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++)
{
@@
-684,7
+697,7
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
case 16:
/* We have seen an 'a' at the start of a symbol, look for an 'f'. */
ch = GET ();
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);
@@
-694,6
+707,7
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
state = 9;
break;
}
state = 9;
break;
}
+ /* Fall through. */
case 17:
/* We have seen "af" at the start of a symbol,
a ' here is a part of that symbol. */
case 17:
/* We have seen "af" at the start of a symbol,
a ' here is a part of that symbol. */
@@
-1039,7
+1053,6
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
PUT (ch);
break;
PUT (ch);
break;
-#ifndef IEEE_STYLE
case LEX_IS_ONECHAR_QUOTE:
#ifdef H_TICK_HEX
if (state == 9 && enable_h_tick_hex)
case LEX_IS_ONECHAR_QUOTE:
#ifdef H_TICK_HEX
if (state == 9 && enable_h_tick_hex)
@@
-1101,7
+1114,6
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
out_string = out_buf;
PUT (*out_string++);
break;
out_string = out_buf;
PUT (*out_string++);
break;
-#endif
case LEX_IS_COLON:
#ifdef KEEP_WHITE_AROUND_COLON
case LEX_IS_COLON:
#ifdef KEEP_WHITE_AROUND_COLON
@@
-1186,7
+1198,7
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
state = -2;
break;
}
state = -2;
break;
}
- else
+ else
if (ch2 != EOF)
{
UNGET (ch2);
}
{
UNGET (ch2);
}
@@
-1217,9
+1229,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. */
@@
-1276,14
+1295,14
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
#ifdef TC_ARM
/* For the ARM, care is needed not to damage occurrences of \@
by stripping the @ onwards. Yuck. */
#ifdef TC_ARM
/* For the ARM, care is needed not to damage occurrences of \@
by stripping the @ onwards. Yuck. */
- if (
to > tostart && *(to - 1
) == '\\')
+ if (
(to > tostart ? to[-1] : last_char
) == '\\')
/* Do not treat the @ as a start-of-comment. */
goto de_fault;
#endif
#ifdef WARN_COMMENTS
if (!found_comment)
/* Do not treat the @ as a start-of-comment. */
goto de_fault;
#endif
#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,8
+1332,8
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
else
UNGET (quot);
}
else
UNGET (quot);
}
- /* FALL THROUGH */
#endif
#endif
+ /* Fall through. */
case LEX_IS_SYMBOL_COMPONENT:
if (state == 10)
case LEX_IS_SYMBOL_COMPONENT:
if (state == 10)
@@
-1330,12
+1349,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);
@@
-1344,7
+1363,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);
@@
-1366,7
+1385,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++)
{
@@
-1456,6
+1475,10
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
fromeof:
/* We have reached the end of the input. */
fromeof:
/* We have reached the end of the input. */
+#ifdef TC_ARM
+ if (to > tostart)
+ last_char = to[-1];
+#endif
return to - tostart;
tofull:
return to - tostart;
tofull:
@@
-1469,5
+1492,9
@@
do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
else
saved_input = NULL;
else
saved_input = NULL;
+#ifdef TC_ARM
+ if (to > tostart)
+ last_char = to[-1];
+#endif
return to - tostart;
}
return to - tostart;
}
This page took
0.029968 seconds
and
4
git commands to generate.