aarch64: Fix scbnds validation

[thirdparty/binutils-gdb.git] / gas / config / tc-aarch64.c

diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
index e1762df395efbbb9898784c5ee5b0dae4457a260..ba0a46227a717d7c1aa3879e4d725a08c3b315f6 100644 (file)
--- a/gas/config/tc-aarch64.c
+++ b/gas/config/tc-aarch64.c
@@ -3394,6 +3394,11 @@ parse_shift (char **str, aarch64_opnd_info *operand, enum parse_shift_mode mode)
        }
       operand->shifter.amount = 0;
     }
+  else if (exp.X_op == O_big)
+    {
+      set_fatal_syntax_error (_("shift amount out of range"));
+      return FALSE;
+    }
   else if (exp.X_op != O_constant)
     {
       set_syntax_error (_("constant shift amount required"));
@@ -6438,10 +6443,19 @@ parse_operands (char *str, const aarch64_opcode *opcode)
          po_misc_or_fail (parse_shifter_operand_imm (&str, info,
                                                      SHIFTED_ARITH_IMM));
 
+         if (inst.reloc.exp.X_op != O_constant)
+           {
+             set_fatal_syntax_error (_(inst.reloc.exp.X_op == O_big
+                                       ? "immediate out of range"
+                                       : "expected constant expression"));
+             goto failure;
+           }
+
          /* Try to coerce into shifted form if the immediate is out of
             range.  */
-         if (inst.reloc.exp.X_add_number > 63 && (info->imm.value & 16) == 0
-             && (inst.reloc.exp.X_add_number >> 4) <= 64
+         if (inst.reloc.exp.X_add_number > 63
+             && (inst.reloc.exp.X_add_number & 0xf) == 0
+             && (inst.reloc.exp.X_add_number >> 4) <= 63
              && info->shifter.amount == 0)
            {
              info->shifter.amount = 4;