Fix bug in interlisting option, added --file-start-context option.
[deliverable/binutils-gdb.git] / opcodes / mips-dis.c
index 62eb63bd3e07881dae4f5c86655d88e896c6cb38..a1bd62ed5770b353e721c690aaf8ca1ee1f4eddc 100644 (file)
@@ -87,14 +87,6 @@ print_insn_arg (d, l, pc, info)
     case ',':
     case '(':
     case ')':
-      /* start-sanitize-cygnus */
-    case '[':
-    case ']':
-      /* end-sanitize-cygnus */
-      /* start-sanitize-r5900 */
-    case '+':
-    case '-':
-      /* end-sanitize-r5900 */
       (*info->fprintf_func) (info->stream, "%c", *d);
       break;
 
@@ -196,123 +188,6 @@ print_insn_arg (d, l, pc, info)
                             (l >> OP_SH_FS) & OP_MASK_FS);
       break;
 
-    /* start-sanitize-r5900 */
-    case '0':
-      (*info->fprintf_func) (info->stream, "0x%x",
-                             (l >> 6) & 0x1f);
-      break;
-
-    case '9':
-      (*info->fprintf_func) (info->stream, "vi27");
-      break;
-
-    case '1':
-      (*info->fprintf_func) (info->stream, "vf%d",
-                            (l >> OP_SH_FT) & OP_MASK_FT);
-      break;
-    case '2':
-      (*info->fprintf_func) (info->stream, "vf%d",
-                            (l >> OP_SH_FS) & OP_MASK_FS);
-      break;
-    case '3':
-      (*info->fprintf_func) (info->stream, "vf%d",
-                            (l >> OP_SH_FD) & OP_MASK_FD);
-      break;
-
-    case '4':
-      (*info->fprintf_func) (info->stream, "vi%d",
-                            (l >> OP_SH_FT) & OP_MASK_FT);
-      break;
-    case '5':
-      (*info->fprintf_func) (info->stream, "vi%d",
-                            (l >> OP_SH_FS) & OP_MASK_FS);
-      break;
-    case '6':
-      (*info->fprintf_func) (info->stream, "vi%d",
-                            (l >> OP_SH_FD) & OP_MASK_FD);
-      break;
-
-    case '7':
-      (*info->fprintf_func) (info->stream, "vf%d",
-                            (l >> OP_SH_FT) & OP_MASK_FT);
-      switch ((l >> 23) & 0x3)
-       {
-         case 0:
-           (*info->fprintf_func) (info->stream, "x");
-           break;
-         case 1:
-           (*info->fprintf_func) (info->stream, "y");
-           break;
-         case 2:
-           (*info->fprintf_func) (info->stream, "z");
-           break;
-         case 3:
-           (*info->fprintf_func) (info->stream, "w");
-           break;
-       }
-      break;
-    case 'K':
-      break;
-
-    case ';':
-      (*info->fprintf_func) (info->stream, ".xyz\t");
-      break;
-       
-    case '&':
-      (*info->fprintf_func) (info->stream, ".");
-      if (l & (1 << 21))
-       (*info->fprintf_func) (info->stream, "w");
-      if (l & (1 << 24))
-       (*info->fprintf_func) (info->stream, "x");
-      if (l & (1 << 23))
-       (*info->fprintf_func) (info->stream, "y");
-      if (l & (1 << 22))
-       (*info->fprintf_func) (info->stream, "z");
-      (*info->fprintf_func) (info->stream, "\t");
-      break;
-       
-    case '8':
-      (*info->fprintf_func) (info->stream, "vf%d",
-                            (l >> OP_SH_FS) & OP_MASK_FS);
-      switch ((l >> 21) & 0x3)
-       {
-         case 0:
-           (*info->fprintf_func) (info->stream, "x");
-           break;
-         case 1:
-           (*info->fprintf_func) (info->stream, "y");
-           break;
-         case 2:
-           (*info->fprintf_func) (info->stream, "z");
-           break;
-         case 3:
-           (*info->fprintf_func) (info->stream, "w");
-           break;
-       }
-      break;
-    case 'J':
-      (*info->fprintf_func) (info->stream, "I");
-      break;
-
-    case 'Q':
-      (*info->fprintf_func) (info->stream, "Q");
-      break;
-
-    case 'X':
-      (*info->fprintf_func) (info->stream, "R");
-      break;
-
-    case 'U':
-      (*info->fprintf_func) (info->stream, "ACC");
-      break;
-
-    case 'O':
-      delta = (l >> 6) & 0x7fff;
-      delta <<= 3;
-      (*info->print_address_func) (delta, info);
-      break;
-
-    /* end-sanitize-r5900 */
 
     case 'T':
     case 'W':
@@ -355,17 +230,6 @@ print_insn_arg (d, l, pc, info)
                             (l >> OP_SH_PERFREG) & OP_MASK_PERFREG);
       break;
 
-      /* start-sanitize-cygnus */
-    case 'e':
-      (*info->fprintf_func) (info->stream, "%d",
-                            (l >> OP_SH_VECBYTE) & OP_MASK_VECBYTE);
-      break;
-
-    case '%':
-      (*info->fprintf_func) (info->stream, "%d",
-                            (l >> OP_SH_VECALIGN) & OP_MASK_VECALIGN);
-      break;
-      /* end-sanitize-cygnus */
 
     default:
       /* xgettext:c-format */
@@ -392,12 +256,6 @@ set_mips_isa_type (mach, isa, cputype)
 
   switch (mach)
     {
-      /* start-sanitize-tx19 */
-      case bfd_mach_mips1900:
-       target_processor = 1900;
-       mips_isa = 1;
-       break;
-      /* end-sanitize-tx19 */
       case bfd_mach_mips3000:
        target_processor = 3000;
        mips_isa = 1;
@@ -418,22 +276,14 @@ set_mips_isa_type (mach, isa, cputype)
        target_processor = 4100;
        mips_isa = 3;
        break;
-       /* start-sanitize-vr4xxx */
-      case bfd_mach_mips4121:
-       target_processor = 4121;
+      case bfd_mach_mips4111:
+       target_processor = 4100;
        mips_isa = 3;
        break;
-       /* end-sanitize-vr4xxx */
       case bfd_mach_mips4300:
        target_processor = 4300;
        mips_isa = 3;
        break;
-       /* start-sanitize-vr4320 */
-      case bfd_mach_mips4320:
-       target_processor = 4320;
-       mips_isa = 3;
-       break;
-       /* end-sanitize-vr4320 */
       case bfd_mach_mips4400:
        target_processor = 4400;
        mips_isa = 3;
@@ -446,28 +296,10 @@ set_mips_isa_type (mach, isa, cputype)
        target_processor = 4650;
        mips_isa = 3;
        break;
-      /* start-sanitize-tx49 */
-      case bfd_mach_mips4900:
-       target_processor = 4900;
-       mips_isa = 3;
-       break;
-      /* end-sanitize-tx49 */
       case bfd_mach_mips5000:
        target_processor = 5000;
        mips_isa = 4;
        break;
-      /* start-sanitize-cygnus */
-      case bfd_mach_mips5400:
-       target_processor = 5400;
-       mips_isa = 3;
-       break;
-      /* end-sanitize-cygnus */
-      /* start-sanitize-r5900 */
-      case bfd_mach_mips5900:
-       target_processor = 5900;
-       mips_isa = 3;
-       break;
-      /* end-sanitize-r5900 */
       case bfd_mach_mips6000:
        target_processor = 6000;
        mips_isa = 2;
@@ -555,48 +387,8 @@ _print_insn_mips (memaddr, word, info)
          if (op->pinfo != INSN_MACRO && (word & op->mask) == op->match)
            {
              register const char *d;
-             int insn_isa;
-
-             if ((op->membership & INSN_ISA) == INSN_ISA1)
-               insn_isa = 1;
-             else if ((op->membership & INSN_ISA) == INSN_ISA2)
-               insn_isa = 2;
-             else if ((op->membership & INSN_ISA) == INSN_ISA3)
-               insn_isa = 3;
-             else if ((op->membership & INSN_ISA) == INSN_ISA4)
-               insn_isa = 4;
-             else
-               insn_isa = 15;
-
-             if (insn_isa > mips_isa
-                 && (target_processor == 4650
-                     && op->membership & INSN_4650) == 0
-                 && (target_processor == 4010
-                     && op->membership & INSN_4010) == 0
-                 && (target_processor == 4100
-                     && op->membership & INSN_4100) == 0
-                 /* start-sanitize-vr4xxx */
-                 && (target_processor == 4121
-                     && op->membership & INSN_4121) == 0
-                 /* end-sanitize-vr4xxx */
-                 /* start-sanitize-vr4320 */
-                 && (target_processor == 4320
-                     && op->membership & INSN_4320) == 0
-                 /* end-sanitize-vr4320 */
-                 /* start-sanitize-cygnus */
-                 && (target_processor == 5400
-                     && op->membership & INSN_5400) == 0
-                 /* end-sanitize-cygnus */
-                 /* start-sanitize-r5900 */
-                 && (target_processor == 5900
-                     && op->membership & INSN_5900) == 0
-                 /* end-sanitize-r5900 */
-                 /* start-sanitize-tx49 */
-                 && (target_processor == 4900
-                     && op->membership & INSN_4900) == 0
-                 /* end-sanitize-tx49 */
-                 && (target_processor == 3900
-                     && op->membership & INSN_3900) == 0)
+
+             if (! OPCODE_IS_MEMBER (op, mips_isa, target_processor))
                continue;
 
              (*info->fprintf_func) (info->stream, "%s", op->name);
@@ -604,23 +396,8 @@ _print_insn_mips (memaddr, word, info)
              d = op->args;
              if (d != NULL && *d != '\0')
                {
-                 /* start-sanitize-r5900 */
-                 /* If this is an opcode completer, then do not emit
-                    a tab after the opcode.  */
-                 if (*d != '&' && *d != ';')
-                 /* end-sanitize-r5900 */
                    (*info->fprintf_func) (info->stream, "\t");
                  for (; *d != '\0'; d++)
-                   /* start-sanitize-r5900 */
-                   /* If this is an escape character, go ahead and print the
-                      next character in the arg string verbatim.  */
-                   if (*d == '#')
-                     {
-                       d++;
-                       (*info->fprintf_func) (info->stream, "%c", *d);
-                     }
-                   else
-                   /* end-sanitize-r5900 */
                      print_insn_arg (d, word, memaddr, info);
                }
 
@@ -684,20 +461,6 @@ print_insn_little_mips (memaddr, info)
   bfd_byte buffer[4];
   int status;
 
-  /* start-sanitize-sky */
-#ifdef ARCH_dvp
-  {
-    /* bfd_mach_dvp_p is a macro which may evaluate its arguments more than
-       once.  Since dvp_mach_type is a function, ensure it's only called
-       once.  */
-    int mach = dvp_info_mach_type (info);
-
-    if (bfd_mach_dvp_p (info->mach)
-       || bfd_mach_dvp_p (mach))
-      return print_insn_dvp (memaddr, info);
-  }
-#endif
-  /* end-sanitize-sky */
 
 #if 1
   if (memaddr & 0x01)
This page took 0.02601 seconds and 4 git commands to generate.