Use temp_ilp and restore_ilp in more places

* as.c (macro_expr): Use temp_ilp and restore_ilp.
	* macro.c (buffer_and_nest): Likewise.
	* read.c (temp_ilp): Remove FIXME.
This commit is contained in:
Alan Modra 2019-03-18 22:34:36 +10:30
parent c6cdff46c9
commit af60449c26
4 changed files with 8 additions and 11 deletions

View File

@ -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>

View File

@ -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);

View File

@ -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;
}
}

View File

@ -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)