diff options
| author | Ian Lance Taylor <ian@airs.com> | 1997-07-15 17:03:15 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1997-07-15 17:03:15 +0000 |
| commit | a652f74c72102262165bbc4b60ea1a22adf3bee7 (patch) | |
| tree | 8a825055d61d7aed6d2ee5136884faeff02a4a35 /gas/config | |
| parent | d1ce2fc04fdd68c3f2b29e71066e1d232c14e414 (diff) | |
| download | gdb-a652f74c72102262165bbc4b60ea1a22adf3bee7.zip gdb-a652f74c72102262165bbc4b60ea1a22adf3bee7.tar.gz gdb-a652f74c72102262165bbc4b60ea1a22adf3bee7.tar.bz2 | |
* config/tc-mips.c (macro_build): Restore check of fmt argument.
(mips_ip): Fix ISA checks.
Diffstat (limited to 'gas/config')
| -rw-r--r-- | gas/config/tc-mips.c | 89 |
1 files changed, 48 insertions, 41 deletions
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 8b4c6b9..64c7350 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -2358,7 +2358,6 @@ macro_build (place, counter, ep, name, fmt, va_alist) assert (insn.insn_mo); assert (strcmp (name, insn.insn_mo->name) == 0); - /* Search until we get a match for NAME. */ while (1) { @@ -2375,31 +2374,30 @@ macro_build (place, counter, ep, name, fmt, va_alist) else insn_isa = 15; - if (insn_isa > mips_opts.isa - && (insn.insn_mo->pinfo != INSN_MACRO - && ((mips_4650 - && (insn.insn_mo->membership & INSN_4650) != INSN_4650) - || (mips_4650 && (insn.insn_mo->pinfo & FP_D)) - || (mips_4010 - && (insn.insn_mo->membership & INSN_4010) != INSN_4010) - || (mips_4100 - && (insn.insn_mo->membership & INSN_4100) != INSN_4100) - /* start-sanitize-r5900 */ - || (mips_5900 - && (insn.insn_mo->membership & INSN_5900) != INSN_5900) - || (mips_5900 && (insn.insn_mo->pinfo & FP_D)) - /* end-sanitize-r5900 */ - || (mips_3900 - && (insn.insn_mo->membership & INSN_3900) != INSN_3900)))) - { - ++insn.insn_mo; - assert (insn.insn_mo->name); - assert (strcmp (name, insn.insn_mo->name) == 0); - continue; - } + if (strcmp (fmt, insn.insn_mo->args) == 0 + && insn.insn_mo->pinfo != INSN_MACRO + && (insn_isa <= mips_opts.isa + || (mips_4650 + && (insn.insn_mo->membership & INSN_4650) != 0) + || (mips_4010 + && (insn.insn_mo->membership & INSN_4010) != 0) + || (mips_4100 + && (insn.insn_mo->membership & INSN_4100) != 0) + /* start-sanitize-r5900 */ + || (mips_5900 + && (insn.insn_mo->membership & INSN_5900) != 0) + /* end-sanitize-r5900 */ + || (mips_3900 + && (insn.insn_mo->membership & INSN_3900) != 0)) + /* start-sanitize-r5900 */ + && (! mips_5900 || (insn.insn_mo->pinfo & FP_D) == 0) + /* end-sanitize-r5900 */ + && (! mips_4650 || (insn.insn_mo->pinfo & FP_D) == 0)) + break; - /* We got a successful match. */ - break; + ++insn.insn_mo; + assert (insn.insn_mo->name); + assert (strcmp (name, insn.insn_mo->name) == 0); } insn.insn_opcode = insn.insn_mo->match; @@ -6571,6 +6569,7 @@ mips_ip (str, ip) for (;;) { int insn_isa; + boolean ok; assert (strcmp (insn->name, str) == 0); @@ -6587,22 +6586,30 @@ mips_ip (str, ip) else insn_isa = 15; - if (insn_isa > mips_opts.isa - && (insn->pinfo != INSN_MACRO - && ((mips_4650 - && (insn->membership & INSN_4650) != INSN_4650) - || (mips_4650 && (insn->pinfo & FP_D)) - || (mips_4010 - && (insn->membership & INSN_4010) != INSN_4010) - || (mips_4100 - && (insn->membership & INSN_4100) != INSN_4100) - /* start-sanitize-r5900 */ - || (mips_5900 - && (insn->membership & INSN_5900) != INSN_5900) - || (mips_5900 && (insn->pinfo & FP_D)) - /* end-sanitize-r5900 */ - || (mips_3900 - && (insn->membership & INSN_3900) != INSN_3900)))) + if (insn_isa <= mips_opts.isa) + ok = true; + else if (insn->pinfo == INSN_MACRO) + ok = false; + else if ((mips_4650 && (insn->membership & INSN_4650) != 0) + || (mips_4010 && (insn->membership & INSN_4010) != 0) + || (mips_4100 && (insn->membership & INSN_4100) != 0) + /* start-sanitize-r5900 */ + || (mips_5900 && (insn->membership & INSN_5900) != 0) + /* end-sanitize-r5900 */ + || (mips_3900 && (insn->membership & INSN_3900) != 0)) + { + ok = true; + if (mips_4650 && (insn->pinfo & FP_D) != 0) + ok = false; + /* start-sanitize-r5900 */ + if (mips_5900 && (insn->pinfo & FP_D) != 0) + ok = false; + /* end-sanitize-r5900 */ + } + else + ok = false; + + if (! ok) { if (insn + 1 < &mips_opcodes[NUMOPCODES] && strcmp (insn->name, insn[1].name) == 0) |