for bfd:

	* archures.c,bfd-in2.h (bfd_mach_mips4121): New.
	* cpu-mips.c: Added vr4121.
	* elf32-mips.c (elf_mips_mach): Same.
	(_bfd_mips_elf_final_write_processing): Same.

for gas:
	* config/tc-mips.c (mips_4121): New.
	(md_begin,mips_ip,md_longopts,md_parse_option): Add vr4121.

for gcc:
	* config/mips/mips.c (override_options): Add vr4121.
	* config/mips/t-vr4xxx (MULTILIB_MATCHES): Same.

for include/elf:
	* mips.h (E_MIPS_MACH_4121): New.

for include/opcode:
	* mips.h (INSN_4121): New.

for opcodes:
	* mips-dis.c (set_mips_isa_type): Add bfd_mach_mips4121.
	(_print_insn_mips): Same.
	* mips-opc.c: Add vr4121.

for sim/mips:
	* configure.in,mips.igen,vr.igen: Add vr4121.
	* configure: Rebuilt.

3 files changed, 54 insertions, 9 deletions

diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize
index 49b8a02..71cd19a 100644
--- a/opcodes/.Sanitize
+++ b/opcodes/.Sanitize
@@ -276,6 +276,34 @@ else
 	done
 fi
 
+vr4xxx_files="ChangeLog mips-opc.c mips-dis.c"
+if ( echo $* | grep keep\-vr4xxx > /dev/null ) ; then
+	for i in $vr4xxx_files ; do
+		if test ! -d $i && (grep sanitize-vr4xxx $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping vr4xxx stuff in $i
+			fi
+		fi
+	done
+else
+	for i in $vr4xxx_files ; do
+		if test ! -d $i && (grep sanitize-vr4xxx $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"vr4xxx\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-vr4xxx/,/end-\sanitize\-vr4xxx/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
 cygnus_files="ChangeLog mips-opc.c mips-dis.c"
 if ( echo $* | grep keep\-cygnus > /dev/null ) ; then
 	for i in $cygnus_files ; do
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index c6c55b9..b238a08 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@
+start-sanitize-vr4xxx
+1998-12-13  Gavin Romig-Koch  <gavin@cygnus.com>
+
+	* mips-dis.c (set_mips_isa_type): Add bfd_mach_mips4121.
+	(_print_insn_mips): Same.
+	* mips-opc.c: Add vr4121.
+
 start-sanitize-fr30
 Thu Dec 10 18:39:46 1998  Dave Brolley  <brolley@cygnus.com>
 
diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
index 4efd91c..62eb63b 100644
--- 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 */
@@ -418,6 +418,12 @@ set_mips_isa_type (mach, isa, 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;
@@ -450,12 +456,12 @@ set_mips_isa_type (mach, isa, 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;
@@ -535,7 +541,7 @@ _print_insn_mips (memaddr, word, info)
   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;
@@ -569,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