diff options
| -rw-r--r-- | gas/ChangeLog | 3 | ||||
| -rw-r--r-- | gas/as.c | 6 | ||||
| -rw-r--r-- | gas/macro.c | 5 | ||||
| -rw-r--r-- | gas/read.c | 5 |
4 files changed, 8 insertions, 11 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index dbfde1e..bbd4a9c 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,6 +1,9 @@ 2019-03-18 Alan Modra <amodra@gmail.com> * config/m68k-parse.y (yylex): Use temp_ilp and restore_ilp. + * as.c (macro_expr): Likewise. + * macro.c (buffer_and_nest): Likewise. + * read.c (temp_ilp): Remove FIXME. 2019-03-18 H.J. Lu <hongjiu.lu@intel.com> @@ -1102,16 +1102,14 @@ close_output_file (void) static size_t macro_expr (const char *emsg, size_t idx, sb *in, offsetT *val) { - char *hold; expressionS ex; sb_terminate (in); - hold = input_line_pointer; - input_line_pointer = in->ptr + idx; + temp_ilp (in->ptr + idx); expression_and_evaluate (&ex); idx = input_line_pointer - in->ptr; - input_line_pointer = hold; + restore_ilp (); if (ex.X_op != O_constant) as_bad ("%s", emsg); diff --git a/gas/macro.c b/gas/macro.c index 5f41c13..b79d922 100644 --- a/gas/macro.c +++ b/gas/macro.c @@ -223,14 +223,13 @@ buffer_and_nest (const char *from, const char *to, sb *ptr, anyway, there's not an obviously better fix here. */ if (strncasecmp (ptr->ptr + i, "linefile", 8) == 0) { - char *saved_input_line_pointer = input_line_pointer; char saved_eol_char = ptr->ptr[ptr->len]; ptr->ptr[ptr->len] = '\0'; - input_line_pointer = ptr->ptr + i + 8; + temp_ilp (ptr->ptr + i + 8); s_app_line (0); + restore_ilp (); ptr->ptr[ptr->len] = saved_eol_char; - input_line_pointer = saved_input_line_pointer; ptr->len = line_start; } } @@ -6213,10 +6213,7 @@ static char *saved_limit; overruns should not occur. Saves the current input line pointer so that it can be restored by calling restore_ilp(). - Does not support recursion. - - FIXME: This function is currently only used by stabs.c but that - should be extended to other files in the gas source directory. */ + Does not support recursion. */ void temp_ilp (char *buf) |