From 0db377d09c19fc0f9267ead1f75998b9f1eb38d1 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Tue, 26 Aug 2014 13:18:30 +0100 Subject: [PATCH] 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) : Remove duplicate code and jump to... : ... here. Assert that !microMIPS. --- gas/ChangeLog | 6 ++++++ gas/config/tc-mips.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 6248909..5d08734 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2014-08-26 Maciej W. Rozycki + + * config/tc-mips.c (macro) : Remove duplicate code and + jump to... + : ... here. Assert that !microMIPS. + 2014-08-26 Jan-Benedict Glaw * config/tc-moxie.h (md_convert_frag): Silence warning. diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 03f2b13..59d8635 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; -- 2.7.4