x86: permit parenthesized expressions again as addressing scale factor

The description of e68c3d59acd0 ("x86: better respect quotes in
parse_operands()") wrongly states:

"In i386_att_operand(), which needs adjustment to remain in sync, besides
 respecting double quotes now, also change the logic such that we don't
 count parentheses anymore: Finding any opening or closing parenthesis or
 any double quote means we're done, because the subsequent parsing code
 wouldn't accept (extra) instances of these anyway."

I didn't pay attention to the possibility of the scale factor being
specified as an expression, which may contain parentheses. Thanks to
Martin for pointing this out. Restore prior behavior or matching
parentheses (backwards), while giving the variable a more suitable name.
Note that this simple and immediate fix is not ging to be enough: This
expression could itself involve quoted symbols. However, to address this
backwards parsing needs to be done away with altogether here (such that
parentheses which are part of such a quoted symbol name can also
properly be accounted for), which is going to be a more intrusive
change.

1 files changed, 6 insertions, 2 deletions

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index b3f9f31..8585380 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -11566,15 +11566,19 @@ i386_att_operand (char *operand_string)
       if (*base_string == ')')
 	{
 	  char *temp_string;
+	  unsigned int parens_not_balanced = 1;
 
 	  /* We've already checked that the number of left & right ()'s are
 	     equal, so this loop will not be infinite.  */
 	  do
 	    {
 	      base_string--;
+	      if (*base_string == ')')
+		parens_not_balanced++;
+	      if (*base_string == '(')
+		parens_not_balanced--;
 	    }
-	  while (*base_string != '(' && *base_string != ')'
-		 && *base_string != '"');
+	  while (parens_not_balanced && *base_string != '"');
 
 	  temp_string = base_string;