This patch prevents a linker testsuite error if the checks are run with a

[deliverable/binutils-gdb.git] / opcodes / moxie-dis.c

diff --git a/opcodes/moxie-dis.c b/opcodes/moxie-dis.c
index 4e67e2c5551443e140a0f5fa3a71a0ba4205e7a1..90e0464a18a6e5f3d5f48911dc44224178538d15 100644 (file)
--- a/opcodes/moxie-dis.c
+++ b/opcodes/moxie-dis.c
@@ -1,6 +1,5 @@
 /* Disassemble moxie instructions.
-   Copyright 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2009-2014 Free Software Foundation, Inc.
 
    This file is part of the GNU opcodes library.
 
@@ -19,8 +18,9 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
-#include <stdio.h>
 #include "sysdep.h"
+#include <stdio.h>
+
 #define STATIC_TABLE
 #define DEFINE_TABLE
 
@@ -52,7 +52,11 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
 
   if ((status = info->read_memory_func (addr, buffer, 2, info)))
     goto fail;
-  iword = bfd_getb16 (buffer);
+
+  if (info->endian == BFD_ENDIAN_BIG)
+    iword = bfd_getb16 (buffer);
+  else
+    iword = bfd_getl16 (buffer);
 
   /* Form 1 instructions have the high bit set to 0.  */
   if ((iword & (1<<15)) == 0)
@@ -78,7 +82,10 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
            unsigned imm;
            if ((status = info->read_memory_func (addr + 2, buffer, 4, info)))
              goto fail;
-           imm = bfd_getb32 (buffer);
+           if (info->endian == BFD_ENDIAN_BIG)
+             imm = bfd_getb32 (buffer);
+           else
+             imm = bfd_getl32 (buffer);
            fpr (stream, "%s\t%s, 0x%x", opcode->name,
                 reg_names[OP_A(iword)], imm);
            length = 6;
@@ -89,7 +96,10 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
            unsigned imm;
            if ((status = info->read_memory_func (addr + 2, buffer, 4, info)))
              goto fail;
-           imm = bfd_getb32 (buffer);
+           if (info->endian == BFD_ENDIAN_BIG)
+             imm = bfd_getb32 (buffer);
+           else
+             imm = bfd_getl32 (buffer);
            fpr (stream, "%s\t0x%x", opcode->name, imm);
            length = 6;
          }
@@ -99,7 +109,10 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
            unsigned imm;
            if ((status = info->read_memory_func (addr + 2, buffer, 4, info)))
              goto fail;
-           imm = bfd_getb32 (buffer);
+           if (info->endian == BFD_ENDIAN_BIG)
+             imm = bfd_getb32 (buffer);
+           else
+             imm = bfd_getl32 (buffer);
            fpr (stream, "%s\t", opcode->name);
            info->print_address_func ((bfd_vma) imm, info);
            length = 6;
@@ -118,7 +131,10 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
            unsigned imm;
            if ((status = info->read_memory_func (addr + 2, buffer, 4, info)))
              goto fail;
-           imm = bfd_getb32 (buffer);
+           if (info->endian == BFD_ENDIAN_BIG)
+             imm = bfd_getb32 (buffer);
+           else
+             imm = bfd_getl32 (buffer);
            fpr (stream, "%s\t0x%x, %s",
                 opcode->name, imm, reg_names[OP_A(iword)]);
            length = 6;
@@ -129,7 +145,10 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
            unsigned imm;
            if ((status = info->read_memory_func (addr+2, buffer, 4, info)))
              goto fail;
-           imm = bfd_getb32 (buffer);
+           if (info->endian == BFD_ENDIAN_BIG)
+             imm = bfd_getb32 (buffer);
+           else
+             imm = bfd_getl32 (buffer);
            fpr (stream, "%s\t0x%x(%s), %s", opcode->name,
                 imm,
                 reg_names[OP_A(iword)],
@@ -142,7 +161,10 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
            unsigned imm;
            if ((status = info->read_memory_func (addr+2, buffer, 4, info)))
              goto fail;
-           imm = bfd_getb32 (buffer);
+           if (info->endian == BFD_ENDIAN_BIG)
+             imm = bfd_getb32 (buffer);
+           else
+             imm = bfd_getl32 (buffer);
            fpr (stream, "%s\t%s, 0x%x(%s)",
                 opcode->name,
                 reg_names[OP_A(iword)],
@@ -151,8 +173,11 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
            length = 6;
          }
          break;
+        case MOXIE_BAD:
+         fpr (stream, "bad");
+         break;
        default:
-         abort ();
+         abort();
        }
     }
   else if ((iword & (1<<14)) == 0)
@@ -170,6 +195,9 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
        case MOXIE_F2_NARG:
          fpr (stream, "%s", opcode->name);
          break;
+        case MOXIE_BAD:
+         fpr (stream, "bad");
+         break;
        default:
          abort();
        }
@@ -182,9 +210,12 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
        {
        case MOXIE_F3_PCREL:
          fpr (stream, "%s\t", opcode->name);
-         info->print_address_func ((bfd_vma) (addr + INST2OFFSET(iword)), 
+         info->print_address_func ((bfd_vma) (addr + INST2OFFSET(iword) + 2), 
                                    info);
          break;
+        case MOXIE_BAD:
+         fpr (stream, "bad");
+         break;
        default:
          abort();
        }