* config/obj-elf.c (elf_frob_file_before_adjust): Remove symbols

[binutils-gdb.git] / opcodes / d10v-dis.c

diff --git a/opcodes/d10v-dis.c b/opcodes/d10v-dis.c
index 31ce5265076c393b11fea691b103815d8355b930..433fd518326e93904b62f42980339360e8cfbbb1 100644 (file)
--- a/opcodes/d10v-dis.c
+++ b/opcodes/d10v-dis.c
@@ -29,6 +29,9 @@ static void dis_2_short PARAMS ((unsigned long insn, bfd_vma memaddr,
                                 struct disassemble_info *info, int order));
 static void dis_long PARAMS ((unsigned long insn, bfd_vma memaddr,
                              struct disassemble_info *info));
+static void print_operand
+  PARAMS ((struct d10v_operand *, long unsigned int, struct d10v_opcode *,
+          bfd_vma, struct disassemble_info *));
 
 int
 print_insn_d10v (memaddr, info)
@@ -120,7 +123,7 @@ print_operand (oper, insn, op, memaddr, info)
        num += num ? OPERAND_ACC1 : OPERAND_ACC0;
       for (i = 0; i < d10v_reg_name_cnt (); i++)
        {
-         if (num == d10v_predefined_registers[i].value)
+         if (num == (d10v_predefined_registers[i].value & ~ OPERAND_SP))
            {
              if (d10v_predefined_registers[i].pname)
                (*info->fprintf_func) (info->stream, "%s",
@@ -142,7 +145,7 @@ print_operand (oper, insn, op, memaddr, info)
            (*info->fprintf_func) (info->stream, "cr");
          else if (oper->flags & OPERAND_REG)
            (*info->fprintf_func) (info->stream, "r");
-         (*info->fprintf_func) (info->stream, "%d", num);
+         (*info->fprintf_func) (info->stream, "%d", num & REGISTER_MASK);
        }
     }
   else
@@ -192,7 +195,6 @@ dis_long (insn, memaddr, info)
      struct disassemble_info *info;
 {
   int i;
-  char buf[32];
   struct d10v_opcode *op = (struct d10v_opcode *) d10v_opcodes;
   struct d10v_operand *oper;
   int need_paren = 0;
@@ -200,7 +202,7 @@ dis_long (insn, memaddr, info)
 
   while (op->name)
     {
-      if ((op->format & LONG_OPCODE) && ((op->mask & insn) == op->opcode))
+      if ((op->format & LONG_OPCODE) && ((op->mask & insn) == (unsigned long) op->opcode))
        {
          match = 1;
          (*info->fprintf_func) (info->stream, "%s\t", op->name);
@@ -235,10 +237,8 @@ dis_2_short (insn, memaddr, info, order)
      int order;
 {
   int i, j;
-  char astr[2][32];
   unsigned int ins[2];
   struct d10v_opcode *op;
-  char buf[32];
   int match, num_match = 0;
   struct d10v_operand *oper;
   int need_paren = 0;
@@ -253,7 +253,7 @@ dis_2_short (insn, memaddr, info, order)
       while (op->name)
        {
          if ((op->format & SHORT_OPCODE)
-             && ((op->mask & ins[j]) == op->opcode))
+             && ((op->mask & ins[j]) == (unsigned long) op->opcode))
            {
              (*info->fprintf_func) (info->stream, "%s\t", op->name);
              for (i = 0; op->operands[i]; i++)