From: Maciej W. Rozycki <macro@codesourcery.com>
Date: Tue, 26 Aug 2014 12:18:30 +0000 (+0100)
Subject: MIPS/gas: SAA/SAAD macro clean-ups
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0db377d09c19fc0f9267ead1f75998b9f1eb38d1;p=binutils-gdb.git

MIPS/gas: SAA/SAAD macro clean-ups

This change removes code duplication for the SAA macro in line with other
such macros and also adds a !microMIPS internal consistency guard as
there's no microMIPS encoding of the underlying SAA/SAAD instructions.

	* config/tc-mips.c (macro) <M_SAA_AB>: Remove duplicate code and
	jump to...
	<M_SAAD_AB>: ... here.  Assert that !microMIPS.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 62489096b5d..5d08734920c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-26  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* config/tc-mips.c (macro) <M_SAA_AB>: Remove duplicate code and
+	jump to...
+	<M_SAAD_AB>: ... here.  Assert that !microMIPS.
+
 2014-08-26  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
 
 	* config/tc-moxie.h (md_convert_frag): Silence warning.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 03f2b13899e..59d863540f2 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -12206,11 +12206,11 @@ macro (struct mips_cl_insn *ip, char *str)
 	
     case M_SAA_AB:
       s = "saa";
-      offbits = 0;
-      fmt = "t,(b)";
-      goto ld_st;
+      goto saa_saad;
     case M_SAAD_AB:
       s = "saad";
+    saa_saad:
+      gas_assert (!mips_opts.micromips);
       offbits = 0;
       fmt = "t,(b)";
       goto ld_st;