diff options
| -rw-r--r-- | opcodes/ChangeLog | 5 | ||||
| -rw-r--r-- | opcodes/ppc-dis.c | 26 |
2 files changed, 14 insertions, 17 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 1b83778d4e..8daeebc391 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2005-03-16 Alan Modra <amodra@bigpond.net.au> + + * ppc-dis.c (powerpc_dialect): Don't set PPC_OPCODE_ALTIVEC when + BOOKE. + 2005-03-15 Alan Modra <amodra@bigpond.net.au> * po/es.po: Commit new Spanish translation. diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c index 4d48b9d4b7..5e60598bfa 100644 --- a/opcodes/ppc-dis.c +++ b/opcodes/ppc-dis.c @@ -1,5 +1,5 @@ /* ppc-dis.c -- Disassemble PowerPC instructions - Copyright 1994, 1995, 2000, 2001, 2002, 2003, 2004 + Copyright 1994, 1995, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Written by Ian Lance Taylor, Cygnus Support @@ -44,7 +44,7 @@ struct dis_private { static int powerpc_dialect (struct disassemble_info *info) { - int dialect = PPC_OPCODE_PPC | PPC_OPCODE_ALTIVEC; + int dialect = PPC_OPCODE_PPC; if (BFD_DEFAULT_TARGET_SIZE == 64) dialect |= PPC_OPCODE_64; @@ -55,25 +55,17 @@ powerpc_dialect (struct disassemble_info *info) else if ((info->mach == bfd_mach_ppc_e500) || (info->disassembler_options && strstr (info->disassembler_options, "e500") != NULL)) - { - dialect |= PPC_OPCODE_BOOKE - | PPC_OPCODE_SPE | PPC_OPCODE_ISEL - | PPC_OPCODE_EFS | PPC_OPCODE_BRLOCK - | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK - | PPC_OPCODE_RFMCI; - /* efs* and AltiVec conflict. */ - dialect &= ~PPC_OPCODE_ALTIVEC; - } + dialect |= (PPC_OPCODE_BOOKE + | PPC_OPCODE_SPE | PPC_OPCODE_ISEL + | PPC_OPCODE_EFS | PPC_OPCODE_BRLOCK + | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK + | PPC_OPCODE_RFMCI); else if (info->disassembler_options && strstr (info->disassembler_options, "efs") != NULL) - { - dialect |= PPC_OPCODE_EFS; - /* efs* and AltiVec conflict. */ - dialect &= ~PPC_OPCODE_ALTIVEC; - } + dialect |= PPC_OPCODE_EFS; else dialect |= (PPC_OPCODE_403 | PPC_OPCODE_601 | PPC_OPCODE_CLASSIC - | PPC_OPCODE_COMMON); + | PPC_OPCODE_COMMON | PPC_OPCODE_ALTIVEC); if (info->disassembler_options && strstr (info->disassembler_options, "power4") != NULL) |
