2006-04-07 Paul Brook <paul@codesourcery.com>

	* config/tc-arm.c (parse_tb): Set inst.error before returning FAIL.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7e7b0df4dbcd73b5eb4096383223045c3d410aaf..a63e8be3ad44c899f75ae3ea7d764e015b209032 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-07  Paul Brook  <paul@codesourcery.com>
+
+       * config/tc-arm.c (parse_tb): Set inst.error before returning FAIL.
+
 2006-04-07  Paul Brook  <paul@codesourcery.com>
 
        * config/tc-arm.c (md_apply_fix): Set H bit on blx instruction.

diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 54cd349d59d604fe5f5e719416acb355b085b991..a37e0f69e1d1711b8bc55eccb1c057b0892fdba8 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -3706,7 +3706,10 @@ parse_tb (char **str)
   int reg;
 
   if (skip_past_char (&p, '[') == FAIL)
-    return FAIL;
+    {
+      inst.error = _("'[' expected");
+      return FAIL;
+    }
 
   if ((reg = arm_reg_parse (&p, REG_TYPE_RN)) == FAIL)
     {
@@ -3716,7 +3719,10 @@ parse_tb (char **str)
   inst.operands[0].reg = reg;
 
   if (skip_past_comma (&p) == FAIL)
-    return FAIL;
+    {
+      inst.error = _("',' expected");
+      return FAIL;
+    }
   
   if ((reg = arm_reg_parse (&p, REG_TYPE_RN)) == FAIL)
     {