Check R_X86_64_32 overflow and allow R_X86_64_64 for x32.

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

diff --git a/opcodes/ip2k-asm.c b/opcodes/ip2k-asm.c
index 41e8d33472cc13cdd3a232f0171ea5badf4a47d0..03e219c55447e16a414e4c636b250f0d751fd30b 100644 (file)
--- a/opcodes/ip2k-asm.c
+++ b/opcodes/ip2k-asm.c
@@ -4,7 +4,7 @@
    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, 2005, 2007, 2008
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2005, 2007, 2008, 2010

    Free Software Foundation, Inc.
 
    This file is part of libopcodes.
    Free Software Foundation, Inc.
 
    This file is part of libopcodes.


@@ -758,9 +758,11 @@ parse_insn_normal (CGEN_CPU_DESC cd,
          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 = cd->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;
 


@@ -877,31 +879,39 @@ ip2k_cgen_assemble_insn (CGEN_CPU_DESC cd,
 
   {
     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;