More build fixes in opcodes

[deliverable/binutils-gdb.git] / opcodes / openrisc-asm.c

diff --git a/opcodes/openrisc-asm.c b/opcodes/openrisc-asm.c
index de9b554719eb7cde50d798aa1a9274a3ddfd9efb..6d3c71a6fa8f051267b40c941c64252066a1e9ad 100644 (file)
--- a/opcodes/openrisc-asm.c
+++ b/opcodes/openrisc-asm.c
@@ -1,32 +1,33 @@
 /* Assembler interface for targets using CGEN. -*- C -*-
    CGEN: Cpu tools GENerator
 
 /* Assembler interface for targets using CGEN. -*- C -*-
    CGEN: Cpu tools GENerator
 

-THIS FILE IS MACHINE GENERATED WITH CGEN.
-- the resultant file is machine generated, cgen-asm.in isn't
+   THIS FILE IS MACHINE GENERATED WITH CGEN.
+   - the resultant file is machine generated, cgen-asm.in isn't

 
 

-Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2005, 2007, 2008
+   Free Software Foundation, Inc.

 
 

-This file is part of the GNU Binutils and GDB, the GNU debugger.
+   This file is part of libopcodes.

 
 

-This program 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)
-any later version.
+   This library 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 3, or (at your option)
+   any later version.

 
 

-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   It is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation, Inc.,
+   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */

 
 

-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */

 
 /* ??? Eventually more and more of this stuff can go to cpu-independent files.
    Keep that in mind.  */
 
 #include "sysdep.h"
 
 /* ??? Eventually more and more of this stuff can go to cpu-independent files.
    Keep that in mind.  */
 
 #include "sysdep.h"

-#include <ctype.h>

 #include <stdio.h>
 #include "ansidecl.h"
 #include "bfd.h"
 #include <stdio.h>
 #include "ansidecl.h"
 #include "bfd.h"


@@ -36,134 +37,131 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
 #include "opintl.h"
 #include "xregex.h"
 #include "libiberty.h"
 #include "opintl.h"
 #include "xregex.h"
 #include "libiberty.h"

+#include "safe-ctype.h"

 
 

-#undef min
+#undef  min

 #define min(a,b) ((a) < (b) ? (a) : (b))
 #define min(a,b) ((a) < (b) ? (a) : (b))

-#undef max
+#undef  max

 #define max(a,b) ((a) > (b) ? (a) : (b))
 
 static const char * parse_insn_normal
 #define max(a,b) ((a) > (b) ? (a) : (b))
 
 static const char * parse_insn_normal

-     PARAMS ((CGEN_CPU_DESC, const CGEN_INSN *, const char **, CGEN_FIELDS *));
+  (CGEN_CPU_DESC, const CGEN_INSN *, const char **, CGEN_FIELDS *);

 \f
 \f

-/* -- assembler routines inserted here */
+/* -- assembler routines inserted here.  */

 
 /* -- asm.c */
 
 
 /* -- asm.c */
 

-#define CGEN_VERBOSE_ASSEMBLER_ERRORS
+static const char * MISSING_CLOSING_PARENTHESIS = N_("missing `)'");

 
 

-static const char * parse_hi16
-  PARAMS ((CGEN_CPU_DESC, const char **, int, unsigned long *));
-static const char * parse_lo16
-  PARAMS ((CGEN_CPU_DESC, const char **, int, unsigned long *));
+#define CGEN_VERBOSE_ASSEMBLER_ERRORS

 
 long
 
 long

-openrisc_sign_extend_16bit (value)
-     long value;
+openrisc_sign_extend_16bit (long value)

 {
 {

-  return (long) (short) value;
+  return ((value & 0xffff) ^ 0x8000) - 0x8000;

 }
 
 /* Handle hi().  */
 
 static const char *
 }
 
 /* Handle hi().  */
 
 static const char *

-parse_hi16 (cd, strp, opindex, valuep)
-     CGEN_CPU_DESC cd;
-     const char **strp;
-     int opindex;
-     unsigned long *valuep;
+parse_hi16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)

 {
   const char *errmsg;
   enum cgen_parse_operand_result result_type;
 {
   const char *errmsg;
   enum cgen_parse_operand_result result_type;

-  bfd_vma value;
+  unsigned long ret;

 
   if (**strp == '#')
     ++*strp;
 
   if (strncasecmp (*strp, "hi(", 3) == 0)
     {
 
   if (**strp == '#')
     ++*strp;
 
   if (strncasecmp (*strp, "hi(", 3) == 0)
     {

-      *strp += 3;
+      bfd_vma value;

 
 

-#if 0
-      errmsg = cgen_parse_signed_integer (cd, strp, opindex, valuep);
-      if (errmsg != NULL)
-        fprintf (stderr, "parse_hi: %s\n", errmsg);
-      if (errmsg != NULL)
-#endif
-        errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_HI16,
-                                     &result_type, &value);
+      *strp += 3;
+      errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_HI16,
+                                  & result_type, & value);

       if (**strp != ')')
       if (**strp != ')')

-        return "missing `)'";
+        return MISSING_CLOSING_PARENTHESIS;
+

       ++*strp;
       if (errmsg == NULL
           && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
         value >>= 16;
       ++*strp;
       if (errmsg == NULL
           && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
         value >>= 16;

-      *valuep = (long) (short) value;
-
-      return errmsg;
+      ret = value;

     }
   else
     {
       if (**strp == '-')
     }
   else
     {
       if (**strp == '-')

-        errmsg = cgen_parse_signed_integer (cd, strp, opindex, (long *) &value);
+       {
+         long value;
+
+         errmsg = cgen_parse_signed_integer (cd, strp, opindex, &value);
+         ret = value;
+       }

       else
       else

-        errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, (unsigned long *) &value);
+       {
+         unsigned long value;
+
+         errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, &value);
+         ret = value;
+       }

     }
     }

-  *valuep = (long) (short) (value & 0xffff);
+
+  *valuep = ((ret & 0xffff) ^ 0x8000) - 0x8000;

   return errmsg;
 }
 
 /* Handle lo().  */
 
 static const char *
   return errmsg;
 }
 
 /* Handle lo().  */
 
 static const char *

-parse_lo16 (cd, strp, opindex, valuep)
-     CGEN_CPU_DESC cd;
-     const char **strp;
-     int opindex;
-     unsigned long *valuep;
+parse_lo16 (CGEN_CPU_DESC cd, const char ** strp, int opindex, long * valuep)

 {
   const char *errmsg;
   enum cgen_parse_operand_result result_type;
 {
   const char *errmsg;
   enum cgen_parse_operand_result result_type;

-  bfd_vma value;
+  unsigned long ret;

 
   if (**strp == '#')
     ++*strp;
 
   if (strncasecmp (*strp, "lo(", 3) == 0)
     {
 
   if (**strp == '#')
     ++*strp;
 
   if (strncasecmp (*strp, "lo(", 3) == 0)
     {

-      *strp += 3;
+      bfd_vma value;

 
 

-#if 0 
-      errmsg = cgen_parse_signed_integer (cd, strp, opindex, valuep);
-      if (errmsg != NULL)
-        fprintf (stderr, "parse_lo: %s\n", errmsg);
-
-      if (errmsg != NULL)
-#endif
-        errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_LO16,
-                                     &result_type, &value);
+      *strp += 3;
+      errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_LO16,
+                                  & result_type, & value);

       if (**strp != ')')
       if (**strp != ')')

-        return "missing `)'";
+        return MISSING_CLOSING_PARENTHESIS;
+

       ++*strp;
       ++*strp;

-      if (errmsg == NULL
-          && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
-        value &= 0xffff;
-      *valuep = (long) (short) value;
+      ret = value;
+    }
+  else
+    {
+      if (**strp == '-')
+       {
+         long value;
+
+         errmsg = cgen_parse_signed_integer (cd, strp, opindex, &value);
+         ret = value;
+       }
+      else
+       {
+         unsigned long value;

 
 

-      return errmsg;
+         errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, &value);
+         ret = value;
+       }

     }
 
     }
 

-  if (**strp == '-')
-    errmsg = cgen_parse_signed_integer (cd, strp, opindex, (long *) &value);
-  else
-    errmsg = cgen_parse_unsigned_integer (cd, strp, opindex, (unsigned long *) &value);
-  *valuep = (long) (short) (value & 0xffff);
+  *valuep = ((ret & 0xffff) ^ 0x8000) - 0x8000;

   return errmsg;
 }
 
 /* -- */
 
 const char * openrisc_cgen_parse_operand
   return errmsg;
 }
 
 /* -- */
 
 const char * openrisc_cgen_parse_operand

-  PARAMS ((CGEN_CPU_DESC, int, const char **, CGEN_FIELDS *));
+  (CGEN_CPU_DESC, int, const char **, CGEN_FIELDS *);

 
 /* Main entry point for operand parsing.
 
 
 /* Main entry point for operand parsing.
 


@@ -176,15 +174,13 @@ const char * openrisc_cgen_parse_operand
 
    This function could be moved into `parse_insn_normal', but keeping it
    separate makes clear the interface between `parse_insn_normal' and each of
 
    This function could be moved into `parse_insn_normal', but keeping it
    separate makes clear the interface between `parse_insn_normal' and each of

-   the handlers.
-*/
+   the handlers.  */

 
 const char *
 
 const char *

-openrisc_cgen_parse_operand (cd, opindex, strp, fields)
-     CGEN_CPU_DESC cd;
-     int opindex;
-     const char ** strp;
-     CGEN_FIELDS * fields;
+openrisc_cgen_parse_operand (CGEN_CPU_DESC cd,
+                          int opindex,
+                          const char ** strp,
+                          CGEN_FIELDS * fields)

 {
   const char * errmsg = NULL;
   /* Used by scalar operands that still need to be parsed.  */
 {
   const char * errmsg = NULL;
   /* Used by scalar operands that still need to be parsed.  */


@@ -194,29 +190,29 @@ openrisc_cgen_parse_operand (cd, opindex, strp, fields)
     {
     case OPENRISC_OPERAND_ABS_26 :
       {
     {
     case OPENRISC_OPERAND_ABS_26 :
       {

-        bfd_vma value;
+        bfd_vma value = 0;

         errmsg = cgen_parse_address (cd, strp, OPENRISC_OPERAND_ABS_26, 0, NULL,  & value);
         fields->f_abs26 = value;
       }
       break;
     case OPENRISC_OPERAND_DISP_26 :
       {
         errmsg = cgen_parse_address (cd, strp, OPENRISC_OPERAND_ABS_26, 0, NULL,  & value);
         fields->f_abs26 = value;
       }
       break;
     case OPENRISC_OPERAND_DISP_26 :
       {

-        bfd_vma value;
+        bfd_vma value = 0;

         errmsg = cgen_parse_address (cd, strp, OPENRISC_OPERAND_DISP_26, 0, NULL,  & value);
         fields->f_disp26 = value;
       }
       break;
     case OPENRISC_OPERAND_HI16 :
         errmsg = cgen_parse_address (cd, strp, OPENRISC_OPERAND_DISP_26, 0, NULL,  & value);
         fields->f_disp26 = value;
       }
       break;
     case OPENRISC_OPERAND_HI16 :

-      errmsg = parse_hi16 (cd, strp, OPENRISC_OPERAND_HI16, &fields->f_simm16);
+      errmsg = parse_hi16 (cd, strp, OPENRISC_OPERAND_HI16, (long *) (& fields->f_simm16));

       break;
     case OPENRISC_OPERAND_LO16 :
       break;
     case OPENRISC_OPERAND_LO16 :

-      errmsg = parse_lo16 (cd, strp, OPENRISC_OPERAND_LO16, &fields->f_lo16);
+      errmsg = parse_lo16 (cd, strp, OPENRISC_OPERAND_LO16, (long *) (& fields->f_lo16));

       break;
     case OPENRISC_OPERAND_OP_F_23 :
       break;
     case OPENRISC_OPERAND_OP_F_23 :

-      errmsg = cgen_parse_unsigned_integer (cd, strp, OPENRISC_OPERAND_OP_F_23, &fields->f_op4);
+      errmsg = cgen_parse_unsigned_integer (cd, strp, OPENRISC_OPERAND_OP_F_23, (unsigned long *) (& fields->f_op4));

       break;
     case OPENRISC_OPERAND_OP_F_3 :
       break;
     case OPENRISC_OPERAND_OP_F_3 :

-      errmsg = cgen_parse_unsigned_integer (cd, strp, OPENRISC_OPERAND_OP_F_3, &fields->f_op5);
+      errmsg = cgen_parse_unsigned_integer (cd, strp, OPENRISC_OPERAND_OP_F_3, (unsigned long *) (& fields->f_op5));

       break;
     case OPENRISC_OPERAND_RA :
       errmsg = cgen_parse_keyword (cd, strp, & openrisc_cgen_opval_h_gr, & fields->f_r2);
       break;
     case OPENRISC_OPERAND_RA :
       errmsg = cgen_parse_keyword (cd, strp, & openrisc_cgen_opval_h_gr, & fields->f_r2);


@@ -228,16 +224,16 @@ openrisc_cgen_parse_operand (cd, opindex, strp, fields)
       errmsg = cgen_parse_keyword (cd, strp, & openrisc_cgen_opval_h_gr, & fields->f_r1);
       break;
     case OPENRISC_OPERAND_SIMM_16 :
       errmsg = cgen_parse_keyword (cd, strp, & openrisc_cgen_opval_h_gr, & fields->f_r1);
       break;
     case OPENRISC_OPERAND_SIMM_16 :

-      errmsg = cgen_parse_signed_integer (cd, strp, OPENRISC_OPERAND_SIMM_16, &fields->f_simm16);
+      errmsg = cgen_parse_signed_integer (cd, strp, OPENRISC_OPERAND_SIMM_16, (long *) (& fields->f_simm16));

       break;
     case OPENRISC_OPERAND_UI16NC :
       break;
     case OPENRISC_OPERAND_UI16NC :

-      errmsg = parse_lo16 (cd, strp, OPENRISC_OPERAND_UI16NC, &fields->f_i16nc);
+      errmsg = parse_lo16 (cd, strp, OPENRISC_OPERAND_UI16NC, (long *) (& fields->f_i16nc));

       break;
     case OPENRISC_OPERAND_UIMM_16 :
       break;
     case OPENRISC_OPERAND_UIMM_16 :

-      errmsg = cgen_parse_unsigned_integer (cd, strp, OPENRISC_OPERAND_UIMM_16, &fields->f_uimm16);
+      errmsg = cgen_parse_unsigned_integer (cd, strp, OPENRISC_OPERAND_UIMM_16, (unsigned long *) (& fields->f_uimm16));

       break;
     case OPENRISC_OPERAND_UIMM_5 :
       break;
     case OPENRISC_OPERAND_UIMM_5 :

-      errmsg = cgen_parse_unsigned_integer (cd, strp, OPENRISC_OPERAND_UIMM_5, &fields->f_uimm5);
+      errmsg = cgen_parse_unsigned_integer (cd, strp, OPENRISC_OPERAND_UIMM_5, (unsigned long *) (& fields->f_uimm5));

       break;
 
     default :
       break;
 
     default :


@@ -255,36 +251,35 @@ cgen_parse_fn * const openrisc_cgen_parse_handlers[] =
 };
 
 void
 };
 
 void

-openrisc_cgen_init_asm (cd)
-     CGEN_CPU_DESC cd;
+openrisc_cgen_init_asm (CGEN_CPU_DESC cd)

 {
   openrisc_cgen_init_opcode_table (cd);
   openrisc_cgen_init_ibld_table (cd);
   cd->parse_handlers = & openrisc_cgen_parse_handlers[0];
   cd->parse_operand = openrisc_cgen_parse_operand;
 {
   openrisc_cgen_init_opcode_table (cd);
   openrisc_cgen_init_ibld_table (cd);
   cd->parse_handlers = & openrisc_cgen_parse_handlers[0];
   cd->parse_operand = openrisc_cgen_parse_operand;

+#ifdef CGEN_ASM_INIT_HOOK
+CGEN_ASM_INIT_HOOK
+#endif

 }
 
 \f
 
 }
 
 \f
 

-/*
-  Regex construction routine.
+/* Regex construction routine.

 
 

-  This translates an opcode syntax string into a regex string,
-  by replacing any non-character syntax element (such as an
-  opcode) with the pattern '.*'
+   This translates an opcode syntax string into a regex string,
+   by replacing any non-character syntax element (such as an
+   opcode) with the pattern '.*'

 
 

-  It then compiles the regex and stores it in the opcode, for
-  later use by openrisc_cgen_assemble_insn
+   It then compiles the regex and stores it in the opcode, for
+   later use by openrisc_cgen_assemble_insn

 
 

-  Returns NULL for success, an error message for failure. */
+   Returns NULL for success, an error message for failure.  */

 
 char * 
 
 char * 

-openrisc_cgen_build_insn_regex (insn)
-     CGEN_INSN *insn;
+openrisc_cgen_build_insn_regex (CGEN_INSN *insn)

 {  
   CGEN_OPCODE *opc = (CGEN_OPCODE *) CGEN_INSN_OPCODE (insn);
   const char *mnem = CGEN_INSN_MNEMONIC (insn);
 {  
   CGEN_OPCODE *opc = (CGEN_OPCODE *) CGEN_INSN_OPCODE (insn);
   const char *mnem = CGEN_INSN_MNEMONIC (insn);

-  int mnem_len;

   char rxbuf[CGEN_MAX_RX_ELEMENTS];
   char *rx = rxbuf;
   const CGEN_SYNTAX_CHAR_TYPE *syn;
   char rxbuf[CGEN_MAX_RX_ELEMENTS];
   char *rx = rxbuf;
   const CGEN_SYNTAX_CHAR_TYPE *syn;


@@ -292,72 +287,100 @@ openrisc_cgen_build_insn_regex (insn)
 
   syn = CGEN_SYNTAX_STRING (CGEN_OPCODE_SYNTAX (opc));
 
 
   syn = CGEN_SYNTAX_STRING (CGEN_OPCODE_SYNTAX (opc));
 

-  /* Mnemonics come first in the syntax string  */
-  if (! CGEN_SYNTAX_MNEMONIC_P (* syn)) return "missing mnemonic in syntax string";
+  /* Mnemonics come first in the syntax string.  */
+  if (! CGEN_SYNTAX_MNEMONIC_P (* syn))
+    return _("missing mnemonic in syntax string");

   ++syn;
 
   ++syn;
 

-  /* copy the literal mnemonic out of the insn */
-  memset (rx, 0, CGEN_MAX_RX_ELEMENTS);
-  mnem_len = strlen(mnem);
-  memcpy (rx, mnem, mnem_len);
-  rx += mnem_len;
+  /* Generate a case sensitive regular expression that emulates case
+     insensitive matching in the "C" locale.  We cannot generate a case
+     insensitive regular expression because in Turkish locales, 'i' and 'I'
+     are not equal modulo case conversion.  */
+
+  /* Copy the literal mnemonic out of the insn.  */
+  for (; *mnem; mnem++)
+    {
+      char c = *mnem;
+
+      if (ISALPHA (c))
+       {
+         *rx++ = '[';
+         *rx++ = TOLOWER (c);
+         *rx++ = TOUPPER (c);
+         *rx++ = ']';
+       }
+      else
+       *rx++ = c;
+    }

 
 

-  /* copy any remaining literals from the syntax string into the rx */
-  for(; * syn != 0 && rx < rxbuf + (CGEN_MAX_RX_ELEMENTS - 9); ++syn, ++rx) 
+  /* Copy any remaining literals from the syntax string into the rx.  */
+  for(; * syn != 0 && rx <= rxbuf + (CGEN_MAX_RX_ELEMENTS - 7 - 4); ++syn)

     {
       if (CGEN_SYNTAX_CHAR_P (* syn)) 
        {
     {
       if (CGEN_SYNTAX_CHAR_P (* syn)) 
        {

-        char tmp = CGEN_SYNTAX_CHAR (* syn);
-        switch (tmp) 
-           {
-            /* escape any regex metacharacters in the syntax */
-          case '.': case '[': case '\\': 
-          case '*': case '^': case '$': 
+         char c = CGEN_SYNTAX_CHAR (* syn);
+
+         switch (c) 
+           {
+             /* Escape any regex metacharacters in the syntax.  */
+           case '.': case '[': case '\\': 
+           case '*': case '^': case '$': 

 
 #ifdef CGEN_ESCAPE_EXTENDED_REGEX
 
 #ifdef CGEN_ESCAPE_EXTENDED_REGEX

-          case '?': case '{': case '}': 
-          case '(': case ')': case '*':
-          case '|': case '+': case ']':
+           case '?': case '{': case '}': 
+           case '(': case ')': case '*':
+           case '|': case '+': case ']':

 #endif
 #endif

-
-            * rx++ = '\\';
-            break;  
-          }
-        /* insert syntax char into rx */
-       * rx = tmp;
+             *rx++ = '\\';
+             *rx++ = c;
+             break;
+
+           default:
+             if (ISALPHA (c))
+               {
+                 *rx++ = '[';
+                 *rx++ = TOLOWER (c);
+                 *rx++ = TOUPPER (c);
+                 *rx++ = ']';
+               }
+             else
+               *rx++ = c;
+             break;
+           }

        }
       else
        {
        }
       else
        {

-         /* replace non-syntax fields with globs */
-         * rx = '.';
-         * ++rx = '*';
+         /* Replace non-syntax fields with globs.  */
+         *rx++ = '.';
+         *rx++ = '*';

        }
     }
 
        }
     }
 

-  /* trailing whitespace ok */
+  /* Trailing whitespace ok.  */

   * rx++ = '['; 
   * rx++ = ' '; 
   * rx++ = '\t'; 
   * rx++ = ']'; 
   * rx++ = '*'; 
 
   * rx++ = '['; 
   * rx++ = ' '; 
   * rx++ = '\t'; 
   * rx++ = ']'; 
   * rx++ = '*'; 
 

-  /* but anchor it after that */
+  /* But anchor it after that.  */

   * rx++ = '$'; 
   * rx = '\0';
 
   CGEN_INSN_RX (insn) = xmalloc (sizeof (regex_t));
   * rx++ = '$'; 
   * rx = '\0';
 
   CGEN_INSN_RX (insn) = xmalloc (sizeof (regex_t));

-  reg_err = regcomp ((regex_t *) CGEN_INSN_RX (insn), rxbuf, REG_NOSUB|REG_ICASE);
+  reg_err = regcomp ((regex_t *) CGEN_INSN_RX (insn), rxbuf, REG_NOSUB);

 
   if (reg_err == 0) 
     return NULL;
   else
     {
       static char msg[80];
 
   if (reg_err == 0) 
     return NULL;
   else
     {
       static char msg[80];

+

       regerror (reg_err, (regex_t *) CGEN_INSN_RX (insn), msg, 80);
       regfree ((regex_t *) CGEN_INSN_RX (insn));
       free (CGEN_INSN_RX (insn));
       (CGEN_INSN_RX (insn)) = NULL;
       regerror (reg_err, (regex_t *) CGEN_INSN_RX (insn), msg, 80);
       regfree ((regex_t *) CGEN_INSN_RX (insn));
       free (CGEN_INSN_RX (insn));
       (CGEN_INSN_RX (insn)) = NULL;

-    return msg;
+      return msg;

     }
 }
 
     }
 }
 


@@ -373,15 +396,13 @@ openrisc_cgen_build_insn_regex (insn)
    but that can be handled there.  Not handling backtracking here may get
    expensive in the case of the m68k.  Deal with later.
 
    but that can be handled there.  Not handling backtracking here may get
    expensive in the case of the m68k.  Deal with later.
 

-   Returns NULL for success, an error message for failure.
-*/
+   Returns NULL for success, an error message for failure.  */

 
 static const char *
 
 static const char *

-parse_insn_normal (cd, insn, strp, fields)
-     CGEN_CPU_DESC cd;
-     const CGEN_INSN *insn;
-     const char **strp;
-     CGEN_FIELDS *fields;
+parse_insn_normal (CGEN_CPU_DESC cd,
+                  const CGEN_INSN *insn,
+                  const char **strp,
+                  CGEN_FIELDS *fields)

 {
   /* ??? Runtime added insns not handled yet.  */
   const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);
 {
   /* ??? Runtime added insns not handled yet.  */
   const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);


@@ -399,14 +420,14 @@ parse_insn_normal (cd, insn, strp, fields)
      GAS's input scrubber will ensure mnemonics are lowercase, but we may
      not be called from GAS.  */
   p = CGEN_INSN_MNEMONIC (insn);
      GAS's input scrubber will ensure mnemonics are lowercase, but we may
      not be called from GAS.  */
   p = CGEN_INSN_MNEMONIC (insn);

-  while (*p && tolower (*p) == tolower (*str))
+  while (*p && TOLOWER (*p) == TOLOWER (*str))

     ++p, ++str;
 
   if (* p)
     return _("unrecognized instruction");
 
 #ifndef CGEN_MNEMONIC_OPERANDS
     ++p, ++str;
 
   if (* p)
     return _("unrecognized instruction");
 
 #ifndef CGEN_MNEMONIC_OPERANDS

-  if (* str && !isspace (* str))
+  if (* str && ! ISSPACE (* str))

     return _("unrecognized instruction");
 #endif
 
     return _("unrecognized instruction");
 #endif
 


@@ -435,7 +456,7 @@ parse_insn_normal (cd, insn, strp, fields)
             first char after the mnemonic part is a space.  */
          /* FIXME: We also take inappropriate advantage of the fact that
             GAS's input scrubber will remove extraneous blanks.  */
             first char after the mnemonic part is a space.  */
          /* FIXME: We also take inappropriate advantage of the fact that
             GAS's input scrubber will remove extraneous blanks.  */

-         if (tolower (*str) == tolower (CGEN_SYNTAX_CHAR (* syn)))
+         if (TOLOWER (*str) == TOLOWER (CGEN_SYNTAX_CHAR (* syn)))

            {
 #ifdef CGEN_MNEMONIC_OPERANDS
              if (CGEN_SYNTAX_CHAR(* syn) == ' ')
            {
 #ifdef CGEN_MNEMONIC_OPERANDS
              if (CGEN_SYNTAX_CHAR(* syn) == ' ')


@@ -448,6 +469,7 @@ parse_insn_normal (cd, insn, strp, fields)
            {
              /* Syntax char didn't match.  Can't be this insn.  */
              static char msg [80];
            {
              /* Syntax char didn't match.  Can't be this insn.  */
              static char msg [80];

+

              /* xgettext:c-format */
              sprintf (msg, _("syntax error (expected char `%c', found `%c')"),
                       CGEN_SYNTAX_CHAR(*syn), *str);
              /* xgettext:c-format */
              sprintf (msg, _("syntax error (expected char `%c', found `%c')"),
                       CGEN_SYNTAX_CHAR(*syn), *str);


@@ -457,6 +479,7 @@ parse_insn_normal (cd, insn, strp, fields)
            {
              /* Ran out of input.  */
              static char msg [80];
            {
              /* Ran out of input.  */
              static char msg [80];

+

              /* xgettext:c-format */
              sprintf (msg, _("syntax error (expected char `%c', found end of instruction)"),
                       CGEN_SYNTAX_CHAR(*syn));
              /* xgettext:c-format */
              sprintf (msg, _("syntax error (expected char `%c', found end of instruction)"),
                       CGEN_SYNTAX_CHAR(*syn));


@@ -466,7 +489,7 @@ parse_insn_normal (cd, insn, strp, fields)
        }
 
       /* We have an operand of some sort.  */
        }
 
       /* We have an operand of some sort.  */

-      errmsg = openrisc_cgen_parse_operand (cd, CGEN_SYNTAX_FIELD (*syn),
+      errmsg = cd->parse_operand (cd, CGEN_SYNTAX_FIELD (*syn),

                                          &str, fields);
       if (errmsg)
        return errmsg;
                                          &str, fields);
       if (errmsg)
        return errmsg;


@@ -482,7 +505,7 @@ parse_insn_normal (cd, insn, strp, fields)
         blanks now.  IE: We needn't try again with a longer version of
         the insn and it is assumed that longer versions of insns appear
         before shorter ones (eg: lsr r2,r3,1 vs lsr r2,r3).  */
         blanks now.  IE: We needn't try again with a longer version of
         the insn and it is assumed that longer versions of insns appear
         before shorter ones (eg: lsr r2,r3,1 vs lsr r2,r3).  */

-      while (isspace (* str))
+      while (ISSPACE (* str))

        ++ str;
 
       if (* str != '\0')
        ++ str;
 
       if (* str != '\0')


@@ -517,12 +540,11 @@ parse_insn_normal (cd, insn, strp, fields)
    mind helps keep the design clean.  */
 
 const CGEN_INSN *
    mind helps keep the design clean.  */
 
 const CGEN_INSN *

-openrisc_cgen_assemble_insn (cd, str, fields, buf, errmsg)
-     CGEN_CPU_DESC cd;
-     const char *str;
-     CGEN_FIELDS *fields;
-     CGEN_INSN_BYTES_PTR buf;
-     char **errmsg;
+openrisc_cgen_assemble_insn (CGEN_CPU_DESC cd,
+                          const char *str,
+                          CGEN_FIELDS *fields,
+                          CGEN_INSN_BYTES_PTR buf,
+                          char **errmsg)

 {
   const char *start;
   CGEN_INSN_LIST *ilist;
 {
   const char *start;
   CGEN_INSN_LIST *ilist;


@@ -531,7 +553,7 @@ openrisc_cgen_assemble_insn (cd, str, fields, buf, errmsg)
   int recognized_mnemonic = 0;
 
   /* Skip leading white space.  */
   int recognized_mnemonic = 0;
 
   /* Skip leading white space.  */

-  while (isspace (* str))
+  while (ISSPACE (* str))

     ++ str;
 
   /* The instructions are stored in hashed lists.
     ++ str;
 
   /* The instructions are stored in hashed lists.


@@ -539,7 +561,6 @@ openrisc_cgen_assemble_insn (cd, str, fields, buf, errmsg)
   ilist = CGEN_ASM_LOOKUP_INSN (cd, str);
 
   /* Keep looking until we find a match.  */
   ilist = CGEN_ASM_LOOKUP_INSN (cd, str);
 
   /* Keep looking until we find a match.  */

-

   start = str;
   for ( ; ilist != NULL ; ilist = CGEN_ASM_NEXT_INSN (ilist))
     {
   start = str;
   for ( ; ilist != NULL ; ilist = CGEN_ASM_NEXT_INSN (ilist))
     {


@@ -547,21 +568,21 @@ openrisc_cgen_assemble_insn (cd, str, fields, buf, errmsg)
       recognized_mnemonic = 1;
 
 #ifdef CGEN_VALIDATE_INSN_SUPPORTED 
       recognized_mnemonic = 1;
 
 #ifdef CGEN_VALIDATE_INSN_SUPPORTED 

-      /* not usually needed as unsupported opcodes shouldn't be in the hash lists */
+      /* Not usually needed as unsupported opcodes
+        shouldn't be in the hash lists.  */

       /* Is this insn supported by the selected cpu?  */
       if (! openrisc_cgen_insn_supported (cd, insn))
        continue;
 #endif
       /* Is this insn supported by the selected cpu?  */
       if (! openrisc_cgen_insn_supported (cd, insn))
        continue;
 #endif

-
-      /* If the RELAX attribute is set, this is an insn that shouldn't be
+      /* If the RELAXED attribute is set, this is an insn that shouldn't be

         chosen immediately.  Instead, it is used during assembler/linker
         relaxation if possible.  */
         chosen immediately.  Instead, it is used during assembler/linker
         relaxation if possible.  */

-      if (CGEN_INSN_ATTR_VALUE (insn, CGEN_INSN_RELAX) != 0)
+      if (CGEN_INSN_ATTR_VALUE (insn, CGEN_INSN_RELAXED) != 0)

        continue;
 
       str = start;
 
        continue;
 
       str = start;
 

-      /* skip this insn if str doesn't look right lexically */
+      /* Skip this insn if str doesn't look right lexically.  */

       if (CGEN_INSN_RX (insn) != NULL &&
          regexec ((regex_t *) CGEN_INSN_RX (insn), str, 0, NULL, 0) == REG_NOMATCH)
        continue;
       if (CGEN_INSN_RX (insn) != NULL &&
          regexec ((regex_t *) CGEN_INSN_RX (insn), str, 0, NULL, 0) == REG_NOMATCH)
        continue;


@@ -573,7 +594,7 @@ openrisc_cgen_assemble_insn (cd, str, fields, buf, errmsg)
       if (parse_errmsg != NULL)
        continue;
 
       if (parse_errmsg != NULL)
        continue;
 

-      /* ??? 0 is passed for `pc' */
+      /* ??? 0 is passed for `pc'.  */

       insert_errmsg = CGEN_INSERT_FN (cd, insn) (cd, insn, fields, buf,
                                                 (bfd_vma) 0);
       if (insert_errmsg != NULL)
       insert_errmsg = CGEN_INSERT_FN (cd, insn) (cd, insn, fields, buf,
                                                 (bfd_vma) 0);
       if (insert_errmsg != NULL)


@@ -590,10 +611,11 @@ openrisc_cgen_assemble_insn (cd, str, fields, buf, errmsg)
     const char *tmp_errmsg;
 
     /* If requesting verbose error messages, use insert_errmsg.
     const char *tmp_errmsg;
 
     /* If requesting verbose error messages, use insert_errmsg.

-       Failing that, use parse_errmsg */
+       Failing that, use parse_errmsg.  */

     tmp_errmsg = (insert_errmsg ? insert_errmsg :
                  parse_errmsg ? parse_errmsg :
     tmp_errmsg = (insert_errmsg ? insert_errmsg :
                  parse_errmsg ? parse_errmsg :

-                 recognized_mnemonic ? _("unrecognized form of instruction") :
+                 recognized_mnemonic ?
+                 _("unrecognized form of instruction") :

                  _("unrecognized instruction"));
 
     if (strlen (start) > 50)
                  _("unrecognized instruction"));
 
     if (strlen (start) > 50)


@@ -615,32 +637,3 @@ openrisc_cgen_assemble_insn (cd, str, fields, buf, errmsg)
     return NULL;
   }
 }
     return NULL;
   }
 }

-\f
-#if 0 /* This calls back to GAS which we can't do without care.  */
-
-/* Record each member of OPVALS in the assembler's symbol table.
-   This lets GAS parse registers for us.
-   ??? Interesting idea but not currently used.  */
-
-/* Record each member of OPVALS in the assembler's symbol table.
-   FIXME: Not currently used.  */
-
-void
-openrisc_cgen_asm_hash_keywords (cd, opvals)
-     CGEN_CPU_DESC cd;
-     CGEN_KEYWORD *opvals;
-{
-  CGEN_KEYWORD_SEARCH search = cgen_keyword_search_init (opvals, NULL);
-  const CGEN_KEYWORD_ENTRY * ke;
-
-  while ((ke = cgen_keyword_search_next (& search)) != NULL)
-    {
-#if 0 /* Unnecessary, should be done in the search routine.  */
-      if (! openrisc_cgen_opval_supported (ke))
-       continue;
-#endif
-      cgen_asm_record_register (cd, ke->name, ke->value);
-    }
-}
-
-#endif /* 0 */