aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2005-03-16 02:38:39 +0000
committerAlan Modra <amodra@gmail.com>2005-03-16 02:38:39 +0000
commit4eb30afc4160a4cb51cf9d7501e96831b956cdc7 (patch)
tree99a5e0ae52cd16200cd963b90519b78099a4c08b
parentafee91aefd59c891e04152e9643f56a556a4f776 (diff)
downloadgdb-4eb30afc4160a4cb51cf9d7501e96831b956cdc7.zip
gdb-4eb30afc4160a4cb51cf9d7501e96831b956cdc7.tar.gz
gdb-4eb30afc4160a4cb51cf9d7501e96831b956cdc7.tar.bz2
* ppc-dis.c (powerpc_dialect): Don't set PPC_OPCODE_ALTIVEC when
BOOKE.
-rw-r--r--opcodes/ChangeLog5
-rw-r--r--opcodes/ppc-dis.c26
2 files changed, 14 insertions, 17 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 1b83778..8daeebc 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 4d48b9d..5e60598 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)