Automatic date update in version.in

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

diff --git a/opcodes/m32r-asm.c b/opcodes/m32r-asm.c
index 4141e4f567f0a2bed1563e1e137932fbca00db5a..8dd8b25c4ab061400790772bfb8f12b697e9de5a 100644 (file)
--- a/opcodes/m32r-asm.c
+++ b/opcodes/m32r-asm.c
@@ -1,26 +1,28 @@
+/* DO NOT EDIT!  -*- buffer-read-only: t -*- vi:set ro:  */

 /* 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 (C) 1996-2019 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.  */
 
 /* ??? Eventually more and more of this stuff can go to cpu-independent files.
    Keep that in mind.  */


@@ -28,34 +30,35 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"
 #include "sysdep.h"
 #include <stdio.h>
 #include "ansidecl.h"

-#include "safe-ctype.h"

 #include "bfd.h"
 #include "symcat.h"
 #include "m32r-desc.h"
 #include "m32r-opc.h"
 #include "opintl.h"
 #include "xregex.h"
 #include "bfd.h"
 #include "symcat.h"
 #include "m32r-desc.h"
 #include "m32r-opc.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 */

+static const char * MISSING_CLOSING_PARENTHESIS = N_("missing `)'");

 
 /* Handle '#' prefixes (i.e. skip over them).  */
 
 static const char *
 
 /* Handle '#' prefixes (i.e. skip over them).  */
 
 static const char *

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

 {
   if (**strp == '#')
     ++*strp;
 {
   if (**strp == '#')
     ++*strp;


@@ -65,11 +68,10 @@ parse_hash (cd, strp, opindex, valuep)
 /* Handle shigh(), high().  */
 
 static const char *
 /* Handle shigh(), high().  */
 
 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,
+           unsigned long *valuep)

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


@@ -82,13 +84,16 @@ parse_hi16 (cd, strp, opindex, valuep)
     {
       *strp += 5;
       errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_M32R_HI16_ULO,
     {
       *strp += 5;
       errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_M32R_HI16_ULO,

-                                  &result_type, &value);
+                                  & result_type, & value);

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

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

       ++*strp;
       if (errmsg == NULL
       ++*strp;
       if (errmsg == NULL

-         && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
-       value >>= 16;
+         && result_type == CGEN_PARSE_OPERAND_RESULT_NUMBER)
+       {
+         value >>= 16;
+         value &= 0xffff;
+       }

       *valuep = value;
       return errmsg;
     }
       *valuep = value;
       return errmsg;
     }


@@ -96,13 +101,17 @@ parse_hi16 (cd, strp, opindex, valuep)
     {
       *strp += 6;
       errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_M32R_HI16_SLO,
     {
       *strp += 6;
       errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_M32R_HI16_SLO,

-                                  &result_type, &value);
+                                  & result_type, & value);

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

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

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

-       value = (value >> 16) + (value & 0x8000 ? 1 : 0);
+       {
+         value += 0x8000;
+         value >>= 16;
+         value &= 0xffff;
+       }

       *valuep = value;
       return errmsg;
     }
       *valuep = value;
       return errmsg;
     }


@@ -115,11 +124,10 @@ parse_hi16 (cd, strp, opindex, valuep)
    handles the case where low() isn't present.  */
 
 static const char *
    handles the case where low() isn't present.  */
 
 static const char *

-parse_slo16 (cd, strp, opindex, valuep)
-     CGEN_CPU_DESC cd;
-     const char **strp;
-     int opindex;
-     long *valuep;
+parse_slo16 (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;


@@ -132,13 +140,13 @@ parse_slo16 (cd, strp, opindex, valuep)
     {
       *strp += 4;
       errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_M32R_LO16,
     {
       *strp += 4;
       errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_M32R_LO16,

-                                  &result_type, &value);
+                                  & result_type, & value);

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

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

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

-       value &= 0xffff;
+       value = ((value & 0xffff) ^ 0x8000) - 0x8000;

       *valuep = value;
       return errmsg;
     }
       *valuep = value;
       return errmsg;
     }


@@ -147,9 +155,9 @@ parse_slo16 (cd, strp, opindex, valuep)
     {
       *strp += 4;
       errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_M32R_SDA16,
     {
       *strp += 4;
       errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_M32R_SDA16,

-                                  NULL, &value);
+                                  NULL, & value);

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

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

       ++*strp;
       *valuep = value;
       return errmsg;
       ++*strp;
       *valuep = value;
       return errmsg;


@@ -163,11 +171,10 @@ parse_slo16 (cd, strp, opindex, valuep)
    handles the case where low() isn't present.  */
 
 static const char *
    handles the case where low() isn't present.  */
 
 static const char *

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

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


@@ -180,9 +187,9 @@ parse_ulo16 (cd, strp, opindex, valuep)
     {
       *strp += 4;
       errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_M32R_LO16,
     {
       *strp += 4;
       errmsg = cgen_parse_address (cd, strp, opindex, BFD_RELOC_M32R_LO16,

-                                  &result_type, &value);
+                                  & result_type, & value);

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

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

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


@@ -196,6 +203,9 @@ parse_ulo16 (cd, strp, opindex, valuep)
 
 /* -- */
 
 
 /* -- */
 

+const char * m32r_cgen_parse_operand
+  (CGEN_CPU_DESC, int, const char **, CGEN_FIELDS *);
+

 /* Main entry point for operand parsing.
 
    This function is basically just a big switch statement.  Earlier versions
 /* Main entry point for operand parsing.
 
    This function is basically just a big switch statement.  Earlier versions


@@ -207,19 +217,17 @@ parse_ulo16 (cd, strp, opindex, valuep)
 
    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 *

-m32r_cgen_parse_operand (cd, opindex, strp, fields)
-     CGEN_CPU_DESC cd;
-     int opindex;
-     const char ** strp;
-     CGEN_FIELDS * fields;
+m32r_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.  */

-  long junk;
+  long junk ATTRIBUTE_UNUSED;

 
   switch (opindex)
     {
 
   switch (opindex)
     {


@@ -237,21 +245,21 @@ m32r_cgen_parse_operand (cd, opindex, strp, fields)
       break;
     case M32R_OPERAND_DISP16 :
       {
       break;
     case M32R_OPERAND_DISP16 :
       {

-        bfd_vma value;
+        bfd_vma value = 0;

         errmsg = cgen_parse_address (cd, strp, M32R_OPERAND_DISP16, 0, NULL,  & value);
         fields->f_disp16 = value;
       }
       break;
     case M32R_OPERAND_DISP24 :
       {
         errmsg = cgen_parse_address (cd, strp, M32R_OPERAND_DISP16, 0, NULL,  & value);
         fields->f_disp16 = value;
       }
       break;
     case M32R_OPERAND_DISP24 :
       {

-        bfd_vma value;
+        bfd_vma value = 0;

         errmsg = cgen_parse_address (cd, strp, M32R_OPERAND_DISP24, 0, NULL,  & value);
         fields->f_disp24 = value;
       }
       break;
     case M32R_OPERAND_DISP8 :
       {
         errmsg = cgen_parse_address (cd, strp, M32R_OPERAND_DISP24, 0, NULL,  & value);
         fields->f_disp24 = value;
       }
       break;
     case M32R_OPERAND_DISP8 :
       {

-        bfd_vma value;
+        bfd_vma value = 0;

         errmsg = cgen_parse_address (cd, strp, M32R_OPERAND_DISP8, 0, NULL,  & value);
         fields->f_disp8 = value;
       }
         errmsg = cgen_parse_address (cd, strp, M32R_OPERAND_DISP8, 0, NULL,  & value);
         fields->f_disp8 = value;
       }


@@ -260,25 +268,25 @@ m32r_cgen_parse_operand (cd, opindex, strp, fields)
       errmsg = cgen_parse_keyword (cd, strp, & m32r_cgen_opval_gr_names, & fields->f_r1);
       break;
     case M32R_OPERAND_HASH :
       errmsg = cgen_parse_keyword (cd, strp, & m32r_cgen_opval_gr_names, & fields->f_r1);
       break;
     case M32R_OPERAND_HASH :

-      errmsg = parse_hash (cd, strp, M32R_OPERAND_HASH, &junk);
+      errmsg = parse_hash (cd, strp, M32R_OPERAND_HASH, (long *) (& junk));

       break;
     case M32R_OPERAND_HI16 :
       break;
     case M32R_OPERAND_HI16 :

-      errmsg = parse_hi16 (cd, strp, M32R_OPERAND_HI16, &fields->f_hi16);
+      errmsg = parse_hi16 (cd, strp, M32R_OPERAND_HI16, (unsigned long *) (& fields->f_hi16));

       break;
     case M32R_OPERAND_IMM1 :
       break;
     case M32R_OPERAND_IMM1 :

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

       break;
     case M32R_OPERAND_SCR :
       errmsg = cgen_parse_keyword (cd, strp, & m32r_cgen_opval_cr_names, & fields->f_r2);
       break;
     case M32R_OPERAND_SIMM16 :
       break;
     case M32R_OPERAND_SCR :
       errmsg = cgen_parse_keyword (cd, strp, & m32r_cgen_opval_cr_names, & fields->f_r2);
       break;
     case M32R_OPERAND_SIMM16 :

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

       break;
     case M32R_OPERAND_SIMM8 :
       break;
     case M32R_OPERAND_SIMM8 :

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

       break;
     case M32R_OPERAND_SLO16 :
       break;
     case M32R_OPERAND_SLO16 :

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

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


@@ -290,71 +298,77 @@ m32r_cgen_parse_operand (cd, opindex, strp, fields)
       errmsg = cgen_parse_keyword (cd, strp, & m32r_cgen_opval_gr_names, & fields->f_r2);
       break;
     case M32R_OPERAND_UIMM16 :
       errmsg = cgen_parse_keyword (cd, strp, & m32r_cgen_opval_gr_names, & fields->f_r2);
       break;
     case M32R_OPERAND_UIMM16 :

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

       break;
     case M32R_OPERAND_UIMM24 :
       {
       break;
     case M32R_OPERAND_UIMM24 :
       {

-        bfd_vma value;
+        bfd_vma value = 0;

         errmsg = cgen_parse_address (cd, strp, M32R_OPERAND_UIMM24, 0, NULL,  & value);
         fields->f_uimm24 = value;
       }
       break;
         errmsg = cgen_parse_address (cd, strp, M32R_OPERAND_UIMM24, 0, NULL,  & value);
         fields->f_uimm24 = value;
       }
       break;

+    case M32R_OPERAND_UIMM3 :
+      errmsg = cgen_parse_unsigned_integer (cd, strp, M32R_OPERAND_UIMM3, (unsigned long *) (& fields->f_uimm3));
+      break;

     case M32R_OPERAND_UIMM4 :
     case M32R_OPERAND_UIMM4 :

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

       break;
     case M32R_OPERAND_UIMM5 :
       break;
     case M32R_OPERAND_UIMM5 :

-      errmsg = cgen_parse_unsigned_integer (cd, strp, M32R_OPERAND_UIMM5, &fields->f_uimm5);
+      errmsg = cgen_parse_unsigned_integer (cd, strp, M32R_OPERAND_UIMM5, (unsigned long *) (& fields->f_uimm5));
+      break;
+    case M32R_OPERAND_UIMM8 :
+      errmsg = cgen_parse_unsigned_integer (cd, strp, M32R_OPERAND_UIMM8, (unsigned long *) (& fields->f_uimm8));

       break;
     case M32R_OPERAND_ULO16 :
       break;
     case M32R_OPERAND_ULO16 :

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

       break;
 
     default :
       /* xgettext:c-format */
       break;
 
     default :
       /* xgettext:c-format */

-      fprintf (stderr, _("Unrecognized field %d while parsing.\n"), opindex);
+      opcodes_error_handler
+       (_("internal error: unrecognized field %d while parsing"),
+        opindex);

       abort ();
   }
 
   return errmsg;
 }
 
       abort ();
   }
 
   return errmsg;
 }
 

-cgen_parse_fn * const m32r_cgen_parse_handlers[] = 
+cgen_parse_fn * const m32r_cgen_parse_handlers[] =

 {
   parse_insn_normal,
 };
 
 void
 {
   parse_insn_normal,
 };
 
 void

-m32r_cgen_init_asm (cd)
-     CGEN_CPU_DESC cd;
+m32r_cgen_init_asm (CGEN_CPU_DESC cd)

 {
   m32r_cgen_init_opcode_table (cd);
   m32r_cgen_init_ibld_table (cd);
   cd->parse_handlers = & m32r_cgen_parse_handlers[0];
   cd->parse_operand = m32r_cgen_parse_operand;
 {
   m32r_cgen_init_opcode_table (cd);
   m32r_cgen_init_ibld_table (cd);
   cd->parse_handlers = & m32r_cgen_parse_handlers[0];
   cd->parse_operand = m32r_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 m32r_cgen_assemble_insn
+   It then compiles the regex and stores it in the opcode, for
+   later use by m32r_cgen_assemble_insn

 
 

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

 
 

-char * 
-m32r_cgen_build_insn_regex (insn)
-     CGEN_INSN *insn;
-{  
-  CGEN_OPCODE *opc = CGEN_INSN_OPCODE (insn);
+char *
+m32r_cgen_build_insn_regex (CGEN_INSN *insn)
+{
+  CGEN_OPCODE *opc = (CGEN_OPCODE *) CGEN_INSN_OPCODE (insn);

   const char *mnem = CGEN_INSN_MNEMONIC (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;


@@ -362,72 +376,100 @@ m32r_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 any remaining literals from the syntax string into the rx */
-  for(; * syn != 0 && rx < rxbuf + (CGEN_MAX_RX_ELEMENTS - 9); ++syn, ++rx) 
+  /* Copy the literal mnemonic out of the insn.  */
+  for (; *mnem; mnem++)

     {
     {

-      if (CGEN_SYNTAX_CHAR_P (* syn)) 
+      char c = *mnem;
+
+      if (ISALPHA (c))

        {
        {

-        char tmp = CGEN_SYNTAX_CHAR (* syn);
-        switch (tmp) 
-           {
-            /* escape any regex metacharacters in the syntax */
-          case '.': case '[': case '\\': 
-          case '*': case '^': case '$': 
+         *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 - 7 - 4); ++syn)
+    {
+      if (CGEN_SYNTAX_CHAR_P (* syn))
+       {
+         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 */
-  * rx++ = '['; 
-  * rx++ = ' '; 
-  * rx++ = '\t'; 
-  * rx++ = ']'; 
-  * rx++ = '*'; 
+  /* Trailing whitespace ok.  */
+  * rx++ = '[';
+  * rx++ = ' ';
+  * rx++ = '\t';
+  * rx++ = ']';
+  * rx++ = '*';

 
 

-  /* but anchor it after that */
-  * rx++ = '$'; 
+  /* But anchor it after that.  */
+  * rx++ = '$';

   * rx = '\0';
 
   CGEN_INSN_RX (insn) = xmalloc (sizeof (regex_t));
   * 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) 
+  if (reg_err == 0)

     return NULL;
   else
     {
       static char msg[80];
     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;

     }
 }
 
     }
 }
 


@@ -443,15 +485,13 @@ m32r_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);


@@ -476,7 +516,7 @@ parse_insn_normal (cd, insn, strp, fields)
     return _("unrecognized instruction");
 
 #ifndef CGEN_MNEMONIC_OPERANDS
     return _("unrecognized instruction");
 
 #ifndef CGEN_MNEMONIC_OPERANDS

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

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


@@ -518,6 +558,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);


@@ -527,6 +568,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));


@@ -535,9 +577,11 @@ parse_insn_normal (cd, insn, strp, fields)
          continue;
        }
 
          continue;
        }
 

+#ifdef CGEN_MNEMONIC_OPERANDS
+      (void) past_opcode_p;
+#endif

       /* We have an operand of some sort.  */
       /* We have an operand of some sort.  */

-      errmsg = m32r_cgen_parse_operand (cd, CGEN_SYNTAX_FIELD (*syn),
-                                         &str, fields);
+      errmsg = cd->parse_operand (cd, CGEN_SYNTAX_FIELD (*syn), &str, fields);

       if (errmsg)
        return errmsg;
 
       if (errmsg)
        return errmsg;
 


@@ -587,12 +631,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 *

-m32r_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;
+m32r_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;


@@ -609,29 +652,28 @@ m32r_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))
     {
       const CGEN_INSN *insn = ilist->insn;
       recognized_mnemonic = 1;
 
   start = str;
   for ( ; ilist != NULL ; ilist = CGEN_ASM_NEXT_INSN (ilist))
     {
       const CGEN_INSN *insn = ilist->insn;
       recognized_mnemonic = 1;
 

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

       /* Is this insn supported by the selected cpu?  */
       if (! m32r_cgen_insn_supported (cd, insn))
        continue;
 #endif
       /* Is this insn supported by the selected cpu?  */
       if (! m32r_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;


@@ -643,7 +685,7 @@ m32r_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)


@@ -656,61 +698,41 @@ m32r_cgen_assemble_insn (cd, str, fields, buf, errmsg)
 
   {
     static char errbuf[150];
 
   {
     static char errbuf[150];

-#ifdef CGEN_VERBOSE_ASSEMBLER_ERRORS

     const char *tmp_errmsg;
     const char *tmp_errmsg;

-
-    /* If requesting verbose error messages, use insert_errmsg.
-       Failing that, use parse_errmsg */
-    tmp_errmsg = (insert_errmsg ? insert_errmsg :
-                 parse_errmsg ? parse_errmsg :
-                 recognized_mnemonic ? _("unrecognized form of instruction") :
-                 _("unrecognized instruction"));
-
-    if (strlen (start) > 50)
-      /* xgettext:c-format */
-      sprintf (errbuf, "%s `%.50s...'", tmp_errmsg, start);
-    else 
-      /* xgettext:c-format */
-      sprintf (errbuf, "%s `%.50s'", tmp_errmsg, start);
+#ifdef CGEN_VERBOSE_ASSEMBLER_ERRORS
+#define be_verbose 1

 #else
 #else

-    if (strlen (start) > 50)
-      /* xgettext:c-format */
-      sprintf (errbuf, _("bad instruction `%.50s...'"), start);
-    else 
-      /* xgettext:c-format */
-      sprintf (errbuf, _("bad instruction `%.50s'"), start);
+#define be_verbose 0

 #endif
 #endif

-      
+
+    if (be_verbose)
+      {
+       /* If requesting verbose error messages, use insert_errmsg.
+          Failing that, use parse_errmsg.  */
+       tmp_errmsg = (insert_errmsg ? insert_errmsg :
+                     parse_errmsg ? parse_errmsg :
+                     recognized_mnemonic ?
+                     _("unrecognized form of instruction") :
+                     _("unrecognized instruction"));
+
+       if (strlen (start) > 50)
+         /* xgettext:c-format */
+         sprintf (errbuf, "%s `%.50s...'", tmp_errmsg, start);
+       else
+         /* xgettext:c-format */
+         sprintf (errbuf, "%s `%.50s'", tmp_errmsg, start);
+      }
+    else
+      {
+       if (strlen (start) > 50)
+         /* xgettext:c-format */
+         sprintf (errbuf, _("bad instruction `%.50s...'"), start);
+       else
+         /* xgettext:c-format */
+         sprintf (errbuf, _("bad instruction `%.50s'"), start);
+      }
+

     *errmsg = errbuf;
     return NULL;
   }
 }
     *errmsg = errbuf;
     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
-m32r_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 (! m32r_cgen_opval_supported (ke))
-       continue;
-#endif
-      cgen_asm_record_register (cd, ke->name, ke->value);
-    }
-}
-
-#endif /* 0 */