diff --git a/gas/ChangeLog b/gas/ChangeLog index eab1325c15..9148613210 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2011-07-26 Kazuhiro Inaoka + + * config/tc-rx.c (md_convert_frag): Fix encoding of beq.a + synthetic instruction. + 2011-07-25 Tristan Gingold * frags.c (frag_grow): Simplify the code. diff --git a/gas/config/tc-rx.c b/gas/config/tc-rx.c index 3daa7df4a8..56cda15417 100644 --- a/gas/config/tc-rx.c +++ b/gas/config/tc-rx.c @@ -1701,7 +1701,7 @@ md_convert_frag (bfd * abfd ATTRIBUTE_UNUSED, reloc_adjust = 1; break; case OPCODE (OT_beq, 5): /* BEQ.A - synthetic. */ - op[0] = 0x1e; /* bne.s .+4. */ + op[0] = 0x1d; /* bne.s .+5. */ op[1] = 0x04; /* bra.a dsp:24. */ disp -= 1; #if RX_OPCODE_BIG_ENDIAN @@ -1739,7 +1739,7 @@ md_convert_frag (bfd * abfd ATTRIBUTE_UNUSED, reloc_adjust = 1; break; case OPCODE (OT_bne, 5): /* BNE.A - synthetic. */ - op[0] = 0x15; /* beq.s .+4. */ + op[0] = 0x15; /* beq.s .+5. */ op[1] = 0x04; /* bra.a dsp:24. */ disp -= 1; #if RX_OPCODE_BIG_ENDIAN diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 1bbbf615dd..a4ad91bdb7 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-07-26 Kazuhiro Inaoka + + * gas/rx/r-bcc.d: Update expected disassembly of synthetic beq.a + instruction. + 2011-07-24 Maciej W. Rozycki Chao-ying Fu Richard Sandiford diff --git a/gas/testsuite/gas/rx/r-bcc.d b/gas/testsuite/gas/rx/r-bcc.d index 672a52a189..be79f39ba8 100644 --- a/gas/testsuite/gas/rx/r-bcc.d +++ b/gas/testsuite/gas/rx/r-bcc.d @@ -8,7 +8,7 @@ Disassembly of section \.text: 00000000 : 0: 20 32 beq\.b 32 2: 3a 86 13 beq\.w 1388 - 5: 1e bne\.s b + 5: 1d bne\.s a 6: 04 1a a1 07 bra\.a 7a120 0000000a :