diff --git a/gas/ChangeLog b/gas/ChangeLog index eaf5c0364f..ae4c486358 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2014-06-18 DJ Delorie + + * config/rx-parse.y (BSET, BCLR, BTST, BNOT, BMCMD): Make .B + suffix optional. + 2014-06-17 Hans-Peter Nilsson * config/tc-mmix.c (loc_assert_s): New member frag. diff --git a/gas/config/rx-parse.y b/gas/config/rx-parse.y index c4cba9f718..d93b4f66b5 100644 --- a/gas/config/rx-parse.y +++ b/gas/config/rx-parse.y @@ -636,13 +636,13 @@ statement : | BNOT REG ',' REG { id24 (1, 0x6f, 0x00); F ($4, 16, 4); F ($2, 20, 4); } - | BSET REG ',' disp '[' REG ']' DOT_B + | BSET REG ',' disp '[' REG ']' opt_b { id24 (1, 0x60, 0x00); F ($6, 16, 4); F ($2, 20, 4); DSP ($4, 14, BSIZE); } - | BCLR REG ',' disp '[' REG ']' DOT_B + | BCLR REG ',' disp '[' REG ']' opt_b { id24 (1, 0x64, 0x00); F ($6, 16, 4); F ($2, 20, 4); DSP ($4, 14, BSIZE); } - | BTST REG ',' disp '[' REG ']' DOT_B + | BTST REG ',' disp '[' REG ']' opt_b { id24 (1, 0x68, 0x00); F ($6, 16, 4); F ($2, 20, 4); DSP ($4, 14, BSIZE); } - | BNOT REG ',' disp '[' REG ']' DOT_B + | BNOT REG ',' disp '[' REG ']' opt_b { id24 (1, 0x6c, 0x00); F ($6, 16, 4); F ($2, 20, 4); DSP ($4, 14, BSIZE); } /* ---------------------------------------------------------------------- */ @@ -664,13 +664,13 @@ statement : /* ---------------------------------------------------------------------- */ - | BMCND '#' EXPR ',' disp '[' REG ']' DOT_B + | BMCND '#' EXPR ',' disp '[' REG ']' opt_b { id24 (1, 0xe0, 0x00); F ($1, 20, 4); FE ($3, 11, 3); F ($7, 16, 4); DSP ($5, 14, BSIZE); } /* ---------------------------------------------------------------------- */ - | BNOT '#' EXPR ',' disp '[' REG ']' DOT_B + | BNOT '#' EXPR ',' disp '[' REG ']' opt_b { id24 (1, 0xe0, 0x0f); FE ($3, 11, 3); F ($7, 16, 4); DSP ($5, 14, BSIZE); } @@ -930,6 +930,10 @@ opt_l : {} | DOT_L {} ; +opt_b : {} + | DOT_B {} + ; + %% /* ====================================================================== */