aboutsummaryrefslogtreecommitdiff
path: root/opcodes
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2002-11-12 04:03:31 +0000
committerAlan Modra <amodra@gmail.com>2002-11-12 04:03:31 +0000
commit8b4fa15520f53b4506c56203607bcacba17f0c0a (patch)
treee6f8152fd6a6e52bb032a38c949e8d35cac9db6d /opcodes
parentf8b0dbb8175f283a9e2a255d981634cfaaaf211a (diff)
downloadfsf-binutils-gdb-8b4fa15520f53b4506c56203607bcacba17f0c0a.zip
fsf-binutils-gdb-8b4fa15520f53b4506c56203607bcacba17f0c0a.tar.gz
fsf-binutils-gdb-8b4fa15520f53b4506c56203607bcacba17f0c0a.tar.bz2
* ppc-dis.c (print_insn_powerpc): Correct condition register display.
Diffstat (limited to 'opcodes')
-rw-r--r--opcodes/ChangeLog4
-rw-r--r--opcodes/ppc-dis.c21
2 files changed, 12 insertions, 13 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index bdf4903..7366e94 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-12 Segher Boessenkool <segher@koffie.nl>
+
+ * ppc-dis.c (print_insn_powerpc): Correct condition register display.
+
2002-11-07 Aldy Hernandez <aldyh@redhat.com>
* ppc-opc.c (EVUIMM_4): Change bit size to 32.
diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
index 0c4cfe4..3df7dc1 100644
--- a/opcodes/ppc-dis.c
+++ b/opcodes/ppc-dis.c
@@ -52,13 +52,13 @@ powerpc_dialect(info)
|| strcmp (info->disassembler_options, "booke32") == 0
|| strcmp (info->disassembler_options, "booke64") == 0))
dialect |= PPC_OPCODE_BOOKE | PPC_OPCODE_BOOKE64;
- else
+ else
if ((info->mach == bfd_mach_ppc_e500)
- || (info->disassembler_options
+ || (info->disassembler_options
&& ( strcmp (info->disassembler_options, "e500") == 0
|| strcmp (info->disassembler_options, "e500x2") == 0)))
{
- dialect |= PPC_OPCODE_BOOKE
+ dialect |= PPC_OPCODE_BOOKE
| PPC_OPCODE_SPE | PPC_OPCODE_ISEL
| PPC_OPCODE_EFS | PPC_OPCODE_BRLOCK
| PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK
@@ -66,7 +66,7 @@ powerpc_dialect(info)
/* efs* and AltiVec conflict. */
dialect &= ~PPC_OPCODE_ALTIVEC;
}
- else
+ else
if (info->disassembler_options
&& (strcmp (info->disassembler_options, "efs") == 0))
{
@@ -177,7 +177,7 @@ print_insn_powerpc (memaddr, info, bigendian, dialect)
continue;
if ((dialect & PPC_OPCODE_EFS) && (opcode->flags & PPC_OPCODE_ALTIVEC))
- continue;
+ continue;
/* Make two passes over the operands. First see if any of them
have extraction functions, and, if they do, make sure the
@@ -262,14 +262,9 @@ print_insn_powerpc (memaddr, info, bigendian, dialect)
cr = value >> 2;
if (cr != 0)
- (*info->fprintf_func) (info->stream, "4*cr%d", cr);
+ (*info->fprintf_func) (info->stream, "4*cr%d+", cr);
cc = value & 3;
- if (cc != 0)
- {
- if (cr != 0)
- (*info->fprintf_func) (info->stream, "+");
- (*info->fprintf_func) (info->stream, "%s", cbnames[cc]);
- }
+ (*info->fprintf_func) (info->stream, "%s", cbnames[cc]);
}
}
@@ -304,7 +299,7 @@ print_ppc_disassembler_options (FILE * stream)
fprintf (stream, "\n\
The following PPC specific disassembler options are supported for use with\n\
the -M switch:\n");
-
+
fprintf (stream, " booke|booke32|booke64 Disassemble the BookE instructions\n");
fprintf (stream, " e500|e500x2 Disassemble the e500 instructions\n");
fprintf (stream, " efs Disassemble the EFS instructions\n");