2001-08-31 Eric Christopher <echristo@redhat.com>

	    Jason Eckhardt    <jle@redhat.com>

	* mips-dis.c: Add support for bfd_mach_mipsisa32 and
	bfd_mach_mipsisa64. Remove bfd_mach_mips32, bfd_mach_mips32_4k,
	bfd_mach_mips64.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index e3f28d8..3d95187 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-31  Eric Christopher  <echristo@redhat.com>
+           Jason Eckhardt    <jle@redhat.com>
+
+       * mips-dis.c: Add support for bfd_mach_mipsisa32 and
+       bfd_mach_mipsisa64. Remove bfd_mach_mips32, bfd_mach_mips32_4k,
+       bfd_mach_mips64.
+
 2001-08-31  Andreas Jaeger  <aj@suse.de>
 
        * tic54x-opc.c: Add default initializers to avoid warnings.

diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
index 58b7dcd..9112898 100644 (file)
--- a/opcodes/mips-dis.c
+++ b/opcodes/mips-dis.c
@@ -369,26 +369,23 @@ mips_isa_type (mach, isa, cputype)
       *cputype = CPU_MIPS16;
       *isa = ISA_MIPS3;
       break;
-    case bfd_mach_mips32:
-      *cputype = CPU_MIPS32;
-      *isa = ISA_MIPS32;
-      break;
-    case bfd_mach_mips32_4k:
-      *cputype = CPU_MIPS32_4K;
-      *isa = ISA_MIPS32;
-      break;
     case bfd_mach_mips5:
       *cputype = CPU_MIPS5;
       *isa = ISA_MIPS5;
       break;
-    case bfd_mach_mips64:
-      *cputype = CPU_MIPS64;
-      *isa = ISA_MIPS64;
-      break;
     case bfd_mach_mips_sb1:
       *cputype = CPU_SB1;
       *isa = ISA_MIPS64;
       break;
+    case bfd_mach_mipsisa32:
+      * cputype = CPU_MIPS32;
+      * isa = ISA_MIPS32;
+      break;
+    case bfd_mach_mipsisa64:
+      * cputype = CPU_MIPS64;
+      * isa = ISA_MIPS64;
+      break;
+
     default:
       *cputype = CPU_R3000;
       *isa = ISA_MIPS3;