From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 22 Sep 2010 21:29:41 +0000 (+0000)
Subject: gas: blackfin: clarify some errors with register usage in insns
X-Git-Tag: sid-snapshot-20101001~102
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2c28b80f1bc424f2b8858118634ea8428ffe985;p=external%2Fbinutils.git

gas: blackfin: clarify some errors with register usage in insns

Using "Register mismatch" everywhere can be a bit vague, so clarify
why exactly we're barfing on these unsupported insns.

Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3b488cf..947bfdd 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,9 @@
 2010-09-22  Robin Getz  <robin.getz@analog.com>
 
+	* config/bfin-parse.y: Improve error messages.
+
+2010-09-22  Robin Getz  <robin.getz@analog.com>
+
 	* config/bfin-parse.y (DBG): Fix regno encoding.
 	(DBGCMPLX): Likewise.
 
diff --git a/gas/config/bfin-parse.y b/gas/config/bfin-parse.y
index a520226..4549b53 100644
--- a/gas/config/bfin-parse.y
+++ b/gas/config/bfin-parse.y
@@ -1737,7 +1737,7 @@ asm_1:
 	      $$ = bfin_gen_regmv (&$3, &$1);
 	    }
 	  else
-	    return yyerror ("Register mismatch");
+	    return yyerror ("Unsupported register move");
 	}
 
 	| CCREG ASSIGN REG
@@ -1748,7 +1748,7 @@ asm_1:
 	      $$ = bfin_gen_cc2dreg (1, &$3);
 	    }
 	  else
-	    return yyerror ("Register mismatch");
+	    return yyerror ("Only 'CC = Dreg' supported");
 	}
 
 	| REG ASSIGN CCREG
@@ -1759,7 +1759,7 @@ asm_1:
 	      $$ = bfin_gen_cc2dreg (0, &$1);
 	    }
 	  else
-	    return yyerror ("Register mismatch");
+	    return yyerror ("Only 'Dreg = CC' supported");
 	}
 
 	| CCREG _ASSIGN_BANG CCREG
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index ef3fe17..7a40794 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2010-09-22  Robin Getz  <robin.getz@analog.com>
 
+	* gas/bfin/expected_move_errors.l: Update error output.
+
+2010-09-22  Robin Getz  <robin.getz@analog.com>
+
 	* gas/bfin/pseudo.d, gas/bfin/pseudo.s: New test.
 	* gas/bfin/bfin.exp: Add new "pseudo" test.
 
diff --git a/gas/testsuite/gas/bfin/expected_move_errors.l b/gas/testsuite/gas/bfin/expected_move_errors.l
index 9a98746..524822e 100644
--- a/gas/testsuite/gas/bfin/expected_move_errors.l
+++ b/gas/testsuite/gas/bfin/expected_move_errors.l
@@ -3,4 +3,4 @@
 .*:4: Error: Cannot move A0 to high half of register. Input text was A0.
 .*:5: Error: Cannot move A1 to even register.
 .*:6: Error: Cannot move A0 to odd register.
-.*:7: Error: Register mismatch.
+.*:7: Error: Unsupported register move.