Regenerate frv-dis.c in order to fix a compile time warning.

[deliverable/binutils-gdb.git] / opcodes / cgen-ibld.in

diff --git a/opcodes/cgen-ibld.in b/opcodes/cgen-ibld.in
index f5107a1fc7156d212099183ea3b1828b2fcd1603..316f183c41e49acb1f40a245346e38f99409c246 100644 (file)
--- a/opcodes/cgen-ibld.in
+++ b/opcodes/cgen-ibld.in
@@ -3,7 +3,7 @@
 THIS FILE IS MACHINE GENERATED WITH CGEN: Cpu tools GENerator.
 - the resultant file is machine generated, cgen-ibld.in isn't
 
 THIS FILE IS MACHINE GENERATED WITH CGEN: Cpu tools GENerator.
 - the resultant file is machine generated, cgen-ibld.in isn't
 

-Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+Copyright 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.

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


@@ -25,7 +25,6 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
    Keep that in mind.  */
 
 #include "sysdep.h"
    Keep that in mind.  */
 
 #include "sysdep.h"

-#include <ctype.h>

 #include <stdio.h>
 #include "ansidecl.h"
 #include "dis-asm.h"
 #include <stdio.h>
 #include "ansidecl.h"
 #include "dis-asm.h"


@@ -34,6 +33,7 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
 #include "@prefix@-desc.h"
 #include "@prefix@-opc.h"
 #include "opintl.h"
 #include "@prefix@-desc.h"
 #include "@prefix@-opc.h"
 #include "opintl.h"

+#include "safe-ctype.h"

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


@@ -44,22 +44,30 @@ along with this program; if not, write to the Free Software Foundation, Inc.,
 #define FLD(f) (fields->f)
 
 static const char * insert_normal
 #define FLD(f) (fields->f)
 
 static const char * insert_normal

-     PARAMS ((CGEN_CPU_DESC, long, unsigned int, unsigned int, unsigned int,
-             unsigned int, unsigned int, unsigned int, CGEN_INSN_BYTES_PTR));
+  (CGEN_CPU_DESC, long, unsigned int, unsigned int, unsigned int,
+   unsigned int, unsigned int, unsigned int, CGEN_INSN_BYTES_PTR);

 static const char * insert_insn_normal
 static const char * insert_insn_normal

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

 static int extract_normal
 static int extract_normal

-     PARAMS ((CGEN_CPU_DESC, CGEN_EXTRACT_INFO *, CGEN_INSN_INT,
-             unsigned int, unsigned int, unsigned int, unsigned int,
-             unsigned int, unsigned int, bfd_vma, long *));
+  (CGEN_CPU_DESC, CGEN_EXTRACT_INFO *, CGEN_INSN_INT,
+   unsigned int, unsigned int, unsigned int, unsigned int,
+   unsigned int, unsigned int, bfd_vma, long *);

 static int extract_insn_normal
 static int extract_insn_normal

-     PARAMS ((CGEN_CPU_DESC, const CGEN_INSN *, CGEN_EXTRACT_INFO *,
-             CGEN_INSN_INT, CGEN_FIELDS *, bfd_vma));
+  (CGEN_CPU_DESC, const CGEN_INSN *, CGEN_EXTRACT_INFO *,
+   CGEN_INSN_INT, CGEN_FIELDS *, bfd_vma);
+#if CGEN_INT_INSN_P

 static void put_insn_int_value
 static void put_insn_int_value

-     PARAMS ((CGEN_CPU_DESC, CGEN_INSN_BYTES_PTR, int, int, CGEN_INSN_INT));
-
+  (CGEN_CPU_DESC, CGEN_INSN_BYTES_PTR, int, int, CGEN_INSN_INT);
+#endif
+#if ! CGEN_INT_INSN_P
+static CGEN_INLINE void insert_1
+  (CGEN_CPU_DESC, unsigned long, int, int, int, unsigned char *);
+static CGEN_INLINE int fill_cache
+  (CGEN_CPU_DESC, CGEN_EXTRACT_INFO *,  int, int, bfd_vma);
+static CGEN_INLINE long extract_1
+  (CGEN_CPU_DESC, CGEN_EXTRACT_INFO *, int, int, int, unsigned char *, bfd_vma);
+#endif

 \f
 /* Operand insertion.  */
 
 \f
 /* Operand insertion.  */
 


@@ -68,17 +76,17 @@ static void put_insn_int_value
 /* Subroutine of insert_normal.  */
 
 static CGEN_INLINE void
 /* Subroutine of insert_normal.  */
 
 static CGEN_INLINE void

-insert_1 (cd, value, start, length, word_length, bufp)
-     CGEN_CPU_DESC cd;
-     unsigned long value;
-     int start,length,word_length;
-     unsigned char *bufp;
+insert_1 (CGEN_CPU_DESC cd,
+         unsigned long value,
+         int start,
+         int length,
+         int word_length,
+         unsigned char *bufp)

 {
   unsigned long x,mask;
   int shift;
 {
   unsigned long x,mask;
   int shift;

-  int big_p = CGEN_CPU_INSN_ENDIAN (cd) == CGEN_ENDIAN_BIG;

 
 

-  x = bfd_get_bits (bufp, word_length, big_p);
+  x = cgen_get_insn_value (cd, bufp, word_length);

 
   /* Written this way to avoid undefined behaviour.  */
   mask = (((1L << (length - 1)) - 1) << 1) | 1;
 
   /* Written this way to avoid undefined behaviour.  */
   mask = (((1L << (length - 1)) - 1) << 1) | 1;


@@ -88,7 +96,7 @@ insert_1 (cd, value, start, length, word_length, bufp)
     shift = (word_length - (start + length));
   x = (x & ~(mask << shift)) | ((value & mask) << shift);
 
     shift = (word_length - (start + length));
   x = (x & ~(mask << shift)) | ((value & mask) << shift);
 

-  bfd_put_bits ((bfd_vma) x, bufp, word_length, big_p);
+  cgen_put_insn_value (cd, bufp, word_length, (bfd_vma) x);

 }
 
 #endif /* ! CGEN_INT_INSN_P */
 }
 
 #endif /* ! CGEN_INT_INSN_P */


@@ -110,13 +118,15 @@ insert_1 (cd, value, start, length, word_length, bufp)
    necessary.  */
 
 static const char *
    necessary.  */
 
 static const char *

-insert_normal (cd, value, attrs, word_offset, start, length, word_length,
-              total_length, buffer)
-     CGEN_CPU_DESC cd;
-     long value;
-     unsigned int attrs;
-     unsigned int word_offset, start, length, word_length, total_length;
-     CGEN_INSN_BYTES_PTR buffer;
+insert_normal (CGEN_CPU_DESC cd,
+              long value,
+              unsigned int attrs,
+              unsigned int word_offset,
+              unsigned int start,
+              unsigned int length,
+              unsigned int word_length,
+              unsigned int total_length,
+              CGEN_INSN_BYTES_PTR buffer)

 {
   static char errbuf[100];
   /* Written this way to avoid undefined behaviour.  */
 {
   static char errbuf[100];
   /* Written this way to avoid undefined behaviour.  */


@@ -145,7 +155,22 @@ insert_normal (cd, value, attrs, word_offset, start, length, word_length,
     }
 
   /* Ensure VALUE will fit.  */
     }
 
   /* Ensure VALUE will fit.  */

-  if (! CGEN_BOOL_ATTR (attrs, CGEN_IFLD_SIGNED))
+  if (CGEN_BOOL_ATTR (attrs, CGEN_IFLD_SIGN_OPT))
+    {
+      long minval = - (1L << (length - 1));
+      unsigned long maxval = mask;
+      
+      if ((value > 0 && (unsigned long) value > maxval)
+         || value < minval)
+       {
+         /* xgettext:c-format */
+         sprintf (errbuf,
+                  _("operand out of range (%ld not between %ld and %lu)"),
+                  value, minval, maxval);
+         return errbuf;
+       }
+    }
+  else if (! CGEN_BOOL_ATTR (attrs, CGEN_IFLD_SIGNED))

     {
       unsigned long maxval = mask;
       
     {
       unsigned long maxval = mask;
       


@@ -202,23 +227,22 @@ insert_normal (cd, value, attrs, word_offset, start, length, word_length,
 }
 
 /* Default insn builder (insert handler).
 }
 
 /* Default insn builder (insert handler).

-   The instruction is recorded in CGEN_INT_INSN_P byte order
-   (meaning that if CGEN_INT_INSN_P BUFFER is an int * and thus the value is
-   recorded in host byte order, otherwise BUFFER is an array of bytes and the
-   value is recorded in target byte order).
+   The instruction is recorded in CGEN_INT_INSN_P byte order (meaning
+   that if CGEN_INSN_BYTES_PTR is an int * and thus, the value is
+   recorded in host byte order, otherwise BUFFER is an array of bytes
+   and the value is recorded in target byte order).

    The result is an error message or NULL if success.  */
 
 static const char *
    The result is an error message or NULL if success.  */
 
 static const char *

-insert_insn_normal (cd, insn, fields, buffer, pc)
-     CGEN_CPU_DESC cd;
-     const CGEN_INSN * insn;
-     CGEN_FIELDS * fields;
-     CGEN_INSN_BYTES_PTR buffer;
-     bfd_vma pc;
+insert_insn_normal (CGEN_CPU_DESC cd,
+                   const CGEN_INSN * insn,
+                   CGEN_FIELDS * fields,
+                   CGEN_INSN_BYTES_PTR buffer,
+                   bfd_vma pc)

 {
   const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);
   unsigned long value;
 {
   const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);
   unsigned long value;

-  const unsigned char * syn;
+  const CGEN_SYNTAX_CHAR_TYPE * syn;

 
   CGEN_INIT_INSERT (cd);
   value = CGEN_INSN_BASE_VALUE (insn);
 
   CGEN_INIT_INSERT (cd);
   value = CGEN_INSN_BASE_VALUE (insn);


@@ -233,8 +257,8 @@ insert_insn_normal (cd, insn, fields, buffer, pc)
 
 #else
 
 
 #else
 

-  cgen_put_insn_value (cd, buffer, min (cd->base_insn_bitsize,
-                                       CGEN_FIELDS_BITSIZE (fields)),
+  cgen_put_insn_value (cd, buffer, min ((unsigned) cd->base_insn_bitsize,
+                                       (unsigned) CGEN_FIELDS_BITSIZE (fields)),

                       value);
 
 #endif /* ! CGEN_INT_INSN_P */
                       value);
 
 #endif /* ! CGEN_INT_INSN_P */


@@ -244,7 +268,7 @@ insert_insn_normal (cd, insn, fields, buffer, pc)
      e.g. storing a branch displacement that got resolved later.
      Needs more thought first.  */
 
      e.g. storing a branch displacement that got resolved later.
      Needs more thought first.  */
 

-  for (syn = CGEN_SYNTAX_STRING (syntax); * syn != '\0'; ++ syn)
+  for (syn = CGEN_SYNTAX_STRING (syntax); * syn; ++ syn)

     {
       const char *errmsg;
 
     {
       const char *errmsg;
 


@@ -260,16 +284,16 @@ insert_insn_normal (cd, insn, fields, buffer, pc)
   return NULL;
 }
 
   return NULL;
 }
 

+#if CGEN_INT_INSN_P

 /* Cover function to store an insn value into an integral insn.  Must go here
  because it needs <prefix>-desc.h for CGEN_INT_INSN_P.  */
 
 static void
 /* Cover function to store an insn value into an integral insn.  Must go here
  because it needs <prefix>-desc.h for CGEN_INT_INSN_P.  */
 
 static void

-put_insn_int_value (cd, buf, length, insn_length, value)
-     CGEN_CPU_DESC cd;
-     CGEN_INSN_BYTES_PTR buf;
-     int length;
-     int insn_length;
-     CGEN_INSN_INT value;
+put_insn_int_value (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
+                   CGEN_INSN_BYTES_PTR buf,
+                   int length,
+                   int insn_length,
+                   CGEN_INSN_INT value)

 {
   /* For architectures with insns smaller than the base-insn-bitsize,
      length may be too big.  */
 {
   /* For architectures with insns smaller than the base-insn-bitsize,
      length may be too big.  */


@@ -283,6 +307,7 @@ put_insn_int_value (cd, buf, length, insn_length, value)
       *buf = (*buf & ~(mask << shift)) | ((value & mask) << shift);
     }
 }
       *buf = (*buf & ~(mask << shift)) | ((value & mask) << shift);
     }
 }

+#endif

 \f
 /* Operand extraction.  */
 
 \f
 /* Operand extraction.  */
 


@@ -295,15 +320,15 @@ put_insn_int_value (cd, buf, length, insn_length, value)
    Returns 1 for success, 0 for failure.  */
 
 static CGEN_INLINE int
    Returns 1 for success, 0 for failure.  */
 
 static CGEN_INLINE int

-fill_cache (cd, ex_info, offset, bytes, pc)
-     CGEN_CPU_DESC cd;
-     CGEN_EXTRACT_INFO *ex_info;
-     int offset, bytes;
-     bfd_vma pc;
+fill_cache (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
+           CGEN_EXTRACT_INFO *ex_info,
+           int offset,
+           int bytes,
+           bfd_vma pc)

 {
   /* It's doubtful that the middle part has already been fetched so
      we don't optimize that case.  kiss.  */
 {
   /* It's doubtful that the middle part has already been fetched so
      we don't optimize that case.  kiss.  */

-  int mask;
+  unsigned int mask;

   disassemble_info *info = (disassemble_info *) ex_info->dis_info;
 
   /* First do a quick check.  */
   disassemble_info *info = (disassemble_info *) ex_info->dis_info;
 
   /* First do a quick check.  */


@@ -339,18 +364,20 @@ fill_cache (cd, ex_info, offset, bytes, pc)
 /* Subroutine of extract_normal.  */
 
 static CGEN_INLINE long
 /* Subroutine of extract_normal.  */
 
 static CGEN_INLINE long

-extract_1 (cd, ex_info, start, length, word_length, bufp, pc)
-     CGEN_CPU_DESC cd;
-     CGEN_EXTRACT_INFO *ex_info;
-     int start,length,word_length;
-     unsigned char *bufp;
-     bfd_vma pc;
+extract_1 (CGEN_CPU_DESC cd,
+          CGEN_EXTRACT_INFO *ex_info ATTRIBUTE_UNUSED,
+          int start,
+          int length,
+          int word_length,
+          unsigned char *bufp,
+          bfd_vma pc ATTRIBUTE_UNUSED)

 {
   unsigned long x;
   int shift;
 {
   unsigned long x;
   int shift;

+#if 0

   int big_p = CGEN_CPU_INSN_ENDIAN (cd) == CGEN_ENDIAN_BIG;
   int big_p = CGEN_CPU_INSN_ENDIAN (cd) == CGEN_ENDIAN_BIG;

-
-  x = bfd_get_bits (bufp, word_length, big_p);
+#endif
+  x = cgen_get_insn_value (cd, bufp, word_length);

 
   if (CGEN_INSN_LSB0_P)
     shift = (start + 1) - length;
 
   if (CGEN_INSN_LSB0_P)
     shift = (start + 1) - length;


@@ -382,25 +409,27 @@ extract_1 (cd, ex_info, start, length, word_length, bufp, pc)
    necessary.  */
 
 static int
    necessary.  */
 
 static int

-extract_normal (cd, ex_info, insn_value, attrs, word_offset, start, length,
-               word_length, total_length, pc, valuep)
-     CGEN_CPU_DESC cd;
+extract_normal (CGEN_CPU_DESC cd,

 #if ! CGEN_INT_INSN_P
 #if ! CGEN_INT_INSN_P

-     CGEN_EXTRACT_INFO *ex_info;
+               CGEN_EXTRACT_INFO *ex_info,

 #else
 #else

-     CGEN_EXTRACT_INFO *ex_info ATTRIBUTE_UNUSED;
+               CGEN_EXTRACT_INFO *ex_info ATTRIBUTE_UNUSED,

 #endif
 #endif

-     CGEN_INSN_INT insn_value;
-     unsigned int attrs;
-     unsigned int word_offset, start, length, word_length, total_length;
+               CGEN_INSN_INT insn_value,
+               unsigned int attrs,
+               unsigned int word_offset,
+               unsigned int start,
+               unsigned int length,
+               unsigned int word_length,
+               unsigned int total_length,

 #if ! CGEN_INT_INSN_P
 #if ! CGEN_INT_INSN_P

-     bfd_vma pc;
+               bfd_vma pc,

 #else
 #else

-     bfd_vma pc ATTRIBUTE_UNUSED;
+               bfd_vma pc ATTRIBUTE_UNUSED,

 #endif
 #endif

-     long *valuep;
+               long *valuep)

 {
 {

-  CGEN_INSN_INT value, mask;
+  long value, mask;

 
   /* If LENGTH is zero, this operand doesn't contribute to the value
      so give it a standard value of zero.  */
 
   /* If LENGTH is zero, this operand doesn't contribute to the value
      so give it a standard value of zero.  */


@@ -428,9 +457,9 @@ extract_normal (cd, ex_info, insn_value, attrs, word_offset, start, length,
        word_length = total_length;
     }
 
        word_length = total_length;
     }
 

-  /* Does the value reside in INSN_VALUE?  */
+  /* Does the value reside in INSN_VALUE, and at the right alignment?  */

 
 

-  if (CGEN_INT_INSN_P || word_offset == 0)
+  if (CGEN_INT_INSN_P || (word_offset == 0 && word_length == total_length))

     {
       if (CGEN_INSN_LSB0_P)
        value = insn_value >> ((word_offset + start + 1) - length);
     {
       if (CGEN_INSN_LSB0_P)
        value = insn_value >> ((word_offset + start + 1) - length);


@@ -479,16 +508,15 @@ extract_normal (cd, ex_info, insn_value, attrs, word_offset, start, length,
    been called).  */
 
 static int
    been called).  */
 
 static int

-extract_insn_normal (cd, insn, ex_info, insn_value, fields, pc)
-     CGEN_CPU_DESC cd;
-     const CGEN_INSN *insn;
-     CGEN_EXTRACT_INFO *ex_info;
-     CGEN_INSN_INT insn_value;
-     CGEN_FIELDS *fields;
-     bfd_vma pc;
+extract_insn_normal (CGEN_CPU_DESC cd,
+                    const CGEN_INSN *insn,
+                    CGEN_EXTRACT_INFO *ex_info,
+                    CGEN_INSN_INT insn_value,
+                    CGEN_FIELDS *fields,
+                    bfd_vma pc)

 {
   const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);
 {
   const CGEN_SYNTAX *syntax = CGEN_INSN_SYNTAX (insn);

-  const unsigned char *syn;
+  const CGEN_SYNTAX_CHAR_TYPE *syn;

 
   CGEN_FIELDS_BITSIZE (fields) = CGEN_INSN_BITSIZE (insn);
 
 
   CGEN_FIELDS_BITSIZE (fields) = CGEN_INSN_BITSIZE (insn);