2010-10-04 David Daney <ddaney@caviumnetworks.com>

	* config/tc-mips.c (mips_fix_cn63xxp1): New variable.
	(mips_ip):  Add errata work around when mips_fix_cn63xxp1 set.
	(OPTION_FIX_CN63XXP1, OPTION_NO_FIX_CN63XXP1): New enum options
	enumerations.
	(md_longopts): Add options for -mfix-cn63xxp1 and -mno-fix-cn63xxp1.
	(md_parse_option): Handle OPTION_FIX_CN63XXP1 and
	OPTION_NO_FIX_CN63XXP1.
	(md_show_usage): Add documentation for -mfix-cn63xxp1.
	* doc/c-mips.texi (-mfix-cn63xxp1, -mno-fix-cn63xxp1): Document
	the new options.

2010-10-04  David Daney  <ddaney@caviumnetworks.com>

	* gas/mips/mips.exp (octeon-pref): Run the new test.
	* gas/mips/octeon-pref.s: New test.
	* gas/mips/octeon-pref.d: New expected results for the new test.

4 files changed, 85 insertions, 0 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 671cc03..8d2f852 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-04  David Daney  <ddaney@caviumnetworks.com>
+
+	* gas/mips/mips.exp (octeon-pref): Run the new test.
+	* gas/mips/octeon-pref.s: New test.
+	* gas/mips/octeon-pref.d: New expected results for the new test.
+
 2010-09-29  Alan Modra  <amodra@gmail.com>
 
 	* gas/all/fwdexp.d, * gas/all/fwdexp.s: New test.
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 34fd01a..024e404 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -831,6 +831,7 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test_arches "octeon"	[mips_arch_list_matching octeon]
     run_list_test_arches "octeon-ill" "" \
 					[mips_arch_list_matching octeon]
+    run_dump_test_arches "octeon-pref"	[mips_arch_list_matching octeon]
 
     run_dump_test "smartmips"
     run_dump_test "mips32-dsp"
diff --git a/gas/testsuite/gas/mips/octeon-pref.d b/gas/testsuite/gas/mips/octeon-pref.d
new file mode 100644
index 0000000..6dcb184
--- /dev/null
+++ b/gas/testsuite/gas/mips/octeon-pref.d
@@ -0,0 +1,42 @@
+#as: -march=octeon -64 -mfix-cn63xxp1
+#objdump: -M reg-names=numeric -dr
+#name: MIPS octeon-pref mfix-cn63xxp1
+
+.*:     file format .*
+
+Disassembly of section .text:
+
+[0-9a-f]+ <foo>:
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc050000 	pref	0x5,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc190000 	pref	0x19,0\(\$0\)
+.*:	cc1a0000 	pref	0x1a,0\(\$0\)
+.*:	cc1b0000 	pref	0x1b,0\(\$0\)
+.*:	cc1c0000 	pref	0x1c,0\(\$0\)
+.*:	cc1d0000 	pref	0x1d,0\(\$0\)
+.*:	cc1e0000 	pref	0x1e,0\(\$0\)
+.*:	cc1f0000 	pref	0x1f,0\(\$0\)
+#pass
diff --git a/gas/testsuite/gas/mips/octeon-pref.s b/gas/testsuite/gas/mips/octeon-pref.s
new file mode 100644
index 0000000..dcdb7d0
--- /dev/null
+++ b/gas/testsuite/gas/mips/octeon-pref.s
@@ -0,0 +1,36 @@
+	.text
+	.set noreorder
+
+foo:
+	pref 0,0($0)
+	pref 1,0($0)
+	pref 2,0($0)
+	pref 3,0($0)
+	pref 4,0($0)
+	pref 5,0($0)
+	pref 6,0($0)
+	pref 7,0($0)
+	pref 8,0($0)
+	pref 9,0($0)
+	pref 10,0($0)
+	pref 11,0($0)
+	pref 12,0($0)
+	pref 13,0($0)
+	pref 14,0($0)
+	pref 15,0($0)
+	pref 16,0($0)
+	pref 17,0($0)
+	pref 18,0($0)
+	pref 19,0($0)
+	pref 20,0($0)
+	pref 21,0($0)
+	pref 22,0($0)
+	pref 23,0($0)
+	pref 24,0($0)
+	pref 25,0($0)
+	pref 26,0($0)
+	pref 27,0($0)
+	pref 28,0($0)
+	pref 29,0($0)
+	pref 30,0($0)
+	pref 31,0($0)