diff options
| -rw-r--r-- | opcodes/ChangeLog | 6 | ||||
| -rw-r--r-- | opcodes/ppc-dis.c | 10 | ||||
| -rw-r--r-- | opcodes/ppc-opc.c | 6 |
3 files changed, 14 insertions, 8 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index a374397b8b4..979ca97b4b1 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,9 @@ +2019-12-23 Jan Beulich <jbeulich@suse.com> + + * ppc-dis.c (print_insn_powerpc): Rename local variable "spaces" + to "blanks". + * ppc-opc.c (D34, SI34, NSI34): Use UINT64_C(). + 2019-12-23 Alan Modra <amodra@gmail.com> * score-dis.c (print_insn_score32): Avoid signed overflow. diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c index 9add60272a5..7add08d1566 100644 --- a/opcodes/ppc-dis.c +++ b/opcodes/ppc-dis.c @@ -824,16 +824,16 @@ print_insn_powerpc (bfd_vma memaddr, need_paren } op_separator; bfd_boolean skip_optional; - int spaces; + int blanks; (*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; + blanks = 8 - strlen (opcode->name); + if (blanks <= 0) + blanks = 1; /* Now extract and print the operands. */ - op_separator = spaces; + op_separator = blanks; skip_optional = FALSE; for (opindex = opcode->operands; *opindex != 0; opindex++) { diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c index 403c9daff53..8dbe7b6abd9 100644 --- a/opcodes/ppc-opc.c +++ b/opcodes/ppc-opc.c @@ -2147,17 +2147,17 @@ const struct powerpc_operand powerpc_operands[] = off a register, and implies that the next operand is a register in parentheses. */ #define D34 DS + 1 - { 0x3ffffffff, PPC_OPSHIFT_INV, insert_d34, extract_d34, + { UINT64_C(0x3ffffffff), PPC_OPSHIFT_INV, insert_d34, extract_d34, PPC_OPERAND_PARENS | PPC_OPERAND_SIGNED }, /* The SI field in an 8-byte D form prefix instruction. */ #define SI34 D34 + 1 - { 0x3ffffffff, PPC_OPSHIFT_INV, insert_d34, extract_d34, PPC_OPERAND_SIGNED }, + { UINT64_C(0x3ffffffff), PPC_OPSHIFT_INV, insert_d34, extract_d34, PPC_OPERAND_SIGNED }, /* The NSI field in an 8-byte D form prefix instruction. This is the same as the SI34 field, only negated. */ #define NSI34 SI34 + 1 - { 0x3ffffffff, PPC_OPSHIFT_INV, insert_nsi34, extract_nsi34, + { UINT64_C(0x3ffffffff), PPC_OPSHIFT_INV, insert_nsi34, extract_nsi34, PPC_OPERAND_NEGATIVE | PPC_OPERAND_SIGNED }, /* The DUIS or BHRBE fields in a XFX form instruction, 10 bits |