* config/tc-mips.c (MAX_VR4130_NOPS, MAX_DELAY_NOPS): New macros.

	(MAX_NOPS): Bump to 4.
	(mips_fix_vr4130): New variable.
	(nops_for_vr4130): New function.
	(nops_for_insn): Use MAX_DELAY_NOPS rather than MAX_NOPS.  Use
	nops_for_vr4130 if working around VR4130 errata.
	(OPTION_FIX_VR4130, OPTION_NO_FIX_VR4130): New macros.
	(md_longopts): Add -mfix-vr4130 and -mno-fix-vr4130.
	(md_parse_option): Handle them.
	(md_show_usage): Print them.
	* doc/c-mips.texi: Document -mfix-vr4130 and -mno-fix-vr4130.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index d020a8f..cf373d8 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,19 @@
 2005-03-09  Richard Sandiford  <rsandifo@redhat.com>
 
+       * config/tc-mips.c (MAX_VR4130_NOPS, MAX_DELAY_NOPS): New macros.
+       (MAX_NOPS): Bump to 4.
+       (mips_fix_vr4130): New variable.
+       (nops_for_vr4130): New function.
+       (nops_for_insn): Use MAX_DELAY_NOPS rather than MAX_NOPS.  Use
+       nops_for_vr4130 if working around VR4130 errata.
+       (OPTION_FIX_VR4130, OPTION_NO_FIX_VR4130): New macros.
+       (md_longopts): Add -mfix-vr4130 and -mno-fix-vr4130.
+       (md_parse_option): Handle them.
+       (md_show_usage): Print them.
+       * doc/c-mips.texi: Document -mfix-vr4130 and -mno-fix-vr4130.
+
+2005-03-09  Richard Sandiford  <rsandifo@redhat.com>
+
        * config/tc-mips.c (append_insn): Remove cop_interlocks test from
        branch delay code.
 

diff --git a/gas/doc/c-mips.texi b/gas/doc/c-mips.texi
index b62b7eb..97469fe 100644 (file)
--- a/gas/doc/c-mips.texi
+++ b/gas/doc/c-mips.texi
@@ -129,6 +129,10 @@ Insert nops to work around certain VR4120 errata.  This option is
 intended to be used on GCC-generated code: it is not designed to catch
 all problems in hand-written assembler code.
 
+@item -mfix-vr4130
+@itemx -no-mfix-vr4130
+Insert nops to work around the VR4130 @samp{mflo}/@samp{mfhi} errata.
+
 @item -m4010
 @itemx -no-m4010
 Generate code for the LSI @sc{r4010} chip.  This tells the assembler to

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 793640d..d70409a 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2005-03-09  Richard Sandiford  <rsandifo@redhat.com>
 
+       * gas/mips/vr4130.[sd]: New test.
+       * gas/mips/mips.exp: Run it.
+
+2005-03-09  Richard Sandiford  <rsandifo@redhat.com>
+
        * gas/mips/relax-swap1-mips[12].d: Expect the delay slots of
        bc1f and bc1t to be filled.
        * gas/mips/branch-misc-3.[sd]: New test.

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 508fc80..8750878 100644 (file)
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -545,6 +545,7 @@ if { [istarget mips*-*-*] } then {
     run_dump_test "vr4111"
     run_dump_test "vr4120"
     run_dump_test "vr4120-2"
+    run_dump_test "vr4130"
     run_dump_test "vr5400"
     run_dump_test "vr5500"
     run_dump_test "rm7000"