diff options
| -rw-r--r-- | include/ChangeLog | 6 | ||||
| -rw-r--r-- | include/opcode/mips.h | 37 |
2 files changed, 24 insertions, 19 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index b51782f..d1a0485 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,5 +1,11 @@ 2021-05-29 Maciej W. Rozycki <macro@orcam.me.uk> + * opcode/mips.h (cpu_is_member): Remove code for MIPSr6 ISA + exclusion. + (opcode_is_member): Handle ISA level exclusion. + +2021-05-29 Maciej W. Rozycki <macro@orcam.me.uk> + * opcode/mips.h (isa_is_member): New inline function, factored out from... (opcode_is_member): ... here. diff --git a/include/opcode/mips.h b/include/opcode/mips.h index aa6e9d7..9add3c9 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h @@ -1459,13 +1459,6 @@ cpu_is_member (int cpu, unsigned int mask) case CPU_INTERAPTIV_MR2: return (mask & INSN_INTERAPTIV_MR2) != 0; - case CPU_MIPS32R6: - return (mask & INSN_ISA_MASK) == INSN_ISA32R6; - - case CPU_MIPS64R6: - return ((mask & INSN_ISA_MASK) == INSN_ISA32R6) - || ((mask & INSN_ISA_MASK) == INSN_ISA64R6); - default: return false; } @@ -1500,20 +1493,26 @@ isa_is_member (int isa, unsigned int mask) static inline bool opcode_is_member (const struct mips_opcode *insn, int isa, int ase, int cpu) { - if (!cpu_is_member (cpu, insn->exclusions)) - { - /* Test for ISA level compatibility. */ - if (isa_is_member (isa, insn->membership)) - return true; + /* Test for ISA level exclusion. */ + if (isa_is_member (isa, insn->exclusions)) + return false; - /* Test for ASE compatibility. */ - if ((ase & insn->ase) != 0) - return true; + /* Test for processor-specific exclusion. */ + if (cpu_is_member (cpu, insn->exclusions)) + return false; + + /* Test for ISA level compatibility. */ + if (isa_is_member (isa, insn->membership)) + return true; + + /* Test for ASE compatibility. */ + if ((ase & insn->ase) != 0) + return true; + + /* Test for processor-specific extensions. */ + if (cpu_is_member (cpu, insn->membership)) + return true; - /* Test for processor-specific extensions. */ - if (cpu_is_member (cpu, insn->membership)) - return true; - } return false; } |