diff options
| -rw-r--r-- | gas/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/testsuite/gas/tic6x/insns-c674x.d | 2 | ||||
| -rw-r--r-- | gas/testsuite/gas/tic6x/insns-c674x.s | 1 | ||||
| -rw-r--r-- | include/opcode/ChangeLog | 4 | ||||
| -rw-r--r-- | include/opcode/tic6x-insn-formats.h | 2 |
5 files changed, 12 insertions, 2 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 9b36f2a..111a118 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-04-21 Joseph Myers <joseph@codesourcery.com> + + * gas/tic6x/insns-c674x.s, gas/tic6x/insns-c674x.d: Also test + "b .S2 b3". + 2010-04-21 H.J. Lu <hongjiu.lu@intel.com> PR gas/11509 diff --git a/gas/testsuite/gas/tic6x/insns-c674x.d b/gas/testsuite/gas/tic6x/insns-c674x.d index 5970d54..9100a71 100644 --- a/gas/testsuite/gas/tic6x/insns-c674x.d +++ b/gas/testsuite/gas/tic6x/insns-c674x.d @@ -176,6 +176,7 @@ Disassembly of section \.text: [0-9a-f]+[048c] <[^>]*> 007744b2[ \t]+avgu4 \.M2 b26,b29,b0 [0-9a-f]+[048c] <[^>]*> a49874b2[ \t]+\[a2\] avgu4 \.M2X b3,a6,b9 [0-9a-f]+[048c] <[^>]*> 00100362[ \t]+b \.S2 b4 +[0-9a-f]+[048c] <[^>]*> 000c0362[ \t]+b \.S2 b3 [0-9a-f]+[048c] <[^>]*> 60101362[ \t]+\[b2\] b \.S2X a4 [0-9a-f]+[048c] <[^>]*> b0100362[ \t]+\[!a2\] b \.S2 b4 [0-9a-f]+[048c] <[^>]*> 00101362[ \t]+b \.S2X a4 @@ -1565,4 +1566,3 @@ Disassembly of section \.text: [0-9a-f]+[048c] <[^>]*> 74800042[ \t]+\[!b2\] mvk \.D2 0,b9 [0-9a-f]+[048c] <[^>]*> c5000028[ \t]+\[a0\] mvk \.S1 0,a10 [0-9a-f]+[048c] <[^>]*> 0580002a[ \t]+mvk \.S2 0,b11 -[0-9a-f]+[048c] <[^>]*> 00000000[ \t]+nop 1 diff --git a/gas/testsuite/gas/tic6x/insns-c674x.s b/gas/testsuite/gas/tic6x/insns-c674x.s index 8accee4..90a2b6d 100644 --- a/gas/testsuite/gas/tic6x/insns-c674x.s +++ b/gas/testsuite/gas/tic6x/insns-c674x.s @@ -173,6 +173,7 @@ f: avgu4 .M2 b26,b29,b0 [a2] avgu4 .M2X b3,a6,b9 b .S2 b4 + b .S2 b3 [b2] b .S2X a4 [!a2] call .S2 b4 call .S2X a4 diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index de8495d..915e2f7 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,3 +1,7 @@ +2010-04-21 Joseph Myers <joseph@codesourcery.com> + + * tic6x-insn-formats.h (s_branch): Correct typo in bitmask. + 2010-04-15 Nick Clifton <nickc@redhat.com> * alpha.h: Update copyright notice to use GPLv3. diff --git a/include/opcode/tic6x-insn-formats.h b/include/opcode/tic6x-insn-formats.h index 362dbb6..8ce2418 100644 --- a/include/opcode/tic6x-insn-formats.h +++ b/include/opcode/tic6x-insn-formats.h @@ -124,7 +124,7 @@ FMT(s_branch_nop_cst, 32, 0x120, 0x1ffc, CFLDS3(FLD(s, 1, 1), FLD(src1, 13, 3), FLD(src2, 16, 12))) FMT(s_branch_nop_reg, 32, 0x800360, 0xf830ffc, CFLDS4(FLD(s, 1, 1), FLD(x, 12, 1), FLD(src1, 13, 3), FLD(src2, 18, 5))) -FMT(s_branch, 32, 0x360, 0xf8feffc, +FMT(s_branch, 32, 0x360, 0xf83effc, CFLDS3(FLD(s, 1, 1), FLD(x, 12, 1), FLD(src2, 18, 5))) FMT(s_mvk, 32, 0x28, 0x3c, CFLDS4(FLD(s, 1, 1), FLD(h, 6, 1), FLD(cst, 7, 16), FLD(dst, 23, 5))) |