* config/tc-rx.c (md_convert_frag): Fix encoding of beq.a

	synthetic instruction.

	* gas/rx/r-bcc.d: Update expected disassembly of synthetic beq.a
	instruction.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index eab1325c1520155866ceb6b88845cedf45236152..9148613210c948063966919342eadd6c091c7cb4 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-26  Kazuhiro Inaoka  <kazuhiro.inaoka.ud@renesas.com>
+
+       * config/tc-rx.c (md_convert_frag): Fix encoding of beq.a
+       synthetic instruction.
+
 2011-07-25  Tristan Gingold  <gingold@adacore.com>
 
        * frags.c (frag_grow): Simplify the code.

diff --git a/gas/config/tc-rx.c b/gas/config/tc-rx.c
index 3daa7df4a857790783fa2f4137d26f9f76831f39..56cda15417386a4a39aed62f22e1bd2167f3f085 100644 (file)
--- 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 1bbbf615ddaf6139324ec0a940019b2e2455f1b8..a4ad91bdb702d20c96e76c26ca7142d201c9e427 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-26  Kazuhiro Inaoka  <kazuhiro.inaoka.ud@renesas.com>
+
+       * gas/rx/r-bcc.d: Update expected disassembly of synthetic beq.a
+       instruction.
+
 2011-07-24  Maciej W. Rozycki  <macro@codesourcery.com>
             Chao-ying Fu  <fu@mips.com>
            Richard Sandiford  <rdsandiford@googlemail.com>

diff --git a/gas/testsuite/gas/rx/r-bcc.d b/gas/testsuite/gas/rx/r-bcc.d
index 672a52a1892b44e61ee9ea5892dd91f233a02642..be79f39ba825761beefe054c60453aa4245805b2 100644 (file)
--- 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 <beq>:
        0:      20 32                           beq\.b  32 <dsp8>
        2:      3a 86 13                        beq\.w  1388 <dsp16>
-       5:      1e                              bne\.s  b <bne\+0x1>
+       5:      1d                              bne\.s  a <bne>
        6:      04 1a a1 07                     bra\.a  7a120 <dsp24>
 
 0000000a <bne>: