/* ppc-dis.c -- Disassemble PowerPC instructions
- Copyright (C) 1994-2018 Free Software Foundation, Inc.
+ Copyright (C) 1994-2019 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Cygnus Support
This file is part of the GNU opcodes library.
/* Determine whether the optional operand(s) should be printed. */
-static int
+static bfd_boolean
skip_optional_operands (const unsigned char *opindex,
uint64_t insn, ppc_cpu_t dialect)
{
{
operand = &powerpc_operands[*opindex];
if ((operand->flags & PPC_OPERAND_NEXT) != 0)
- return 0;
+ return FALSE;
if ((operand->flags & PPC_OPERAND_OPTIONAL) != 0)
{
/* Negative count is used as a flag to extract function. */
if (operand_value_powerpc (operand, insn, dialect)
!= ppc_optional_operand_value (operand, insn, dialect,
num_optional))
- return 0;
+ return FALSE;
}
}
- return 1;
+ return TRUE;
}
/* Find a match for INSN in the opcode table, given machine DIALECT. */
{
const unsigned char *opindex;
const struct powerpc_operand *operand;
- int need_comma;
- int need_paren;
- int skip_optional;
-
- if (opcode->operands[0] != 0)
- (*info->fprintf_func) (info->stream, "%-7s ", opcode->name);
- else
- (*info->fprintf_func) (info->stream, "%s", opcode->name);
+ enum {
+ need_comma = 0,
+ need_1space = 1,
+ need_2spaces = 2,
+ need_3spaces = 3,
+ need_4spaces = 4,
+ need_5spaces = 5,
+ need_6spaces = 6,
+ need_7spaces = 7,
+ need_paren
+ } op_separator;
+ bfd_boolean skip_optional;
+ int spaces;
+
+ (*info->fprintf_func) (info->stream, "%s", opcode->name);
+ /* gdb fprintf_func doesn't return count printed. */
+ spaces = 8 - strlen (opcode->name);
+ if (spaces <= 0)
+ spaces = 1;
/* Now extract and print the operands. */
- need_comma = 0;
- need_paren = 0;
- skip_optional = -1;
+ op_separator = spaces;
+ skip_optional = FALSE;
for (opindex = opcode->operands; *opindex != 0; opindex++)
{
int64_t value;
operand = powerpc_operands + *opindex;
- /* If all of the optional operands have the value zero,
- then don't print any of them. */
- if ((operand->flags & PPC_OPERAND_OPTIONAL) != 0)
+ /* If all of the optional operands past this one have their
+ default value, then don't print any of them. Except in
+ raw mode, print them all. */
+ if ((operand->flags & PPC_OPERAND_OPTIONAL) != 0
+ && (dialect & PPC_OPCODE_RAW) == 0)
{
- if (skip_optional < 0)
- skip_optional = skip_optional_operands (opindex, insn,
- dialect);
+ if (!skip_optional)
+ skip_optional = skip_optional_operands (opindex, insn, dialect);
if (skip_optional)
continue;
}
value = operand_value_powerpc (operand, insn, dialect);
- if (need_comma)
- {
- (*info->fprintf_func) (info->stream, ",");
- need_comma = 0;
- }
+ if (op_separator == need_comma)
+ (*info->fprintf_func) (info->stream, ",");
+ else if (op_separator == need_paren)
+ (*info->fprintf_func) (info->stream, "(");
+ else
+ (*info->fprintf_func) (info->stream, "%*s", op_separator, " ");
/* Print the operand as directed by the flags. */
if ((operand->flags & PPC_OPERAND_GPR) != 0
|| ((operand->flags & PPC_OPERAND_GPR_0) != 0 && value != 0))
- (*info->fprintf_func) (info->stream, "r%" PPC_INT_FMT "d", value);
+ (*info->fprintf_func) (info->stream, "r%" PRId64, value);
else if ((operand->flags & PPC_OPERAND_FPR) != 0)
- (*info->fprintf_func) (info->stream, "f%" PPC_INT_FMT "d", value);
+ (*info->fprintf_func) (info->stream, "f%" PRId64, value);
else if ((operand->flags & PPC_OPERAND_VR) != 0)
- (*info->fprintf_func) (info->stream, "v%" PPC_INT_FMT "d", value);
+ (*info->fprintf_func) (info->stream, "v%" PRId64, value);
else if ((operand->flags & PPC_OPERAND_VSR) != 0)
- (*info->fprintf_func) (info->stream, "vs%" PPC_INT_FMT "d", value);
+ (*info->fprintf_func) (info->stream, "vs%" PRId64, value);
else if ((operand->flags & PPC_OPERAND_RELATIVE) != 0)
(*info->print_address_func) (memaddr + value, info);
else if ((operand->flags & PPC_OPERAND_ABSOLUTE) != 0)
(*info->print_address_func) ((bfd_vma) value & 0xffffffff, info);
else if ((operand->flags & PPC_OPERAND_FSL) != 0)
- (*info->fprintf_func) (info->stream, "fsl%" PPC_INT_FMT "d", value);
+ (*info->fprintf_func) (info->stream, "fsl%" PRId64, value);
else if ((operand->flags & PPC_OPERAND_FCR) != 0)
- (*info->fprintf_func) (info->stream, "fcr%" PPC_INT_FMT "d", value);
+ (*info->fprintf_func) (info->stream, "fcr%" PRId64, value);
else if ((operand->flags & PPC_OPERAND_UDI) != 0)
- (*info->fprintf_func) (info->stream, "%" PPC_INT_FMT "d", value);
+ (*info->fprintf_func) (info->stream, "%" PRId64, value);
else if ((operand->flags & PPC_OPERAND_CR_REG) != 0
+ && (operand->flags & PPC_OPERAND_CR_BIT) == 0
&& (((dialect & PPC_OPCODE_PPC) != 0)
|| ((dialect & PPC_OPCODE_VLE) != 0)))
- (*info->fprintf_func) (info->stream, "cr%" PPC_INT_FMT "d", value);
- else if (((operand->flags & PPC_OPERAND_CR_BIT) != 0)
+ (*info->fprintf_func) (info->stream, "cr%" PRId64, value);
+ else if ((operand->flags & PPC_OPERAND_CR_BIT) != 0
+ && (operand->flags & PPC_OPERAND_CR_REG) == 0
&& (((dialect & PPC_OPCODE_PPC) != 0)
|| ((dialect & PPC_OPCODE_VLE) != 0)))
{
(*info->fprintf_func) (info->stream, "%s", cbnames[cc]);
}
else
- (*info->fprintf_func) (info->stream, "%" PPC_INT_FMT "d", value);
+ (*info->fprintf_func) (info->stream, "%" PRId64, value);
- if (need_paren)
- {
- (*info->fprintf_func) (info->stream, ")");
- need_paren = 0;
- }
+ if (op_separator == need_paren)
+ (*info->fprintf_func) (info->stream, ")");
- if ((operand->flags & PPC_OPERAND_PARENS) == 0)
- need_comma = 1;
- else
- {
- (*info->fprintf_func) (info->stream, "(");
- need_paren = 1;
- }
+ op_separator = need_comma;
+ if ((operand->flags & PPC_OPERAND_PARENS) != 0)
+ op_separator = need_paren;
}
/* We have found and printed an instruction. */
}
/* We could not find a match. */
- (*info->fprintf_func) (info->stream, ".long 0x%" PPC_INT_FMT "x", insn);
+ (*info->fprintf_func) (info->stream, ".long 0x%" PRIx64, insn);
return 4;
}
projects / deliverable / binutils-gdb.git / blobdiff