This set of patches add support for aout emulation on the x86

[deliverable/binutils-gdb.git] / gas / expr.c

diff --git a/gas/expr.c b/gas/expr.c
index 9cfec2e655f2f4d400fe93a098c7ac4fa8eed7c4..ced12395bb916b0af04a45099bb772cced7d8c61 100644 (file)
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -389,7 +389,7 @@ integer_constant (radix, expressionP)
       break;
     case 10:
       maxdig = radix = 10;
-      too_many_digits = (valuesize + 12) / 4; /* very rough */
+      too_many_digits = (valuesize + 11) / 4; /* very rough */
     }
 #undef valuesize
   start = input_line_pointer;
@@ -989,7 +989,9 @@ operand (expressionP)
       break;
 
     case '(':
+#ifndef NEED_INDEX_OPERATOR
     case '[':
+#endif
       /* didn't begin with digit & not a name */
       segment = expression (expressionP);
       /* Expression() will pass trailing whitespace */
@@ -1415,7 +1417,13 @@ static const operatorT op_encoding[256] =
   __, __, __, __, __, __, __, __,
   __, __, __, __, __, __, __, __,
   __, __, __, __, __, __, __, __,
-  __, __, __, __, __, __, O_bit_exclusive_or, __,
+  __, __, __,
+#ifdef NEED_INDEX_OPERATOR
+  O_index,
+#else
+  __,
+#endif
+  __, __, O_bit_exclusive_or, __,
   __, __, __, __, __, __, __, __,
   __, __, __, __, __, __, __, __,
   __, __, __, __, __, __, __, __,
@@ -1453,28 +1461,45 @@ static operator_rankT op_rank[] =
   0,   /* O_symbol_rva */
   0,   /* O_register */
   0,   /* O_bit */
-  8,   /* O_uminus */
-  8,   /* O_bit_not */
-  8,   /* O_logical_not */
-  7,   /* O_multiply */
-  7,   /* O_divide */
-  7,   /* O_modulus */
-  7,   /* O_left_shift */
-  7,   /* O_right_shift */
-  6,   /* O_bit_inclusive_or */
-  6,   /* O_bit_or_not */
-  6,   /* O_bit_exclusive_or */
-  6,   /* O_bit_and */
-  4,   /* O_add */
-  4,   /* O_subtract */
-  3,   /* O_eq */
-  3,   /* O_ne */
-  3,   /* O_lt */
-  3,   /* O_le */
-  3,   /* O_ge */
-  3,   /* O_gt */
-  2,   /* O_logical_and */
-  1    /* O_logical_or */
+  9,   /* O_uminus */
+  9,   /* O_bit_not */
+  9,   /* O_logical_not */
+  8,   /* O_multiply */
+  8,   /* O_divide */
+  8,   /* O_modulus */
+  8,   /* O_left_shift */
+  8,   /* O_right_shift */
+  7,   /* O_bit_inclusive_or */
+  7,   /* O_bit_or_not */
+  7,   /* O_bit_exclusive_or */
+  7,   /* O_bit_and */
+  5,   /* O_add */
+  5,   /* O_subtract */
+  4,   /* O_eq */
+  4,   /* O_ne */
+  4,   /* O_lt */
+  4,   /* O_le */
+  4,   /* O_ge */
+  4,   /* O_gt */
+  3,   /* O_logical_and */
+  2,   /* O_logical_or */
+  1,   /* O_index */
+  0,   /* O_md1 */
+  0,   /* O_md2 */
+  0,   /* O_md3 */
+  0,   /* O_md4 */
+  0,   /* O_md5 */
+  0,   /* O_md6 */
+  0,   /* O_md7 */
+  0,   /* O_md8 */
+  0,   /* O_md9 */
+  0,   /* O_md10 */
+  0,   /* O_md11 */
+  0,   /* O_md12 */
+  0,   /* O_md13 */
+  0,   /* O_md14 */
+  0,   /* O_md15 */
+  0,   /* O_md16 */
 };
 
 /* Unfortunately, in MRI mode for the m68k, multiplication and
@@ -1607,10 +1632,11 @@ operator ()
 /* Parse an expression.  */
 
 segT
-expr (rank, resultP)
-     operator_rankT rank;      /* Larger # is higher rank. */
+expr (rankarg, resultP)
+     int rankarg;      /* Larger # is higher rank. */
      expressionS *resultP;     /* Deliver result here. */
 {
+  operator_rankT rank = (operator_rankT) rankarg;
   segT retval;
   expressionS right;
   operatorT op_left;
@@ -1641,6 +1667,17 @@ expr (rank, resultP)
 
       know (*input_line_pointer != ' ');
 
+      if (op_left == O_index)
+       {
+         if (*input_line_pointer != ']')
+           as_bad ("missing right bracket");
+         else
+           {
+             ++input_line_pointer;
+             SKIP_WHITESPACE ();
+           }
+       }
+
       if (retval == undefined_section)
        {
          if (SEG_NORMAL (rightseg))
@@ -1843,9 +1880,13 @@ get_symbol_end ()
   /* We accept \001 in a name in case this is being called with a
      constructed string.  */
   if (is_name_beginner (c = *input_line_pointer++) || c == '\001')
-    while (is_part_of_name (c = *input_line_pointer++)
-          || c == '\001')
-      ;
+    {
+      while (is_part_of_name (c = *input_line_pointer++)
+            || c == '\001')
+       ;
+      if (is_name_ender (c))
+       c = *input_line_pointer++;
+    }
   *--input_line_pointer = 0;
   return (c);
 }