2008-01-08 H.J. Lu <hongjiu.lu@intel.com>

	* i386-gen.c (lineno): New.
	(filename): Likewise.
	(set_bitfield): Report filename and line numer on error.
	(process_i386_opcodes): Set filename and update lineno.
	(process_i386_registers): Likewise.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d2b661c3ef9a9f0569ed0885486021186bcc9274..8db2966c0f8557a91320e2e6a0ca4ea6b99d0d0c 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * i386-gen.c (lineno): New.
+       (filename): Likewise.
+       (set_bitfield): Report filename and line numer on error.
+       (process_i386_opcodes): Set filename and update lineno.
+       (process_i386_registers): Likewise.
+
 2008-01-05  H.J. Lu  <hongjiu.lu@intel.com>
 
        * i386-gen.c (opcode_modifiers): Rename IntelMnemonic to

diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c
index f93ff07536a917184e96bd091e41ccd1bdd280ee..1db9660356385019c9083b3a6fd26faddd132edb 100644 (file)
--- a/opcodes/i386-gen.c
+++ b/opcodes/i386-gen.c
@@ -339,6 +339,9 @@ static bitfield operand_types[] =
 #endif
 };
 
+static int lineno;
+static const char *filename;
+
 static int
 compare (const void *x, const void *y)
 {
@@ -448,7 +451,8 @@ set_bitfield (const char *f, bitfield *array, unsigned int size)
        return;
       }
 
-  printf ("Unknown bitfield: %s\n", f);
+  printf ("%s: %d: Unknown bitfield: %s\n",
+         filename, lineno, f);
   abort ();
 }
 
@@ -601,7 +605,7 @@ process_i386_operand_type (FILE *table, char *op, int macro,
 static void
 process_i386_opcodes (FILE *table)
 {
-  FILE *fp = fopen ("i386-opc.tbl", "r");
+  FILE *fp;
   char buf[2048];
   unsigned int i;
   char *str, *p, *last;
@@ -609,6 +613,9 @@ process_i386_opcodes (FILE *table)
   char *opcode_length;
   char *cpu_flags, *opcode_modifier, *operand_types [MAX_OPERANDS];
 
+  filename = "i386-opc.tbl";
+  fp = fopen (filename, "r");
+
   if (fp == NULL)
     fail (_("can't find i386-opc.tbl for reading, errno = %s\n"),
          xstrerror (errno));
@@ -621,6 +628,8 @@ process_i386_opcodes (FILE *table)
       if (fgets (buf, sizeof (buf), fp) == NULL)
        break;
 
+      lineno++;
+
       p = remove_leading_whitespaces (buf);
 
       /* Skip comments.  */
@@ -776,11 +785,13 @@ process_i386_opcodes (FILE *table)
 static void
 process_i386_registers (FILE *table)
 {
-  FILE *fp = fopen ("i386-reg.tbl", "r");
+  FILE *fp;
   char buf[2048];
   char *str, *p, *last;
   char *reg_name, *reg_type, *reg_flags, *reg_num;
 
+  filename = "i386-reg.tbl";
+  fp = fopen (filename, "r");
   if (fp == NULL)
     fail (_("can't find i386-reg.tbl for reading, errno = %s\n"),
          xstrerror (errno));
@@ -793,6 +804,8 @@ process_i386_registers (FILE *table)
       if (fgets (buf, sizeof (buf), fp) == NULL)
        break;
 
+      lineno++;
+
       p = remove_leading_whitespaces (buf);
 
       /* Skip comments.  */