X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fitbl-ops.h;h=bcd68fe8ba96923d0369918b34351b75095983a1;hb=a015f5eccc7cdc779954195e0d65261bf71d2773;hp=340d713295bf801912bb73f13b8c6102c685ed15;hpb=72797ffaa06649143685e4e650af15950dd2f451;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/itbl-ops.h b/gas/itbl-ops.h
index 340d713295..bcd68fe8ba 100644
--- a/gas/itbl-ops.h
+++ b/gas/itbl-ops.h
@@ -1,5 +1,5 @@
 /* itbl-ops.h
-   Copyright (C) 1997  Free Software Foundation, Inc.
+   Copyright 1997, 1999, 2000 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -21,7 +21,13 @@
 /* External functions, constants and defines for itbl support */
 
 #include "ansidecl.h"
-#include "targ-cpu.h"
+
+/* Include file notes: "expr.h" needed before targ-*.h,
+ * "targ-env.h" includes the chain of target dependant headers,
+ * "targ-cpu.h" has the HAVE_ITBL_CPU define, and
+ * as.h includes them all */
+#include "as.h"
+
 #ifdef HAVE_ITBL_CPU
 #include "itbl-cpu.h"
 #endif
@@ -75,7 +81,7 @@ typedef enum
     e_invproc			/* invalid processor */
   } e_processor;
 
-/* 0 means an instruction table was not specified. */
+/* 0 means an instruction table was not specified.  */
 extern int itbl_have_entries;
 
 /* These routines are visible to the main part of the assembler */
@@ -86,14 +92,14 @@ char *itbl_get_field PARAMS ((char **s));
 unsigned long itbl_assemble PARAMS ((char *name, char *operands));
 int itbl_disassemble PARAMS ((char *str, unsigned long insn));
 int itbl_parse PARAMS ((char *tbl));	/* parses insn tbl */
-unsigned long itbl_get_reg_val PARAMS ((char *name));
-unsigned long itbl_get_val PARAMS ((e_processor processor, e_type type,
-				    char *name));
+int itbl_get_reg_val PARAMS ((char *name, unsigned long *pval));
+int itbl_get_val PARAMS ((e_processor processor, e_type type, char *name,
+			  unsigned long *pval));
 char *itbl_get_name PARAMS ((e_processor processor, e_type type,
 			     unsigned long val));
 
 /* These routines are called by the table parser used to build the
-   dynamic list of new processor instructions and registers. */
+   dynamic list of new processor instructions and registers.  */
 
 struct itbl_entry *itbl_add_reg PARAMS ((int yyproc, int yytype,
 					 char *regname, int regnum));