From 2d011dc1696f38580ca08cdccf9cb8147527063a Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 26 Aug 2015 22:55:41 +0930 Subject: [PATCH] Fallout from "Allow symbol and label names to be enclosed in double quotes" PR gas/18581 * config/tc-mn10200.c (md_assemble ): Move restore_line_pointer call to where input line used to be restored. * config/tc-mn10300.c (md_assemble ): Remove redundant input line restore. * config/tc-tilepro.c (parse_reg_expression): Add regname var. --- gas/ChangeLog | 9 +++++++++ gas/config/tc-mn10200.c | 3 ++- gas/config/tc-mn10300.c | 4 +--- gas/config/tc-tilepro.c | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index c595d51..6730a58 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,12 @@ +2015-08-26 Alan Modra + + PR gas/18581 + * config/tc-mn10200.c (md_assemble ): Move restore_line_pointer + call to where input line used to be restored. + * config/tc-mn10300.c (md_assemble ): Remove redundant input + line restore. + * config/tc-tilepro.c (parse_reg_expression): Add regname var. + 2015-08-26 Nick Clifton PR gas/18842 diff --git a/gas/config/tc-mn10200.c b/gas/config/tc-mn10200.c index 4d4f482..cabbcc1 100644 --- a/gas/config/tc-mn10200.c +++ b/gas/config/tc-mn10200.c @@ -995,13 +995,14 @@ md_assemble (char *str) char *start; char c = get_symbol_name (&start); - (void) restore_line_pointer (c); if (strcmp (start, "mdr") != 0) { + (void) restore_line_pointer (c); input_line_pointer = hold; str = hold; goto error; } + (void) restore_line_pointer (c); goto keep_going; } else if (data_register_name (&ex)) diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c index 0d13622..da05cac 100644 --- a/gas/config/tc-mn10300.c +++ b/gas/config/tc-mn10300.c @@ -1417,14 +1417,12 @@ md_assemble (char *str) if (strcasecmp (start, "usp") != 0) { - (void) restore_line_pointer (c); - *input_line_pointer = c; + (void) restore_line_pointer (c); input_line_pointer = hold; str = hold; goto error; } (void) restore_line_pointer (c); - *input_line_pointer = c; goto keep_going; } else if (operand->flags & MN10300_OPERAND_SSP) diff --git a/gas/config/tc-tilepro.c b/gas/config/tc-tilepro.c index e7c7c64..a979473 100644 --- a/gas/config/tc-tilepro.c +++ b/gas/config/tc-tilepro.c @@ -980,6 +980,7 @@ parse_reg_expression (expressionS* expression) /* Zero everything to make sure we don't miss any flags. */ memset (expression, 0, sizeof *expression); + char *regname; char terminating_char = get_symbol_name (®name); void* pval = hash_find (main_reg_hash, regname); -- 2.7.4