2000-11-06 Kazu Hirata <kazu@hxi.com>

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

diff --git a/gas/expr.c b/gas/expr.c
index 1e785b2f277e5ca917c0cdf880eeccb190d03c65..8313d95a17b740e4ac46f494bb4a252bb2b73b07 100644 (file)
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -48,8 +48,7 @@ extern const char EXP_CHARS[], FLT_CHARS[];
 /* We keep a mapping of expression symbols to file positions, so that
    we can provide better error messages.  */
 
-struct expr_symbol_line
-{
+struct expr_symbol_line {
   struct expr_symbol_line *next;
   symbolS *sym;
   char *file;
@@ -217,13 +216,13 @@ expr_build_dot ()
    and never write into the early words, thus they'll always be zero.
    I hate Dean's floating-point code.  Bleh.  */
 LITTLENUM_TYPE generic_bignum[SIZE_OF_LARGE_NUMBER + 6];
-FLONUM_TYPE generic_floating_point_number =
-{
-  &generic_bignum[6],          /* Low.  (JF: Was 0)  */
-  &generic_bignum[SIZE_OF_LARGE_NUMBER + 6 - 1], /* High.  JF: (added +6)  */
-  0,                           /* Leader.  */
-  0,                           /* Exponent.  */
-  0                            /* Sign.  */
+
+FLONUM_TYPE generic_floating_point_number = {
+  &generic_bignum[6],          /* low.  (JF: Was 0)  */
+  &generic_bignum[SIZE_OF_LARGE_NUMBER + 6 - 1], /* high.  JF: (added +6)  */
+  0,                           /* leader.  */
+  0,                           /* exponent.  */
+  0                            /* sign.  */
 };
 
 /* If nonzero, we've been asked to assemble nan, +inf or -inf.  */
@@ -632,12 +631,12 @@ integer_constant (radix, expressionP)
          number |= (-(number >> (TARGET_WORD_SIZE - 1))) << (TARGET_WORD_SIZE - 1);
 #endif
          expressionP->X_add_number = number;
-         input_line_pointer--; /* Rstore following character.  */
+         input_line_pointer--; /* Restore following character.  */
        }                       /* Really just a number.  */
     }
   else
     {
-      /* not a small number */
+      /* Not a small number.  */
       expressionP->X_op = O_big;
       expressionP->X_add_number = number;      /* Number of littlenums.  */
       input_line_pointer--;    /* -> char following number.  */
@@ -785,7 +784,7 @@ operand (expressionP)
   /* Digits, assume it is a bignum.  */
 
   SKIP_WHITESPACE ();          /* Leading whitespace is part of operand.  */
-  c = *input_line_pointer++;   /* input_line_pointer->past char in c.  */
+  c = *input_line_pointer++;   /* input_line_pointer -> past char in c.  */
 
   if (is_end_of_line[(unsigned char) c])
     goto eol;
@@ -859,7 +858,7 @@ operand (expressionP)
              input_line_pointer++;
              floating_constant (expressionP);
              expressionP->X_add_number =
-               -(isupper ((unsigned char) c) ? tolower (c) : c);
+               - (isupper ((unsigned char) c) ? tolower (c) : c);
            }
          else
            {
@@ -982,7 +981,7 @@ operand (expressionP)
          input_line_pointer++;
          floating_constant (expressionP);
          expressionP->X_add_number =
-           -(isupper ((unsigned char) c) ? tolower (c) : c);
+           - (isupper ((unsigned char) c) ? tolower (c) : c);
          break;
 
        case '$':
@@ -1069,7 +1068,7 @@ operand (expressionP)
            /* input_line_pointer -> char after operand.  */
            if (c == '-')
              {
-               expressionP->X_add_number = -expressionP->X_add_number;
+               expressionP->X_add_number = - expressionP->X_add_number;
                /* Notice: '-' may overflow: no warning is given.
                   This is compatible with other people's
                   assemblers.  Sigh.  */
@@ -1304,7 +1303,7 @@ operand (expressionP)
        {
          /* Let the target try to parse it.  Success is indicated by changing
             the X_op field to something other than O_absent and pointing
-            input_line_pointer passed the expression.  If it can't parse the
+            input_line_pointer past the expression.  If it can't parse the
             expression, X_op and input_line_pointer should be unchanged.  */
          expressionP->X_op = O_absent;
          --input_line_pointer;
@@ -1418,9 +1417,8 @@ clean_up_expression (expressionP)
 #undef __
 #define __ O_illegal
 
-static const operatorT op_encoding[256] =
-{                              /* Maps ASCII -> operators.  */
-
+/* Maps ASCII -> operators.  */
+static const operatorT op_encoding[256] = {
   __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __,
   __, __, __, __, __, __, __, __, __, __, __, __, __, __, __, __,
 
@@ -1464,8 +1462,7 @@ static const operatorT op_encoding[256] =
    7   * / % << >>
    8   unary - unary ~
 */
-static operator_rankT op_rank[] =
-{
+static operator_rankT op_rank[] = {
   0,   /* O_illegal */
   0,   /* O_absent */
   0,   /* O_constant */
@@ -1817,27 +1814,27 @@ expr (rankarg, resultP)
            case O_subtract:            resultP->X_add_number -= v; break;
            case O_eq:
              resultP->X_add_number =
-               resultP->X_add_number == v ? ~(offsetT) 0 : 0;
+               resultP->X_add_number == v ? ~ (offsetT) 0 : 0;
              break;
            case O_ne:
              resultP->X_add_number =
-               resultP->X_add_number != v ? ~(offsetT) 0 : 0;
+               resultP->X_add_number != v ? ~ (offsetT) 0 : 0;
              break;
            case O_lt:
              resultP->X_add_number =
-               resultP->X_add_number < v ? ~(offsetT) 0 : 0;
+               resultP->X_add_number <  v ? ~ (offsetT) 0 : 0;
              break;
            case O_le:
              resultP->X_add_number =
-               resultP->X_add_number <= v ? ~(offsetT) 0 : 0;
+               resultP->X_add_number <= v ? ~ (offsetT) 0 : 0;
              break;
            case O_ge:
              resultP->X_add_number =
-               resultP->X_add_number >= v ? ~(offsetT) 0 : 0;
+               resultP->X_add_number >= v ? ~ (offsetT) 0 : 0;
              break;
            case O_gt:
              resultP->X_add_number =
-               resultP->X_add_number > v ? ~(offsetT) 0 : 0;
+               resultP->X_add_number >  v ? ~ (offsetT) 0 : 0;
              break;
            case O_logical_and:
              resultP->X_add_number = resultP->X_add_number && v;