diff options
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/ChangeLog | 4 | ||||
| -rw-r--r-- | opcodes/ppc-dis.c | 5 | ||||
| -rw-r--r-- | opcodes/ppc-opc.c | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 7d501be..1a15671 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,12 +1,14 @@ 2017-04-11 Alan Modra <amodra@gmail.com> * ppc-dis.c (ppc_opts): Remove PPC_OPCODE_ALTIVEC2, - PPC_OPCODE_VSX3, PPC_OPCODE_HTM and "htm". + PPC_OPCODE_VSX3, PPC_OPCODE_HTM and "htm". Formatting. Set + PPC_OPCODE_TMR for e6500. * ppc-opc.c (PPCVEC2): Define as PPC_OPCODE_POWER8|PPC_OPCODE_E6500. (PPCVEC3): Define as PPC_OPCODE_POWER9. (PPCVSX2): Define as PPC_OPCODE_POWER8. (PPCVSX3): Define as PPC_OPCODE_POWER9. (PPCHTM): Define as PPC_OPCODE_POWER8. + (powerpc_opcodes <mftmr, mttmr>): Remove now unnecessary E6500. 2017-04-10 Alan Modra <amodra@gmail.com> diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c index bb0bc30..3c9cbaf 100644 --- a/opcodes/ppc-dis.c +++ b/opcodes/ppc-dis.c @@ -141,13 +141,12 @@ struct ppc_mopt ppc_opts[] = { { "e5500", (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI | PPC_OPCODE_E500MC | PPC_OPCODE_64 | PPC_OPCODE_POWER4 - | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 - | PPC_OPCODE_POWER7), + | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7), 0 }, { "e6500", (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI | PPC_OPCODE_E500MC | PPC_OPCODE_64 | PPC_OPCODE_ALTIVEC - | PPC_OPCODE_E6500 | PPC_OPCODE_POWER4 + | PPC_OPCODE_E6500 | PPC_OPCODE_TMR | PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_POWER6 | PPC_OPCODE_POWER7), 0 }, { "e500x2", (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_SPE diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c index 430104e..55e6bed 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c @@ -5312,7 +5312,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { {"lxvdsx", X(31,332), XX1_MASK, PPCVSX, 0, {XT6, RA0, RB}}, {"mfpmr", X(31,334), X_MASK, PPCPMR|PPCE300, 0, {RT, PMR}}, -{"mftmr", X(31,366), X_MASK, PPCTMR|E6500, 0, {RT, TMR}}, +{"mftmr", X(31,366), X_MASK, PPCTMR, 0, {RT, TMR}}, {"slbsync", X(31,338), 0xffffffff, POWER9, 0, {0}}, @@ -5668,7 +5668,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { {"divwu.", XO(31,459,0,1), XO_MASK, PPC, 0, {RT, RA, RB}}, {"mtpmr", X(31,462), X_MASK, PPCPMR|PPCE300, 0, {PMR, RS}}, -{"mttmr", X(31,494), X_MASK, PPCTMR|E6500, 0, {TMR, RS}}, +{"mttmr", X(31,494), X_MASK, PPCTMR, 0, {TMR, RS}}, {"slbieg", X(31,466), XRA_MASK, POWER9, 0, {RS, RB}}, |