From 664a88c6c25f4158a99c4be423cfd94a29686f7b Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 23 Aug 2013 21:29:27 +0000 Subject: [PATCH] * config/rx-parse.y: Rearrange the components of a bison grammar to issue assembler errors at correct position. --- gas/ChangeLog | 5 +++++ gas/config/rx-parse.y | 16 ++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 679a7d5bd94..d815e5ec06c 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2013-08-23 Sandeep Kumar Singh + + * config/rx-parse.y: Rearrange the components of a bison grammar to issue + assembler errors at correct position. + 2013-08-23 Yuri Chornoivan PR binutils/15834 diff --git a/gas/config/rx-parse.y b/gas/config/rx-parse.y index 09e3e84fe4b..3933e6b9e2f 100644 --- a/gas/config/rx-parse.y +++ b/gas/config/rx-parse.y @@ -882,15 +882,19 @@ op_shift float2_op - : '#' EXPR ',' REG - { rx_check_float_support (); id24 (2, 0x72, sub_op << 4); F ($4, 20, 4); O4 ($2); } + : { rx_check_float_support (); } + '#' EXPR ',' REG + { id24 (2, 0x72, sub_op << 4); F ($5, 20, 4); O4 ($3); } | float2_op_ni ; + float2_op_ni - : REG ',' REG - { rx_check_float_support (); id24 (1, 0x83 + (sub_op << 2), 0); F ($1, 16, 4); F ($3, 20, 4); } - | disp '[' REG ']' opt_l ',' REG - { rx_check_float_support (); id24 (1, 0x80 + (sub_op << 2), 0); F ($3, 16, 4); F ($7, 20, 4); DSP ($1, 14, LSIZE); } + : { rx_check_float_support (); } + REG ',' REG + { id24 (1, 0x83 + (sub_op << 2), 0); F ($2, 16, 4); F ($4, 20, 4); } + | { rx_check_float_support (); } + disp '[' REG ']' opt_l ',' REG + { id24 (1, 0x80 + (sub_op << 2), 0); F ($4, 16, 4); F ($8, 20, 4); DSP ($2, 14, LSIZE); } ; /* ====================================================================== */ -- 2.30.2