bfd/

2006-09-26  Mark Shinwell  <shinwell@codesourcery.com>
            Joseph Myers  <joseph@codesourcery.com>
            Ian Lance Taylor  <ian@wasabisystems.com>
            Ben Elliston  <bje@wasabisystems.com>

	* archures.c: Add definition for bfd_mach_arm_iWMMXt2.
	* cpu-arm.c (processors): Add bfd_mach_arm_iWMMXt2.
	(arch_info_struct, bfd_arm_update_notes): Likewise.
	(architectures): Likewise.
	(bfd_arm_merge_machines): Check for iWMMXt2.
	* bfd-in2.h: Rebuild.

gas/
2006-09-26  Mark Shinwell  <shinwell@codesourcery.com>
            Joseph Myers  <joseph@codesourcery.com>
            Ian Lance Taylor  <ian@wasabisystems.com>
            Ben Elliston  <bje@wasabisystems.com>

	* config/tc-arm.c (arm_cext_iwmmxt2): New.
	(enum operand_parse_code): New code OP_RIWR_I32z.
	(parse_operands): Handle OP_RIWR_I32z.
	(do_iwmmxt_wmerge): New function.
	(do_iwmmxt_wldstd): Handle iwmmxt2 case where second operand is
	a register.
	(do_iwmmxt_wrwrwr_or_imm5): New function.
	(insns): Mark instructions as RIWR_I32z as appropriate.
	Also add torvsc<b,h,w>, wabs<b,h,w>, wabsdiff<b,h,w>,
	waddbhus<l,m>, waddhc, waddwc, waddsubhx, wavg4{r}, wmaddu{x,n},
	wmadds{x,n}, wmerge, wmiaxy{n}, wmiawxy{n}, wmul<sm,um>{r},
	wmulw<um,sm,l>{r}, wqmiaxy{n}, wqmulm{r}, wqmulwm{r}, wsubaddhx.
	(md_begin): Handle IWMMXT2.
	(arm_cpus): Add iwmmxt2.
	(arm_extensions): Likewise.
	(arm_archs): Likewise.

gas/testsuite/
2006-09-26  Mark Shinwell  <shinwell@codesourcery.com>
            Joseph Myers  <joseph@codesourcery.com>
            Ian Lance Taylor  <ian@wasabisystems.com>
            Ben Elliston  <bje@wasabisystems.com>

	* gas/arm/iwmmxt2.s: New file.
	* gas/arm/iwmmxt2.d: New file.

include/opcode/
2006-09-26  Mark Shinwell  <shinwell@codesourcery.com>
            Joseph Myers  <joseph@codesourcery.com>
            Ian Lance Taylor  <ian@wasabisystems.com>
            Ben Elliston  <bje@wasabisystems.com>

	* arm.h (ARM_CEXT_IWMMXT2, ARM_ARCH_IWMMXT2): Define.

opcodes/
2006-09-26  Mark Shinwell  <shinwell@codesourcery.com>
            Joseph Myers  <joseph@codesourcery.com>
            Ian Lance Taylor  <ian@wasabisystems.com>
            Ben Elliston  <bje@wasabisystems.com>

	* arm-dis.c (coprocessor_opcodes): The X-qualifier to WMADD may
	only be used with the default multiply-add operation, so if N is
	set, don't bother printing X.  Add new iwmmxt instructions.
	(IWMMXT_INSN_COUNT): Update.
	(iwmmxt_wwssnames): Qualify "wwss" names at index 2, 6, 10 and 14
	with a 'c' suffix.
	(print_insn_coprocessor): Check for iWMMXt2.  Handle format
	specifiers 'r', 'i'.

3 files changed, 264 insertions, 0 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index fe1f119..756f463 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-26  Mark Shinwell  <shinwell@codesourcery.com>
+            Joseph Myers  <joseph@codesourcery.com>
+            Ian Lance Taylor  <ian@wasabisystems.com>
+            Ben Elliston  <bje@wasabisystems.com>
+
+	* gas/arm/iwmmxt2.s: New file.
+	* gas/arm/iwmmxt2.d: New file.
+
 2006-09-23  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutils/3235
diff --git a/gas/testsuite/gas/arm/iwmmxt2.d b/gas/testsuite/gas/arm/iwmmxt2.d
new file mode 100644
index 0000000..7c1bbeb
--- /dev/null
+++ b/gas/testsuite/gas/arm/iwmmxt2.d
@@ -0,0 +1,119 @@
+#objdump: -dr --prefix-addresses --show-raw-insn -miwmmxt
+#name: Intel(r) Wireless MMX(tm) technology instructions version 2
+#as: -mcpu=xscale+iwmmxt+iwmmxt2 -EL
+
+.*: +file format .*arm.*
+
+Disassembly of section .text:
+0+000 <iwmmxt2> ee654186[ 	]+waddhc[ 	]+wr4, wr5, wr6
+0+004 <[^>]*> eea87189[ 	]+waddwc[ 	]+wr7, wr8, wr9
+0+008 <[^>]*> ce954106[ 	]+wmadduxgt[ 	]+wr4, wr5, wr6
+0+00c <[^>]*> 0ec87109[ 	]+wmadduneq[ 	]+wr7, wr8, wr9
+0+010 <[^>]*> 1eb54106[ 	]+wmaddsxne[ 	]+wr4, wr5, wr6
+0+014 <[^>]*> aee87109[ 	]+wmaddsnge[ 	]+wr7, wr8, wr9
+0+018 <[^>]*> eed21103[ 	]+wmulumr[ 	]+wr1, wr2, wr3
+0+01c <[^>]*> eef21103[ 	]+wmulsmr[ 	]+wr1, wr2, wr3
+0+020 <[^>]*> ce13f190[ 	]+torvscbgt[ 	]+pc
+0+024 <[^>]*> 1e53f190[ 	]+torvschne[ 	]+pc
+0+028 <[^>]*> 0e93f190[ 	]+torvscweq[ 	]+pc
+0+02c <[^>]*> ee2211c0[ 	]+wabsb[ 	]+wr1, wr2
+0+030 <[^>]*> ee6431c0[ 	]+wabsh[ 	]+wr3, wr4
+0+034 <[^>]*> eea651c0[ 	]+wabsw[ 	]+wr5, wr6
+0+038 <[^>]*> ce2211c0[ 	]+wabsbgt[ 	]+wr1, wr2
+0+03c <[^>]*> ee1211c3[ 	]+wabsdiffb[ 	]+wr1, wr2, wr3
+0+040 <[^>]*> ee5541c6[ 	]+wabsdiffh[ 	]+wr4, wr5, wr6
+0+044 <[^>]*> ee9871c9[ 	]+wabsdiffw[ 	]+wr7, wr8, wr9
+0+048 <[^>]*> ce1211c3[ 	]+wabsdiffbgt[ 	]+wr1, wr2, wr3
+0+04c <[^>]*> ee6211a3[ 	]+waddbhusm[ 	]+wr1, wr2, wr3
+0+050 <[^>]*> ee2541a6[ 	]+waddbhusl[ 	]+wr4, wr5, wr6
+0+054 <[^>]*> ce6211a3[ 	]+waddbhusmgt[ 	]+wr1, wr2, wr3
+0+058 <[^>]*> ce2541a6[ 	]+waddbhuslgt[ 	]+wr4, wr5, wr6
+0+05c <[^>]*> ee421003[ 	]+wavg4[ 	]+wr1, wr2, wr3
+0+060 <[^>]*> ce454006[ 	]+wavg4gt[ 	]+wr4, wr5, wr6
+0+064 <[^>]*> ee521003[ 	]+wavg4r[ 	]+wr1, wr2, wr3
+0+068 <[^>]*> ce554006[ 	]+wavg4rgt[ 	]+wr4, wr5, wr6
+0+06c <[^>]*> fc711102[ 	]+wldrd[ 	]+wr1, \[r1\], -r2
+0+070 <[^>]*> fc712132[ 	]+wldrd[ 	]+wr2, \[r1\], -r2, lsl #3
+0+074 <[^>]*> fcf13102[ 	]+wldrd[ 	]+wr3, \[r1\], \+r2
+0+078 <[^>]*> fcf14142[ 	]+wldrd[ 	]+wr4, \[r1\], \+r2, lsl #4
+0+07c <[^>]*> fd515102[ 	]+wldrd[ 	]+wr5, \[r1, -r2\]
+0+080 <[^>]*> fd516132[ 	]+wldrd[ 	]+wr6, \[r1, -r2, lsl #3\]
+0+084 <[^>]*> fdd17102[ 	]+wldrd[ 	]wr7, \[r1, \+r2\]
+0+088 <[^>]*> fdd18142[ 	]+wldrd[ 	]wr8, \[r1, \+r2, lsl #4\]
+0+08c <[^>]*> fd719102[ 	]+wldrd[ 	]wr9, \[r1, -r2\]!
+0+090 <[^>]*> fd71a132[ 	]+wldrd[ 	]wr10, \[r1, -r2, lsl #3\]!
+0+094 <[^>]*> fdf1b102[ 	]+wldrd[ 	]wr11, \[r1, \+r2\]!
+0+098 <[^>]*> fdf1c142[ 	]+wldrd[ 	]wr12, \[r1, \+r2, lsl #4\]!
+0+09c <[^>]*> ee821083[ 	]+wmerge[ 	]wr1, wr2, wr3, #4
+0+0a0 <[^>]*> ce821083[ 	]+wmergegt[ 	]wr1, wr2, wr3, #4
+0+0a4 <[^>]*> 0e3210a3[ 	]+wmiatteq[ 	]wr1, wr2, wr3
+0+0a8 <[^>]*> ce2210a3[ 	]+wmiatbgt[ 	]wr1, wr2, wr3
+0+0ac <[^>]*> 1e1210a3[ 	]+wmiabtne[ 	]wr1, wr2, wr3
+0+0b0 <[^>]*> ce0210a3[ 	]+wmiabbgt[ 	]wr1, wr2, wr3
+0+0b4 <[^>]*> 0e7210a3[ 	]+wmiattneq[ 	]wr1, wr2, wr3
+0+0b8 <[^>]*> 1e6210a3[ 	]+wmiatbnne[ 	]wr1, wr2, wr3
+0+0bc <[^>]*> ce5210a3[ 	]+wmiabtngt[ 	]wr1, wr2, wr3
+0+0c0 <[^>]*> 0e4210a3[ 	]+wmiabbneq[ 	]wr1, wr2, wr3
+0+0c4 <[^>]*> 0eb21123[ 	]+wmiawtteq[ 	]wr1, wr2, wr3
+0+0c8 <[^>]*> cea21123[ 	]+wmiawtbgt[ 	]wr1, wr2, wr3
+0+0cc <[^>]*> 1e921123[ 	]+wmiawbtne[ 	]wr1, wr2, wr3
+0+0d0 <[^>]*> ce821123[ 	]+wmiawbbgt[ 	]wr1, wr2, wr3
+0+0d4 <[^>]*> 1ef21123[ 	]+wmiawttnne[ 	]wr1, wr2, wr3
+0+0d8 <[^>]*> cee21123[ 	]+wmiawtbngt[ 	]wr1, wr2, wr3
+0+0dc <[^>]*> 0ed21123[ 	]+wmiawbtneq[ 	]wr1, wr2, wr3
+0+0e0 <[^>]*> 1ec21123[ 	]+wmiawbbnne[ 	]wr1, wr2, wr3
+0+0e4 <[^>]*> 0ed210c3[ 	]+wmulwumeq[ 	]wr1, wr2, wr3
+0+0e8 <[^>]*> cec210c3[ 	]+wmulwumrgt[ 	]wr1, wr2, wr3
+0+0ec <[^>]*> 1ef210c3[ 	]+wmulwsmne[ 	]wr1, wr2, wr3
+0+0f0 <[^>]*> 0ee210c3[ 	]+wmulwsmreq[ 	]wr1, wr2, wr3
+0+0f4 <[^>]*> ceb210c3[ 	]+wmulwlgt[ 	]wr1, wr2, wr3
+0+0f8 <[^>]*> aeb210c3[ 	]+wmulwlge[ 	]wr1, wr2, wr3
+0+0fc <[^>]*> 1eb210a3[ 	]+wqmiattne[ 	]wr1, wr2, wr3
+0+100 <[^>]*> 0ef210a3[ 	]+wqmiattneq[ 	]wr1, wr2, wr3
+0+104 <[^>]*> cea210a3[ 	]+wqmiatbgt[ 	]wr1, wr2, wr3
+0+108 <[^>]*> aee210a3[ 	]+wqmiatbnge[ 	]wr1, wr2, wr3
+0+10c <[^>]*> 1e9210a3[ 	]+wqmiabtne[ 	]wr1, wr2, wr3
+0+110 <[^>]*> 0ed210a3[ 	]+wqmiabtneq[ 	]wr1, wr2, wr3
+0+114 <[^>]*> ce8210a3[ 	]+wqmiabbgt[ 	]wr1, wr2, wr3
+0+118 <[^>]*> 1ec210a3[ 	]+wqmiabbnne[ 	]wr1, wr2, wr3
+0+11c <[^>]*> ce121083[ 	]+wqmulmgt[ 	]wr1, wr2, wr3
+0+120 <[^>]*> 0e321083[ 	]+wqmulmreq[ 	]wr1, wr2, wr3
+0+124 <[^>]*> cec210e3[ 	]+wqmulwmgt[ 	]wr1, wr2, wr3
+0+128 <[^>]*> 0ee210e3[ 	]+wqmulwmreq[ 	]wr1, wr2, wr3
+0+12c <[^>]*> fc611102[ 	]+wstrd[ 	]+wr1, \[r1\], -r2
+0+130 <[^>]*> fc612132[ 	]+wstrd[ 	]+wr2, \[r1\], -r2, lsl #3
+0+134 <[^>]*> fce13102[ 	]+wstrd[ 	]+wr3, \[r1\], \+r2
+0+138 <[^>]*> fce14142[ 	]+wstrd[ 	]+wr4, \[r1\], \+r2, lsl #4
+0+13c <[^>]*> fd415102[ 	]+wstrd[ 	]+wr5, \[r1, -r2\]
+0+140 <[^>]*> fd416132[ 	]+wstrd[ 	]+wr6, \[r1, -r2, lsl #3\]
+0+144 <[^>]*> fdc17102[ 	]+wstrd[ 	]wr7, \[r1, \+r2\]
+0+148 <[^>]*> fdc18142[ 	]+wstrd[ 	]wr8, \[r1, \+r2, lsl #4\]
+0+14c <[^>]*> fd619102[ 	]+wstrd[ 	]wr9, \[r1, -r2\]!
+0+150 <[^>]*> fd61a132[ 	]+wstrd[ 	]wr10, \[r1, -r2, lsl #3\]!
+0+154 <[^>]*> fde1b102[ 	]+wstrd[ 	]wr11, \[r1, \+r2\]!
+0+158 <[^>]*> fde1c142[ 	]+wstrd[ 	]wr12, \[r1, \+r2, lsl #4\]!
+0+15c <[^>]*> ced211c3[ 	]+wsubaddhxgt[ 	]wr1, wr2, wr3
+0+160 <[^>]*> fe721140[ 	]+wrorh[ 	]wr1, wr2, #16
+0+164 <[^>]*> feb21040[ 	]+wrorw[ 	]wr1, wr2, #32
+0+168 <[^>]*> ee021002[ 	]+wor[ 	]wr1, wr2, wr2
+0+16c <[^>]*> fe721145[ 	]+wrorh[ 	]wr1, wr2, #21
+0+170 <[^>]*> feb2104d[ 	]+wrorw[ 	]wr1, wr2, #13
+0+174 <[^>]*> fef2104e[ 	]+wrord[ 	]wr1, wr2, #14
+0+178 <[^>]*> fe721140[ 	]+wrorh[ 	]wr1, wr2, #16
+0+17c <[^>]*> feb21040[ 	]+wrorw[ 	]wr1, wr2, #32
+0+180 <[^>]*> ee021002[ 	]+wor[ 	]wr1, wr2, wr2
+0+184 <[^>]*> fe59204b[ 	]+wsllh[ 	]wr2, wr9, #11
+0+188 <[^>]*> fe95304d[ 	]+wsllw[ 	]wr3, wr5, #13
+0+18c <[^>]*> fed8304f[ 	]+wslld[ 	]wr3, wr8, #15
+0+190 <[^>]*> fe721140[ 	]+wrorh[ 	]wr1, wr2, #16
+0+194 <[^>]*> feb21040[ 	]+wrorw[ 	]wr1, wr2, #32
+0+198 <[^>]*> ee021002[ 	]+wor[ 	]wr1, wr2, wr2
+0+19c <[^>]*> fe49204c[ 	]+wsrah[ 	]wr2, wr9, #12
+0+1a0 <[^>]*> fe85304e[ 	]+wsraw[ 	]wr3, wr5, #14
+0+1a4 <[^>]*> fec83140[ 	]+wsrad[ 	]wr3, wr8, #16
+0+1a8 <[^>]*> fe721140[ 	]+wrorh[ 	]wr1, wr2, #16
+0+1ac <[^>]*> feb21040[ 	]+wrorw[ 	]wr1, wr2, #32
+0+1b0 <[^>]*> ee021002[ 	]+wor[ 	]wr1, wr2, wr2
+0+1b4 <[^>]*> fe69204c[ 	]+wsrlh[ 	]wr2, wr9, #12
+0+1b8 <[^>]*> fea5304e[ 	]+wsrlw[ 	]wr3, wr5, #14
+0+1bc <[^>]*> fee83140[ 	]+wsrld[ 	]wr3, wr8, #16
diff --git a/gas/testsuite/gas/arm/iwmmxt2.s b/gas/testsuite/gas/arm/iwmmxt2.s
new file mode 100644
index 0000000..314f64f
--- /dev/null
+++ b/gas/testsuite/gas/arm/iwmmxt2.s
@@ -0,0 +1,137 @@
+	.text
+	.global iwmmxt2
+iwmmxt2:
+
+	waddhc		wr4, wr5, wr6
+	waddwc		wr7, wr8, wr9
+
+	wmadduxgt	wr4, wr5, wr6
+	wmadduneq	wr7, wr8, wr9
+	wmaddsxne	wr4, wr5, wr6
+	wmaddsnge	wr7, wr8, wr9
+
+	wmulumr		wr1, wr2, wr3
+	wmulsmr		wr1, wr2, wr3
+
+	torvscbgt	r15
+	torvschne	r15
+	torvscweq	r15
+
+	wabsb		wr1, wr2
+	wabsh		wr3, wr4
+	wabsw		wr5, wr6
+	wabsbgt		wr1, wr2
+
+	wabsdiffb	wr1, wr2, wr3
+	wabsdiffh	wr4, wr5, wr6
+	wabsdiffw	wr7, wr8, wr9
+	wabsdiffbgt	wr1, wr2, wr3
+
+	waddbhusm	wr1, wr2, wr3
+	waddbhusl	wr4, wr5, wr6
+	waddbhusmgt	wr1, wr2, wr3
+	waddbhuslgt	wr4, wr5, wr6
+
+	wavg4		wr1, wr2, wr3
+	wavg4gt		wr4, wr5, wr6
+	wavg4r		wr1, wr2, wr3
+	wavg4rgt	wr4, wr5, wr6
+
+	wldrd		wr1, [r1], -r2
+	wldrd		wr2, [r1], -r2,lsl #3
+	wldrd		wr3, [r1], +r2
+	wldrd		wr4, [r1], +r2,lsl #4
+	wldrd		wr5, [r1, -r2]
+	wldrd		wr6, [r1, -r2,lsl #3]
+	wldrd		wr7, [r1, +r2]
+	wldrd		wr8, [r1, +r2,lsl #4]
+	wldrd		wr9, [r1, -r2]!
+	wldrd		wr10, [r1, -r2,lsl #3]!
+	wldrd		wr11, [r1, +r2]!
+	wldrd		wr12, [r1, +r2,lsl #4]!
+
+	wmerge		wr1, wr2, wr3, #4
+	wmergegt	wr1, wr2, wr3, #4
+
+	wmiatteq	wr1, wr2, wr3
+	wmiatbgt	wr1, wr2, wr3
+	wmiabtne	wr1, wr2, wr3
+	wmiabbgt	wr1, wr2, wr3
+	wmiattneq	wr1, wr2, wr3
+	wmiatbnne	wr1, wr2, wr3
+	wmiabtngt	wr1, wr2, wr3
+	wmiabbneq	wr1, wr2, wr3
+
+	wmiawtteq	wr1, wr2, wr3
+	wmiawtbgt	wr1, wr2, wr3
+	wmiawbtne	wr1, wr2, wr3
+	wmiawbbgt	wr1, wr2, wr3
+	wmiawttnne	wr1, wr2, wr3
+	wmiawtbngt	wr1, wr2, wr3
+	wmiawbtneq	wr1, wr2, wr3
+	wmiawbbnne	wr1, wr2, wr3
+
+	wmulwumeq	wr1, wr2, wr3
+	wmulwumrgt	wr1, wr2, wr3
+	wmulwsmne	wr1, wr2, wr3
+	wmulwsmreq	wr1, wr2, wr3
+	wmulwlgt	wr1, wr2, wr3
+	wmulwlge	wr1, wr2, wr3
+
+	wqmiattne	wr1, wr2, wr3
+	wqmiattneq	wr1, wr2, wr3
+	wqmiatbgt	wr1, wr2, wr3
+	wqmiatbnge	wr1, wr2, wr3
+	wqmiabtne	wr1, wr2, wr3
+	wqmiabtneq	wr1, wr2, wr3
+	wqmiabbgt	wr1, wr2, wr3
+	wqmiabbnne	wr1, wr2, wr3
+
+	wqmulmgt	wr1, wr2, wr3
+	wqmulmreq	wr1, wr2, wr3
+
+	wqmulwmgt	wr1, wr2, wr3
+	wqmulwmreq	wr1, wr2, wr3
+
+	wstrd		wr1, [r1], -r2
+	wstrd		wr2, [r1], -r2,lsl #3
+	wstrd		wr3, [r1], +r2
+	wstrd		wr4, [r1], +r2,lsl #4
+	wstrd		wr5, [r1, -r2]
+	wstrd		wr6, [r1, -r2,lsl #3]
+	wstrd		wr7, [r1, +r2]
+	wstrd		wr8, [r1, +r2,lsl #4]
+	wstrd		wr9, [r1, -r2]!
+	wstrd		wr10, [r1, -r2,lsl #3]!
+	wstrd		wr11, [r1, +r2]!
+	wstrd		wr12, [r1, +r2,lsl #4]!
+
+	wsubaddhxgt	wr1, wr2, wr3
+
+	wrorh		wr1, wr2, #0
+	wrorw		wr1, wr2, #0
+	wrord		wr1, wr2, #0
+	wrorh		wr1, wr2, #21
+	wrorw		wr1, wr2, #13
+	wrord		wr1, wr2, #14
+
+	wsllh		wr1, wr2, #0
+	wsllw		wr1, wr2, #0
+	wslld		wr1, wr2, #0
+	wsllh		wr2, wr9, #11
+	wsllw		wr3, wr5, #13
+	wslld		wr3, wr8, #15
+
+	wsrah		wr1, wr2, #0
+	wsraw		wr1, wr2, #0
+	wsrad		wr1, wr2, #0
+	wsrah		wr2, wr9, #12
+	wsraw		wr3, wr5, #14
+	wsrad		wr3, wr8, #16
+
+	wsrlh		wr1, wr2, #0
+	wsrlw		wr1, wr2, #0
+	wsrld		wr1, wr2, #0
+	wsrlh		wr2, wr9, #12
+	wsrlw		wr3, wr5, #14
+	wsrld		wr3, wr8, #16