diff options
| author | Alan Modra <amodra@gmail.com> | 2010-07-03 06:51:56 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2010-07-03 06:51:56 +0000 |
| commit | bdc70b4a03fd884e60bfef2cc2fa7b864f51d6fe (patch) | |
| tree | bca2e83dc0b362bc8f511992a2a7f4ec640d8b30 /gas | |
| parent | 21375995bd28258d997c67b0736426e5aabc581b (diff) | |
| download | ppe42-binutils-bdc70b4a03fd884e60bfef2cc2fa7b864f51d6fe.tar.gz ppe42-binutils-bdc70b4a03fd884e60bfef2cc2fa7b864f51d6fe.zip | |
include/opcode/
* ppc.h (PPC_OPCODE_32, PPC_OPCODE_BOOKE64, PPC_OPCODE_CLASSIC): Delete.
Renumber other PPC_OPCODE defines.
gas/
* config/tc-ppc.c (ppc_set_cpu): Remove old opcode flags.
(ppc_setup_opcodes): Likewise. Simplify opcode selection.
opcodes/
* ppc-dis.c (ppc_opts, powerpc_init_dialect): Remove old opcode flags.
* ppc-opc.c (PPC32, POWER32, COM32, CLASSIC): Delete.
(PPC64, MFDEC2): Update.
(NON32, NO371): Define.
(powerpc_opcode): Update to not use old opcode flags, and avoid
-m601 duplicates.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-ppc.c | 21 |
2 files changed, 11 insertions, 15 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 7512c456ae..1a666868cc 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2010-07-03 Alan Modra <amodra@gmail.com> + + * config/tc-ppc.c (ppc_set_cpu): Remove old opcode flags. + (ppc_setup_opcodes): Likewise. Simplify opcode selection. + 2010-07-02 DJ Delorie <dj@redhat.com> * config/tc-rx.h (md_do_align): New. diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c index f054756c04..df298dbb2e 100644 --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -1251,16 +1251,16 @@ ppc_set_cpu (void) if ((ppc_cpu & ~PPC_OPCODE_ANY) == 0) { if (ppc_obj64) - ppc_cpu |= PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_64; + ppc_cpu |= PPC_OPCODE_PPC | PPC_OPCODE_64; else if (strncmp (default_os, "aix", 3) == 0 && default_os[3] >= '4' && default_os[3] <= '9') - ppc_cpu |= PPC_OPCODE_COMMON | PPC_OPCODE_32; + ppc_cpu |= PPC_OPCODE_COMMON; else if (strncmp (default_os, "aix3", 4) == 0) - ppc_cpu |= PPC_OPCODE_POWER | PPC_OPCODE_32; + ppc_cpu |= PPC_OPCODE_POWER; else if (strcmp (default_cpu, "rs6000") == 0) - ppc_cpu |= PPC_OPCODE_POWER | PPC_OPCODE_32; + ppc_cpu |= PPC_OPCODE_POWER; else if (strncmp (default_cpu, "powerpc", 7) == 0) - ppc_cpu |= PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_32; + ppc_cpu |= PPC_OPCODE_PPC; else as_fatal (_("Unknown default cpu = %s, os = %s"), default_cpu, default_os); @@ -1473,11 +1473,7 @@ ppc_setup_opcodes (void) } } - if ((op->flags & ppc_cpu & ~(PPC_OPCODE_32 | PPC_OPCODE_64)) != 0 - && ((op->flags & (PPC_OPCODE_32 | PPC_OPCODE_64)) == 0 - || ((op->flags & (PPC_OPCODE_32 | PPC_OPCODE_64)) - == (ppc_cpu & (PPC_OPCODE_32 | PPC_OPCODE_64))) - || (ppc_cpu & PPC_OPCODE_64_BRIDGE) != 0) + if ((ppc_cpu & op->flags) != 0 && !(ppc_cpu & op->deprecated)) { const char *retval; @@ -1485,11 +1481,6 @@ ppc_setup_opcodes (void) retval = hash_insert (ppc_hash, op->name, (void *) op); if (retval != NULL) { - /* Ignore Power duplicates for -m601. */ - if ((ppc_cpu & PPC_OPCODE_601) != 0 - && (op->flags & PPC_OPCODE_POWER) != 0) - continue; - as_bad (_("duplicate instruction %s"), op->name); bad_insn = TRUE; |
