5xxx and el

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

diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
index 52efafe38b44ae80d84daebb056e0d09e239004c..62eb63bd3e07881dae4f5c86655d88e896c6cb38 100644 (file)
--- a/opcodes/mips-dis.c
+++ b/opcodes/mips-dis.c
@@ -87,10 +87,10 @@ print_insn_arg (d, l, pc, info)
     case ',':
     case '(':
     case ')':
-      /* start-sanitize-vr5400 */
+      /* start-sanitize-cygnus */
     case '[':
     case ']':
-      /* end-sanitize-vr5400 */
+      /* end-sanitize-cygnus */
       /* start-sanitize-r5900 */
     case '+':
     case '-':
@@ -355,7 +355,7 @@ print_insn_arg (d, l, pc, info)
                             (l >> OP_SH_PERFREG) & OP_MASK_PERFREG);
       break;
 
-      /* start-sanitize-vr5400 */
+      /* start-sanitize-cygnus */
     case 'e':
       (*info->fprintf_func) (info->stream, "%d",
                             (l >> OP_SH_VECBYTE) & OP_MASK_VECBYTE);
@@ -365,7 +365,7 @@ print_insn_arg (d, l, pc, info)
       (*info->fprintf_func) (info->stream, "%d",
                             (l >> OP_SH_VECALIGN) & OP_MASK_VECALIGN);
       break;
-      /* end-sanitize-vr5400 */
+      /* end-sanitize-cygnus */
 
     default:
       /* xgettext:c-format */
@@ -376,16 +376,21 @@ print_insn_arg (d, l, pc, info)
     }
 }
 \f
-
-
 #if SYMTAB_AVAILABLE
 
-static
-void set_mips_isa_type (int mach, int * isa, int *cputype) 
+/* Figure out the MIPS ISA and CPU based on the machine number.
+   FIXME: What does this have to do with SYMTAB_AVAILABLE?  */
+
+static void
+set_mips_isa_type (mach, isa, cputype)
+     int mach;
+     int *isa;
+     int *cputype;
 {
-  int target_processor = 0 ;
-  int mips_isa = 0 ;
-    switch (mach)
+  int target_processor = 0;
+  int mips_isa = 0;
+
+  switch (mach)
     {
       /* start-sanitize-tx19 */
       case bfd_mach_mips1900:
@@ -413,6 +418,12 @@ void set_mips_isa_type (int mach, int * isa, int *cputype)
        target_processor = 4100;
        mips_isa = 3;
        break;
+       /* start-sanitize-vr4xxx */
+      case bfd_mach_mips4121:
+       target_processor = 4121;
+       mips_isa = 3;
+       break;
+       /* end-sanitize-vr4xxx */
       case bfd_mach_mips4300:
        target_processor = 4300;
        mips_isa = 3;
@@ -445,12 +456,12 @@ void set_mips_isa_type (int mach, int * isa, int *cputype)
        target_processor = 5000;
        mips_isa = 4;
        break;
-      /* start-sanitize-vr5400 */
+      /* start-sanitize-cygnus */
       case bfd_mach_mips5400:
        target_processor = 5400;
        mips_isa = 3;
        break;
-      /* end-sanitize-vr5400 */
+      /* end-sanitize-cygnus */
       /* start-sanitize-r5900 */
       case bfd_mach_mips5900:
        target_processor = 5900;
@@ -479,10 +490,12 @@ void set_mips_isa_type (int mach, int * isa, int *cputype)
        break;
 
     }
-    *isa = mips_isa ;
-    *cputype = target_processor ;
+
+  *isa = mips_isa;
+  *cputype = target_processor;
 }
-#endif /* symbol table available */
+
+#endif /* SYMTAB_AVAILABLE */
 
 /* Print the mips instruction at address MEMADDR in debugged memory,
    on using INFO.  Returns length of the instruction, in bytes, which is
@@ -521,12 +534,14 @@ _print_insn_mips (memaddr, word, info)
 
       init = 1;
     }
+
 #if ! SYMTAB_AVAILABLE
-  /* This is running out on a target machine, not in a host tool */
-  target_processor = mips_target_info.processor ;
-  mips_isa = mips_target_info.isa ;
+  /* This is running out on a target machine, not in a host tool.
+     FIXME: Where does mips_target_info come from?  */
+  target_processor = mips_target_info.processor;
+  mips_isa = mips_target_info.isa;
 #else  
-  set_mips_isa_type(info->mach, &target_processor, &mips_isa) ;
+  set_mips_isa_type (info->mach, &mips_isa, &target_processor);
 #endif  
 
   info->bytes_per_chunk = 4;
@@ -560,14 +575,18 @@ _print_insn_mips (memaddr, word, info)
                      && 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-vr5400 */
+                 /* start-sanitize-cygnus */
                  && (target_processor == 5400
                      && op->membership & INSN_5400) == 0
-                 /* end-sanitize-vr5400 */
+                 /* end-sanitize-cygnus */
                  /* start-sanitize-r5900 */
                  && (target_processor == 5900
                      && op->membership & INSN_5900) == 0
@@ -616,12 +635,11 @@ _print_insn_mips (memaddr, word, info)
 }
 
 
-/* In an environment where we do not know the symbol type of the instruction
-   we are forces to assumd the low order bit of the instructions address
-   may mark it as a mips16 instruction. If we are sincle stepping or the
-   pc is within the disassembled function, this works. Otherwise,
-   we need a clue. Sometimes. */
-   
+/* In an environment where we do not know the symbol type of the
+   instruction we are forced to assume that the low order bit of the
+   instructions' address may mark it as a mips16 instruction.  If we
+   are single stepping, or the pc is within the disassembled function,
+   this works.  Otherwise, we need a clue.  Sometimes.  */
 
 int
 print_insn_big_mips (memaddr, info)
@@ -632,8 +650,8 @@ print_insn_big_mips (memaddr, info)
   int status;
 
 #if 1
-  /* FIXME: If odd address, this is CLEARLY a mips 16 instruction */
-  /* Only a few tools will work this way */
+  /* FIXME: If odd address, this is CLEARLY a mips 16 instruction.  */
+  /* Only a few tools will work this way.  */
   if (memaddr & 0x01)
     return print_insn_mips16 (memaddr, info);
 #endif  
@@ -682,7 +700,8 @@ print_insn_little_mips (memaddr, info)
   /* end-sanitize-sky */
 
 #if 1
-  if (memaddr & 0x01)  return print_insn_mips16 (memaddr, info);
+  if (memaddr & 0x01)
+    return print_insn_mips16 (memaddr, info);
 #endif  
 
 #if SYMTAB_AVAILABLE