i386: Also check R12-R15 registers when optimizing testq to testb

[deliverable/binutils-gdb.git] / cpu / epiphany.opc

diff --git a/cpu/epiphany.opc b/cpu/epiphany.opc
old mode 100755 (executable)
new mode 100644 (file)
index 22e2f76..903eccf
--- a/cpu/epiphany.opc
+++ b/cpu/epiphany.opc
@@ -1,6 +1,6 @@
 /* Adapteva epiphany opcode support.  -*- C -*-
 
-   Copyright 2011 Free Software Foundation, Inc.
+   Copyright 2009, 2011 Free Software Foundation, Inc.
 
    Contributed by Embecosm on behalf of Adapteva, Inc.
 
@@ -78,7 +78,7 @@ extern const char * parse_branch_addr (CGEN_CPU_DESC cd,
                                       int opindex,
                                       int opinfo,
                                       enum cgen_parse_operand_result * resultp,
-                                      unsigned long * valuep);
+                                      bfd_vma *valuep);
 
 /* Allows reason codes to be output when assembler errors occur.  */
 #define CGEN_VERBOSE_ASSEMBLER_ERRORS
@@ -172,7 +172,7 @@ static const char *
 parse_postindex (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
                 const char ** strp,
                 int opindex ATTRIBUTE_UNUSED,
-                bfd_vma * valuep)
+                unsigned long *valuep)
 {
   if (**strp == '#')
     ++*strp;                   /* Skip leading hashes.  */
@@ -288,7 +288,7 @@ parse_branch_addr (CGEN_CPU_DESC cd,
                   int opindex,
                   int opinfo ATTRIBUTE_UNUSED,
                   enum cgen_parse_operand_result * resultp ATTRIBUTE_UNUSED,
-                  unsigned long * valuep ATTRIBUTE_UNUSED)
+                  bfd_vma *valuep ATTRIBUTE_UNUSED)
 {
   const char * errmsg;
   enum cgen_parse_operand_result result_type;
@@ -320,7 +320,7 @@ parse_branch_addr (CGEN_CPU_DESC cd,
          char buf[20];
          const char * bufp = (const char *) buf;
 
-         sprintf (buf, ".+%ld", value);
+         sprintf (buf, ".+%ld", (long) value);
          errmsg = cgen_parse_address (cd, &bufp, opindex, code, &result_type,
                                       &value);
        }
@@ -349,15 +349,16 @@ epiphany_print_insn (CGEN_CPU_DESC cd, bfd_vma pc, disassemble_info *info)
   int status;
 
   info->bytes_per_chunk = 2;
+  info->bytes_per_line = 4;
 
   /* Attempt to read the base part of the insn.  */
-  info->bytes_per_line = buflen = cd->base_insn_bitsize / 8;
+  buflen = cd->base_insn_bitsize / 8;
   status = (*info->read_memory_func) (pc, buf, buflen, info);
 
   /* Try again with the minimum part, if min < base.  */
   if (status != 0 && (cd->min_insn_bitsize < cd->base_insn_bitsize))
     {
-      info->bytes_per_line = buflen = cd->min_insn_bitsize / 8;
+      buflen = cd->min_insn_bitsize / 8;
       status = (*info->read_memory_func) (pc, buf, buflen, info);
     }