diff options
| author | Gavin Romig-Koch <gavin@redhat.com> | 1999-11-01 19:29:55 +0000 |
|---|---|---|
| committer | Gavin Romig-Koch <gavin@redhat.com> | 1999-11-01 19:29:55 +0000 |
| commit | 2c74239c50b6b7f9e08083a8692621d4d314d011 (patch) | |
| tree | b5bf341d6b81f3f0f52ee1257f20e4342ffdeed6 | |
| parent | 2a60f6b927d8f72f0e5600a26f07d06d9046c53b (diff) | |
| download | gdb-2c74239c50b6b7f9e08083a8692621d4d314d011.tar.gz | |
For include/opcode:
* mips.h (OPCODE_IS_MEMBER): New.
For gas:
* config/tc-mips.c (macro_build): Use OPCODE_IS_MEMBER.
(mips_ip): Use OPCODE_IS_MEMBER.
For opcodes:
* mips-dis.c (_print_insn_mips): Use OPCODE_IS_MEMBER.
| -rw-r--r-- | include/opcode/ChangeLog | 4 | ||||
| -rw-r--r-- | include/opcode/mips.h | 18 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 4 | ||||
| -rw-r--r-- | opcodes/mips-dis.c | 24 |
4 files changed, 28 insertions, 22 deletions
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index 63d2e83461d..ebf79ddd97f 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -1,3 +1,7 @@ +1999-11-01 Gavin Romig-Koch <gavin@cygnus.com> + + * mips.h (OPCODE_IS_MEMBER): New. + 1999-10-29 Nick Clifton <nickc@cygnus.com> * d30v.h (SHORT_AR): Define. diff --git a/include/opcode/mips.h b/include/opcode/mips.h index f0a8c7ef9f2..07e0fd7c679 100644 --- a/include/opcode/mips.h +++ b/include/opcode/mips.h @@ -319,6 +319,24 @@ struct mips_opcode /* Toshiba R3900 instruction. */ #define INSN_3900 0x00000080 +/* Test for membership in an ISA including chip specific ISAs. + INSN is pointer to an element of the opcode table; ISA is the + specified ISA to test against; and CPU is the CPU specific ISA + to test, or zero if no CPU specific ISA test is desired. */ + +#define OPCODE_IS_MEMBER(insn,isa,cpu) \ + ((((insn)->membership & INSN_ISA) != 0 \ + && ((insn)->membership & INSN_ISA) <= isa) \ + || (cpu == 4650 \ + && ((insn)->membership & INSN_4650) != 0) \ + || (cpu == 4010 \ + && ((insn)->membership & INSN_4010) != 0) \ + || ((cpu == 4100 \ + || cpu == 4111 \ + ) \ + && ((insn)->membership & INSN_4100) != 0) \ + || (cpu == 3900 \ + && ((insn)->membership & INSN_3900) != 0)) /* This is a list of macro expanded instructions. * diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index b8c8822f586..0ac1cf14d94 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +1999-11-01 Gavin Romig-Koch <gavin@cygnus.com> + + * mips-dis.c (_print_insn_mips): Use OPCODE_IS_MEMBER. + 1999-10-29 Nick Clifton <nickc@cygnus.com> * d30v-opc.c (mvtacc): Use format SHORT_AR not SHORT_AA diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c index 1e3577cec32..a1bd62ed577 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c @@ -387,28 +387,8 @@ _print_insn_mips (memaddr, word, info) if (op->pinfo != INSN_MACRO && (word & op->mask) == op->match) { register const char *d; - int insn_isa; - - if ((op->membership & INSN_ISA) == INSN_ISA1) - insn_isa = 1; - else if ((op->membership & INSN_ISA) == INSN_ISA2) - insn_isa = 2; - else if ((op->membership & INSN_ISA) == INSN_ISA3) - insn_isa = 3; - else if ((op->membership & INSN_ISA) == INSN_ISA4) - insn_isa = 4; - else - insn_isa = 15; - - if (insn_isa > mips_isa - && (target_processor == 4650 - && op->membership & INSN_4650) == 0 - && (target_processor == 4010 - && op->membership & INSN_4010) == 0 - && (target_processor == 4100 - && op->membership & INSN_4100) == 0 - && (target_processor == 3900 - && op->membership & INSN_3900) == 0) + + if (! OPCODE_IS_MEMBER (op, mips_isa, target_processor)) continue; (*info->fprintf_func) (info->stream, "%s", op->name); |