2010-01-06 Quentin Neill <quentin.neill@amd.com>

[deliverable/binutils-gdb.git] / gas / testsuite / gas / all / itbl-test.c

diff --git a/gas/testsuite/gas/all/itbl-test.c b/gas/testsuite/gas/all/itbl-test.c
index 8b8e8963e49d40ef8c5f5958f8f75676ff488716..38fcfc58f1def01d9cbb0b5af6c9b3154d30ef0d 100644 (file)
--- a/gas/testsuite/gas/all/itbl-test.c
+++ b/gas/testsuite/gas/all/itbl-test.c
@@ -1,14 +1,12 @@
-
-
 /* itbl-test.c
 
-   Copyright (C) 1997  Free Software Foundation, Inc.
+   Copyright (C) 1997, 2005, 2007  Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GAS is distributed in the hope that it will be useful, 
@@ -18,8 +16,8 @@
 
    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, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 /* Stand-alone test for instruction specification table support.
    Run using "itbl-test <itbl> <asm.s>"
@@ -79,7 +77,7 @@ main (int argc, char **argv)
       if (!*p)
        continue;
 
-      name = itbl_get_insn_name (&p);
+      name = itbl_get_field (&p);
       insn = itbl_assemble (name, p);
       if (insn == 0)
        printf ("line %d: Invalid instruction (%s)\n", aline, s);
@@ -109,7 +107,7 @@ test_reg (e_processor processor, e_type type, char *name,
   char *n;
   unsigned long v;
 
-  n = itbl_get_reg_name (processor, type, val);
+  n = itbl_get_name (processor, type, val);
   if (!n || strcmp (n, name))
     printf ("Error - reg name not found for proessor=%d, type=%d, val=%d\n",
            processor, type, val);
@@ -117,8 +115,9 @@ test_reg (e_processor processor, e_type type, char *name,
     printf ("name=%s found for processor=%d, type=%d, val=%d\n",
            n, processor, type, val);
 
-  v = itbl_get_reg_val (processor, type, name);
-  if (!v || v != val)
+  /* We require that names be unique amoung processors and types. */
+  if (! itbl_get_reg_val (name, &v)
+      || v != val)
     printf ("Error - reg val not found for processor=%d, type=%d, name=%s\n",
            processor, type, name);
   else