symtab.h (struct symtab) <next>: Fix comment.

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

diff --git a/opcodes/moxie-dis.c b/opcodes/moxie-dis.c
index 38429de1ae51ddc96ddb2e4eacc2b0b2b17bae96..953497e8cfc8bd684f89a623c7ca36e6dbc910d7 100644 (file)
--- a/opcodes/moxie-dis.c
+++ b/opcodes/moxie-dis.c
@@ -1,6 +1,5 @@
 /* Disassemble moxie instructions.
-   Copyright 2009, 2012
-   Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
    This file is part of the GNU opcodes library.
 
@@ -141,41 +140,44 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
            length = 6;
          }
          break;
-       case MOXIE_F1_AiB4:
+       case MOXIE_F1_AiB2:
          {
            unsigned imm;
-           if ((status = info->read_memory_func (addr+2, buffer, 4, info)))
+           if ((status = info->read_memory_func (addr+2, buffer, 2, info)))
              goto fail;
            if (info->endian == BFD_ENDIAN_BIG)
-             imm = bfd_getb32 (buffer);
+             imm = bfd_getb16 (buffer);
            else
-             imm = bfd_getl32 (buffer);
+             imm = bfd_getl16 (buffer);
            fpr (stream, "%s\t0x%x(%s), %s", opcode->name,
                 imm,
                 reg_names[OP_A(iword)],
                 reg_names[OP_B(iword)]);
-           length = 6;
+           length = 4;
          }
          break;
-       case MOXIE_F1_ABi4:
+       case MOXIE_F1_ABi2:
          {
            unsigned imm;
-           if ((status = info->read_memory_func (addr+2, buffer, 4, info)))
+           if ((status = info->read_memory_func (addr+2, buffer, 2, info)))
              goto fail;
            if (info->endian == BFD_ENDIAN_BIG)
-             imm = bfd_getb32 (buffer);
+             imm = bfd_getb16 (buffer);
            else
-             imm = bfd_getl32 (buffer);
+             imm = bfd_getl16 (buffer);
            fpr (stream, "%s\t%s, 0x%x(%s)",
                 opcode->name,
                 reg_names[OP_A(iword)],
                 imm,
                 reg_names[OP_B(iword)]);
-           length = 6;
+           length = 4;
          }
          break;
+        case MOXIE_BAD:
+         fpr (stream, "bad");
+         break;
        default:
-         abort ();
+         abort();
        }
     }
   else if ((iword & (1<<14)) == 0)
@@ -193,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();
        }
@@ -208,6 +213,9 @@ print_insn_moxie (bfd_vma addr, struct disassemble_info * info)
          info->print_address_func ((bfd_vma) (addr + INST2OFFSET(iword) + 2), 
                                    info);
          break;
+        case MOXIE_BAD:
+         fpr (stream, "bad");
+         break;
        default:
          abort();
        }