From 1103f72c0fdb73eeedc115a71cd0d03a31165b6a Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 7 Jul 2009 16:15:32 +0000 Subject: [PATCH] gas/ * config/tc-arm.c (insns): Fix encoding for torvsc. gas/testsuite/ * gas/arm/iwmmxt2.d: Fix insn pattern for torvsc, add patterns for waddsubhx. * gas/arm/iwmmxt2.s: Add tests for waddsubhx. opcodes/ * arm-dis.c (coprocessor_opcodes): Fix mask for waddbhus. --- gas/ChangeLog | 4 + gas/config/tc-arm.c | 6 +- gas/testsuite/ChangeLog | 6 + gas/testsuite/gas/arm/iwmmxt2.d | 188 ++++++++++++++++---------------- gas/testsuite/gas/arm/iwmmxt2.s | 5 + opcodes/ChangeLog | 4 + opcodes/arm-dis.c | 4 +- 7 files changed, 120 insertions(+), 97 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 4467287cbb..c73686f36e 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2009-07-07 Chung-Lin Tang + + * config/tc-arm.c (insns): Fix encoding for torvsc. + 2009-07-06 Dwarakanath Rajagopal * config/tc-i386.c (cpu_arch): Add .fma4 and CPU_FMA4_FLAGS. diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 99b6e41560..1dea7af13e 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -17442,9 +17442,9 @@ static const struct asm_opcode insns[] = #undef ARM_VARIANT #define ARM_VARIANT &arm_cext_iwmmxt2 /* Intel Wireless MMX technology, version 2. */ - cCE(torvscb, e13f190, 1, (RR), iwmmxt_tandorc), - cCE(torvsch, e53f190, 1, (RR), iwmmxt_tandorc), - cCE(torvscw, e93f190, 1, (RR), iwmmxt_tandorc), + cCE(torvscb, e12f190, 1, (RR), iwmmxt_tandorc), + cCE(torvsch, e52f190, 1, (RR), iwmmxt_tandorc), + cCE(torvscw, e92f190, 1, (RR), iwmmxt_tandorc), cCE(wabsb, e2001c0, 2, (RIWR, RIWR), rd_rn), cCE(wabsh, e6001c0, 2, (RIWR, RIWR), rd_rn), cCE(wabsw, ea001c0, 2, (RIWR, RIWR), rd_rn), diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index e2a4babbb7..7b7c8d3f8e 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2009-07-07 2009-07-04 Chung-Lin Tang + + * gas/arm/iwmmxt2.d: Fix insn pattern for torvsc, + add patterns for waddsubhx. + * gas/arm/iwmmxt2.s: Add tests for waddsubhx. + 2009-07-07 H.J. Lu * gas/i386/fma4.d: Append "#pass". diff --git a/gas/testsuite/gas/arm/iwmmxt2.d b/gas/testsuite/gas/arm/iwmmxt2.d index 7c1bbeb921..2388f05990 100644 --- a/gas/testsuite/gas/arm/iwmmxt2.d +++ b/gas/testsuite/gas/arm/iwmmxt2.d @@ -13,9 +13,9 @@ Disassembly of section .text: 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+020 <[^>]*> ce12f190[ ]+torvscbgt[ ]+pc +0+024 <[^>]*> 1e52f190[ ]+torvschne[ ]+pc +0+028 <[^>]*> 0e92f190[ ]+torvscweq[ ]+pc 0+02c <[^>]*> ee2211c0[ ]+wabsb[ ]+wr1, wr2 0+030 <[^>]*> ee6431c0[ ]+wabsh[ ]+wr3, wr4 0+034 <[^>]*> eea651c0[ ]+wabsw[ ]+wr5, wr6 @@ -28,92 +28,96 @@ Disassembly of section .text: 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 +0+05c <[^>]*> eea211a3[ ]+waddsubhx[ ]+wr1, wr2, wr3 +0+060 <[^>]*> bea541a6[ ]+waddsubhxlt[ ]+wr4, wr5, wr6 +0+064 <[^>]*> 0ea211a3[ ]+waddsubhxeq[ ]+wr1, wr2, wr3 +0+068 <[^>]*> cea541a6[ ]+waddsubhxgt[ ]+wr4, wr5, wr6 +0+06c <[^>]*> ee421003[ ]+wavg4[ ]+wr1, wr2, wr3 +0+070 <[^>]*> ce454006[ ]+wavg4gt[ ]+wr4, wr5, wr6 +0+074 <[^>]*> ee521003[ ]+wavg4r[ ]+wr1, wr2, wr3 +0+078 <[^>]*> ce554006[ ]+wavg4rgt[ ]+wr4, wr5, wr6 +0+07c <[^>]*> fc711102[ ]+wldrd[ ]+wr1, \[r1\], -r2 +0+080 <[^>]*> fc712132[ ]+wldrd[ ]+wr2, \[r1\], -r2, lsl #3 +0+084 <[^>]*> fcf13102[ ]+wldrd[ ]+wr3, \[r1\], \+r2 +0+088 <[^>]*> fcf14142[ ]+wldrd[ ]+wr4, \[r1\], \+r2, lsl #4 +0+08c <[^>]*> fd515102[ ]+wldrd[ ]+wr5, \[r1, -r2\] +0+090 <[^>]*> fd516132[ ]+wldrd[ ]+wr6, \[r1, -r2, lsl #3\] +0+094 <[^>]*> fdd17102[ ]+wldrd[ ]+wr7, \[r1, \+r2\] +0+098 <[^>]*> fdd18142[ ]+wldrd[ ]+wr8, \[r1, \+r2, lsl #4\] +0+09c <[^>]*> fd719102[ ]+wldrd[ ]+wr9, \[r1, -r2\]! +0+0a0 <[^>]*> fd71a132[ ]+wldrd[ ]+wr10, \[r1, -r2, lsl #3\]! +0+0a4 <[^>]*> fdf1b102[ ]+wldrd[ ]+wr11, \[r1, \+r2\]! +0+0a8 <[^>]*> fdf1c142[ ]+wldrd[ ]+wr12, \[r1, \+r2, lsl #4\]! +0+0ac <[^>]*> ee821083[ ]+wmerge[ ]+wr1, wr2, wr3, #4 +0+0b0 <[^>]*> ce821083[ ]+wmergegt[ ]+wr1, wr2, wr3, #4 +0+0b4 <[^>]*> 0e3210a3[ ]+wmiatteq[ ]+wr1, wr2, wr3 +0+0b8 <[^>]*> ce2210a3[ ]+wmiatbgt[ ]+wr1, wr2, wr3 +0+0bc <[^>]*> 1e1210a3[ ]+wmiabtne[ ]+wr1, wr2, wr3 +0+0c0 <[^>]*> ce0210a3[ ]+wmiabbgt[ ]+wr1, wr2, wr3 +0+0c4 <[^>]*> 0e7210a3[ ]+wmiattneq[ ]+wr1, wr2, wr3 +0+0c8 <[^>]*> 1e6210a3[ ]+wmiatbnne[ ]+wr1, wr2, wr3 +0+0cc <[^>]*> ce5210a3[ ]+wmiabtngt[ ]+wr1, wr2, wr3 +0+0d0 <[^>]*> 0e4210a3[ ]+wmiabbneq[ ]+wr1, wr2, wr3 +0+0d4 <[^>]*> 0eb21123[ ]+wmiawtteq[ ]+wr1, wr2, wr3 +0+0d8 <[^>]*> cea21123[ ]+wmiawtbgt[ ]+wr1, wr2, wr3 +0+0dc <[^>]*> 1e921123[ ]+wmiawbtne[ ]+wr1, wr2, wr3 +0+0e0 <[^>]*> ce821123[ ]+wmiawbbgt[ ]+wr1, wr2, wr3 +0+0e4 <[^>]*> 1ef21123[ ]+wmiawttnne[ ]+wr1, wr2, wr3 +0+0e8 <[^>]*> cee21123[ ]+wmiawtbngt[ ]+wr1, wr2, wr3 +0+0ec <[^>]*> 0ed21123[ ]+wmiawbtneq[ ]+wr1, wr2, wr3 +0+0f0 <[^>]*> 1ec21123[ ]+wmiawbbnne[ ]+wr1, wr2, wr3 +0+0f4 <[^>]*> 0ed210c3[ ]+wmulwumeq[ ]+wr1, wr2, wr3 +0+0f8 <[^>]*> cec210c3[ ]+wmulwumrgt[ ]+wr1, wr2, wr3 +0+0fc <[^>]*> 1ef210c3[ ]+wmulwsmne[ ]+wr1, wr2, wr3 +0+100 <[^>]*> 0ee210c3[ ]+wmulwsmreq[ ]+wr1, wr2, wr3 +0+104 <[^>]*> ceb210c3[ ]+wmulwlgt[ ]+wr1, wr2, wr3 +0+108 <[^>]*> aeb210c3[ ]+wmulwlge[ ]+wr1, wr2, wr3 +0+10c <[^>]*> 1eb210a3[ ]+wqmiattne[ ]+wr1, wr2, wr3 +0+110 <[^>]*> 0ef210a3[ ]+wqmiattneq[ ]+wr1, wr2, wr3 +0+114 <[^>]*> cea210a3[ ]+wqmiatbgt[ ]+wr1, wr2, wr3 +0+118 <[^>]*> aee210a3[ ]+wqmiatbnge[ ]+wr1, wr2, wr3 +0+11c <[^>]*> 1e9210a3[ ]+wqmiabtne[ ]+wr1, wr2, wr3 +0+120 <[^>]*> 0ed210a3[ ]+wqmiabtneq[ ]+wr1, wr2, wr3 +0+124 <[^>]*> ce8210a3[ ]+wqmiabbgt[ ]+wr1, wr2, wr3 +0+128 <[^>]*> 1ec210a3[ ]+wqmiabbnne[ ]+wr1, wr2, wr3 +0+12c <[^>]*> ce121083[ ]+wqmulmgt[ ]+wr1, wr2, wr3 +0+130 <[^>]*> 0e321083[ ]+wqmulmreq[ ]+wr1, wr2, wr3 +0+134 <[^>]*> cec210e3[ ]+wqmulwmgt[ ]+wr1, wr2, wr3 +0+138 <[^>]*> 0ee210e3[ ]+wqmulwmreq[ ]+wr1, wr2, wr3 +0+13c <[^>]*> fc611102[ ]+wstrd[ ]+wr1, \[r1\], -r2 +0+140 <[^>]*> fc612132[ ]+wstrd[ ]+wr2, \[r1\], -r2, lsl #3 +0+144 <[^>]*> fce13102[ ]+wstrd[ ]+wr3, \[r1\], \+r2 +0+148 <[^>]*> fce14142[ ]+wstrd[ ]+wr4, \[r1\], \+r2, lsl #4 +0+14c <[^>]*> fd415102[ ]+wstrd[ ]+wr5, \[r1, -r2\] +0+150 <[^>]*> fd416132[ ]+wstrd[ ]+wr6, \[r1, -r2, lsl #3\] +0+154 <[^>]*> fdc17102[ ]+wstrd[ ]+wr7, \[r1, \+r2\] +0+158 <[^>]*> fdc18142[ ]+wstrd[ ]+wr8, \[r1, \+r2, lsl #4\] +0+15c <[^>]*> fd619102[ ]+wstrd[ ]+wr9, \[r1, -r2\]! +0+160 <[^>]*> fd61a132[ ]+wstrd[ ]+wr10, \[r1, -r2, lsl #3\]! +0+164 <[^>]*> fde1b102[ ]+wstrd[ ]+wr11, \[r1, \+r2\]! +0+168 <[^>]*> fde1c142[ ]+wstrd[ ]+wr12, \[r1, \+r2, lsl #4\]! +0+16c <[^>]*> ced211c3[ ]+wsubaddhxgt[ ]+wr1, wr2, wr3 +0+170 <[^>]*> fe721140[ ]+wrorh[ ]+wr1, wr2, #16 +0+174 <[^>]*> feb21040[ ]+wrorw[ ]+wr1, wr2, #32 +0+178 <[^>]*> ee021002[ ]+wor[ ]+wr1, wr2, wr2 +0+17c <[^>]*> fe721145[ ]+wrorh[ ]+wr1, wr2, #21 +0+180 <[^>]*> feb2104d[ ]+wrorw[ ]+wr1, wr2, #13 +0+184 <[^>]*> fef2104e[ ]+wrord[ ]+wr1, wr2, #14 +0+188 <[^>]*> fe721140[ ]+wrorh[ ]+wr1, wr2, #16 +0+18c <[^>]*> feb21040[ ]+wrorw[ ]+wr1, wr2, #32 +0+190 <[^>]*> ee021002[ ]+wor[ ]+wr1, wr2, wr2 +0+194 <[^>]*> fe59204b[ ]+wsllh[ ]+wr2, wr9, #11 +0+198 <[^>]*> fe95304d[ ]+wsllw[ ]+wr3, wr5, #13 +0+19c <[^>]*> fed8304f[ ]+wslld[ ]+wr3, wr8, #15 +0+1a0 <[^>]*> fe721140[ ]+wrorh[ ]+wr1, wr2, #16 +0+1a4 <[^>]*> feb21040[ ]+wrorw[ ]+wr1, wr2, #32 +0+1a8 <[^>]*> ee021002[ ]+wor[ ]+wr1, wr2, wr2 +0+1ac <[^>]*> fe49204c[ ]+wsrah[ ]+wr2, wr9, #12 +0+1b0 <[^>]*> fe85304e[ ]+wsraw[ ]+wr3, wr5, #14 +0+1b4 <[^>]*> fec83140[ ]+wsrad[ ]+wr3, wr8, #16 +0+1b8 <[^>]*> fe721140[ ]+wrorh[ ]+wr1, wr2, #16 +0+1bc <[^>]*> feb21040[ ]+wrorw[ ]+wr1, wr2, #32 +0+1c0 <[^>]*> ee021002[ ]+wor[ ]+wr1, wr2, wr2 +0+1c4 <[^>]*> fe69204c[ ]+wsrlh[ ]+wr2, wr9, #12 +0+1c8 <[^>]*> fea5304e[ ]+wsrlw[ ]+wr3, wr5, #14 +0+1cc <[^>]*> fee83140[ ]+wsrld[ ]+wr3, wr8, #16 diff --git a/gas/testsuite/gas/arm/iwmmxt2.s b/gas/testsuite/gas/arm/iwmmxt2.s index 314f64f11e..801166d36f 100644 --- a/gas/testsuite/gas/arm/iwmmxt2.s +++ b/gas/testsuite/gas/arm/iwmmxt2.s @@ -32,6 +32,11 @@ iwmmxt2: waddbhusmgt wr1, wr2, wr3 waddbhuslgt wr4, wr5, wr6 + waddsubhx wr1, wr2, wr3 + waddsubhxlt wr4, wr5, wr6 + waddsubhxeq wr1, wr2, wr3 + waddsubhxgt wr4, wr5, wr6 + wavg4 wr1, wr2, wr3 wavg4gt wr4, wr5, wr6 wavg4r wr1, wr2, wr3 diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index b3b9fa8bbd..a85d11b453 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2009-07-07 Chung-Lin Tang + + * arm-dis.c (coprocessor_opcodes): Fix mask for waddbhus. + 2009-07-07 Nick Clifton PR 10288 diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c index 61bf91d118..13f9e1e3d5 100644 --- a/opcodes/arm-dis.c +++ b/opcodes/arm-dis.c @@ -142,11 +142,11 @@ static const struct opcode32 coprocessor_opcodes[] = {ARM_CEXT_XSCALE, 0x0e100110, 0x0ff00ff0, "tmrc%c\t%12-15r, %16-19G"}, {ARM_CEXT_XSCALE, 0x0c500000, 0x0ff00ff0, "tmrrc%c\t%12-15r, %16-19r, %0-3g"}, {ARM_CEXT_XSCALE, 0x0e130150, 0x0f3f0fff, "torc%22-23w%c\t%12-15r"}, - {ARM_CEXT_XSCALE, 0x0e130190, 0x0f3f0fff, "torvsc%22-23w%c\t%12-15r"}, + {ARM_CEXT_XSCALE, 0x0e120190, 0x0f3f0fff, "torvsc%22-23w%c\t%12-15r"}, {ARM_CEXT_XSCALE, 0x0e2001c0, 0x0f300fff, "wabs%22-23w%c\t%12-15g, %16-19g"}, {ARM_CEXT_XSCALE, 0x0e0001c0, 0x0f300fff, "wacc%22-23w%c\t%12-15g, %16-19g"}, {ARM_CEXT_XSCALE, 0x0e000180, 0x0f000ff0, "wadd%20-23w%c\t%12-15g, %16-19g, %0-3g"}, - {ARM_CEXT_XSCALE, 0x0e2001a0, 0x0f300ff0, "waddbhus%22?ml%c\t%12-15g, %16-19g, %0-3g"}, + {ARM_CEXT_XSCALE, 0x0e2001a0, 0x0fb00ff0, "waddbhus%22?ml%c\t%12-15g, %16-19g, %0-3g"}, {ARM_CEXT_XSCALE, 0x0ea001a0, 0x0ff00ff0, "waddsubhx%c\t%12-15g, %16-19g, %0-3g"}, {ARM_CEXT_XSCALE, 0x0e000020, 0x0f800ff0, "waligni%c\t%12-15g, %16-19g, %0-3g, #%20-22d"}, {ARM_CEXT_XSCALE, 0x0e800020, 0x0fc00ff0, "walignr%20-21d%c\t%12-15g, %16-19g, %0-3g"},