diff options
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/ChangeLog | 7 | ||||
| -rw-r--r-- | opcodes/mips-dis.c | 6 | ||||
| -rw-r--r-- | opcodes/mips-opc.c | 26 |
3 files changed, 23 insertions, 16 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 17c9875..913f465 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,10 @@ +2005-01-21 Fred Fish <fnf@specifixinc.com> + + * mips-opc.c: Change INSN_ALIAS to INSN2_ALIAS. + Change INSN_WRITE_MDMX_ACC to INSN2_WRITE_MDMX_ACC. + Change INSN_READ_MDMX_ACC to INSN2_READ_MDMX_ACC. + * mips-dis.c: Ditto. + 2005-01-20 Alan Modra <amodra@bigpond.net.au> * ppc-opc.c (powerpc_opcodes): Add optional 'l' arg to tlbiel. diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c index ee50bbb..9a4cfb0 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c @@ -1083,7 +1083,7 @@ print_insn_mips (memaddr, word, info) for (op = mips_opcodes; op < &mips_opcodes[NUMOPCODES]; op++) { if (op->pinfo == INSN_MACRO - || (no_aliases && (op->pinfo2 & INSN_ALIAS))) + || (no_aliases && (op->pinfo2 & INSN2_ALIAS))) continue; if (i == ((op->match >> OP_SH_OP) & OP_MASK_OP)) { @@ -1111,7 +1111,7 @@ print_insn_mips (memaddr, word, info) for (; op < &mips_opcodes[NUMOPCODES]; op++) { if (op->pinfo != INSN_MACRO - && !(no_aliases && (op->pinfo2 & INSN_ALIAS)) + && !(no_aliases && (op->pinfo2 & INSN2_ALIAS)) && (word & op->mask) == op->match) { register const char *d; @@ -1311,7 +1311,7 @@ print_insn_mips16 (memaddr, info) for (op = mips16_opcodes; op < opend; op++) { if (op->pinfo != INSN_MACRO - && !(no_aliases && (op->pinfo2 & INSN_ALIAS)) + && !(no_aliases && (op->pinfo2 & INSN2_ALIAS)) && (insn & op->mask) == op->match) { const char *s; diff --git a/opcodes/mips-opc.c b/opcodes/mips-opc.c index aebba68..d6d82a5 100644 --- a/opcodes/mips-opc.c +++ b/opcodes/mips-opc.c @@ -76,8 +76,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * #define IS_M INSN_MULT -#define WR_MACC INSN_WRITE_MDMX_ACC -#define RD_MACC INSN_READ_MDMX_ACC +#define WR_MACC INSN2_WRITE_MDMX_ACC +#define RD_MACC INSN2_READ_MDMX_ACC #define I1 INSN_ISA1 #define I2 INSN_ISA2 @@ -140,19 +140,19 @@ const struct mips_opcode mips_builtin_opcodes[] = /* name, args, match, mask, pinfo, pinfo2, membership */ {"pref", "k,o(b)", 0xcc000000, 0xfc000000, RD_b, 0, I4|I32|G3 }, {"prefx", "h,t(b)", 0x4c00000f, 0xfc0007ff, RD_b|RD_t, 0, I4 }, -{"nop", "", 0x00000000, 0xffffffff, 0, INSN_ALIAS, I1 }, /* sll */ -{"ssnop", "", 0x00000040, 0xffffffff, 0, INSN_ALIAS, I32|N55 }, /* sll */ -{"ehb", "", 0x000000c0, 0xffffffff, 0, INSN_ALIAS, I33 }, /* sll */ -{"li", "t,j", 0x24000000, 0xffe00000, WR_t, INSN_ALIAS, I1 }, /* addiu */ -{"li", "t,i", 0x34000000, 0xffe00000, WR_t, INSN_ALIAS, I1 }, /* ori */ +{"nop", "", 0x00000000, 0xffffffff, 0, INSN2_ALIAS, I1 }, /* sll */ +{"ssnop", "", 0x00000040, 0xffffffff, 0, INSN2_ALIAS, I32|N55 }, /* sll */ +{"ehb", "", 0x000000c0, 0xffffffff, 0, INSN2_ALIAS, I33 }, /* sll */ +{"li", "t,j", 0x24000000, 0xffe00000, WR_t, INSN2_ALIAS, I1 }, /* addiu */ +{"li", "t,i", 0x34000000, 0xffe00000, WR_t, INSN2_ALIAS, I1 }, /* ori */ {"li", "t,I", 0, (int) M_LI, INSN_MACRO, 0, I1 }, {"move", "d,s", 0, (int) M_MOVE, INSN_MACRO, 0, I1 }, -{"move", "d,s", 0x0000002d, 0xfc1f07ff, WR_d|RD_s, INSN_ALIAS, I3 },/* daddu */ -{"move", "d,s", 0x00000021, 0xfc1f07ff, WR_d|RD_s, INSN_ALIAS, I1 },/* addu */ -{"move", "d,s", 0x00000025, 0xfc1f07ff, WR_d|RD_s, INSN_ALIAS, I1 },/* or */ -{"b", "p", 0x10000000, 0xffff0000, UBD, INSN_ALIAS, I1 },/* beq 0,0 */ -{"b", "p", 0x04010000, 0xffff0000, UBD, INSN_ALIAS, I1 },/* bgez 0 */ -{"bal", "p", 0x04110000, 0xffff0000, UBD|WR_31, INSN_ALIAS, I1 },/* bgezal 0*/ +{"move", "d,s", 0x0000002d, 0xfc1f07ff, WR_d|RD_s, INSN2_ALIAS, I3 },/* daddu */ +{"move", "d,s", 0x00000021, 0xfc1f07ff, WR_d|RD_s, INSN2_ALIAS, I1 },/* addu */ +{"move", "d,s", 0x00000025, 0xfc1f07ff, WR_d|RD_s, INSN2_ALIAS, I1 },/* or */ +{"b", "p", 0x10000000, 0xffff0000, UBD, INSN2_ALIAS, I1 },/* beq 0,0 */ +{"b", "p", 0x04010000, 0xffff0000, UBD, INSN2_ALIAS, I1 },/* bgez 0 */ +{"bal", "p", 0x04110000, 0xffff0000, UBD|WR_31, INSN2_ALIAS, I1 },/* bgezal 0*/ {"abs", "d,v", 0, (int) M_ABS, INSN_MACRO, 0, I1 }, {"abs.s", "D,V", 0x46000005, 0xffff003f, WR_D|RD_S|FP_S, 0, I1 }, |