X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Fexpr.h;h=32a16619b1d597fc0ec23fc70e423610cb866c5a;hb=9de8d8f1848f870605f4e94ffd9d2f1baa005c93;hp=c7b97da429464d426eea979c00b2bb49fd94cf31;hpb=fa803dc60f0bf01297674c41d001798e18ade4dc;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/expr.h b/gas/expr.h
index c7b97da429..32a16619b1 100644
--- a/gas/expr.h
+++ b/gas/expr.h
@@ -1,5 +1,5 @@
 /* expr.h -> header file for expr.c
-   Copyright (C) 1987, 1992, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1987, 92-98, 1999 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -14,8 +14,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GAS; see the file COPYING.  If not, write to
-   the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with GAS; see the file COPYING.  If not, write to the Free
+   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
 
 /*
  * By popular demand, we define a struct to represent an expression.
@@ -48,6 +49,8 @@ typedef enum
   O_constant,
   /* X_add_symbol + X_add_number.  */
   O_symbol,
+  /* X_add_symbol + X_add_number - the base address of the image.  */
+  O_symbol_rva,
   /* A register (X_add_number is register number).  */
   O_register,
   /* A big value.  If X_add_number is negative or 0, the value is in
@@ -59,6 +62,8 @@ typedef enum
   O_uminus,
   /* (~ X_add_symbol) + X_add_number.  */
   O_bit_not,
+  /* (! X_add_symbol) + X_add_number.  */
+  O_logical_not,
   /* (X_add_symbol * X_op_symbol) + X_add_number.  */
   O_multiply,
   /* (X_add_symbol / X_op_symbol) + X_add_number.  */
@@ -80,26 +85,45 @@ typedef enum
   /* X_add_symbol + X_op_symbol) + X_add_number.  */
   O_add,
   /* X_add_symbol - X_op_symbol) + X_add_number.  */
-  O_subtract
+  O_subtract,
+  /* (X_add_symbol == X_op_symbol) + X_add_number.  */
+  O_eq,
+  /* (X_add_symbol != X_op_symbol) + X_add_number.  */
+  O_ne,
+  /* (X_add_symbol < X_op_symbol) + X_add_number.  */
+  O_lt,
+  /* (X_add_symbol <= X_op_symbol) + X_add_number.  */
+  O_le,
+  /* (X_add_symbol >= X_op_symbol) + X_add_number.  */
+  O_ge,
+  /* (X_add_symbol > X_op_symbol) + X_add_number.  */
+  O_gt,
+  /* (X_add_symbol && X_op_symbol) + X_add_number.  */
+  O_logical_and,
+  /* (X_add_symbol || X_op_symbol) + X_add_number.  */
+  O_logical_or,
+  /* X_op_symbol [ X_add_symbol ] */
+  O_index,
+  /* this must be the largest value */
+  O_max
 } operatorT;
 
 typedef struct expressionS
 {
-  /* The type of the expression.  */
-  operatorT X_op;
   /* The main symbol.  */
-  struct symbol *X_add_symbol;
+  symbolS *X_add_symbol;
   /* The second symbol, if needed.  */
-  struct symbol *X_op_symbol;
+  symbolS *X_op_symbol;
   /* A number to add.  */
   offsetT X_add_number;
+  /* The type of the expression.  */
+  operatorT X_op;
   /* Non-zero if X_add_number should be regarded as unsigned.  This is
      only valid for O_constant expressions.  It is only used when an
      O_constant must be extended into a bignum (i.e., it is not used
      when performing arithmetic on these values).
-     FIXME: This field is not set very reliably.
-     If we ever need more flags here, we can make them bitfields.  */
-  int X_unsigned;
+     FIXME: This field is not set very reliably.  */
+  unsigned int X_unsigned : 1;
 } expressionS;
 
 /* "result" should be type (expressionS *). */
@@ -116,9 +140,18 @@ extern LITTLENUM_TYPE generic_bignum[];
 
 typedef char operator_rankT;
 
-char get_symbol_end PARAMS ((void));
-segT expr PARAMS ((int rank, expressionS * resultP));
-unsigned int get_single_number PARAMS ((void));
-symbolS *make_expr_symbol PARAMS ((expressionS * expressionP));
+extern char get_symbol_end PARAMS ((void));
+extern void expr_begin PARAMS ((void));
+extern void expr_set_precedence PARAMS ((void));
+extern segT expr PARAMS ((int rank, expressionS * resultP));
+extern unsigned int get_single_number PARAMS ((void));
+extern symbolS *make_expr_symbol PARAMS ((expressionS * expressionP));
+extern int expr_symbol_where
+  PARAMS ((symbolS *, char **, unsigned int *));
+
+extern symbolS *expr_build_uconstant PARAMS ((offsetT));
+extern symbolS *expr_build_unary PARAMS ((operatorT, symbolS *));
+extern symbolS *expr_build_binary PARAMS ((operatorT, symbolS *, symbolS *));
+extern symbolS *expr_build_dot PARAMS ((void));
 
 /* end of expr.h */