X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Faarch64-gen.c;h=d2685dc3d1dea71afaec13adc0ae95d79295b27c;hb=7179e0e6b2e0ed7b220af8836a88ef308faf5898;hp=68b6e14afd212037b4dc04df6cea5a1c492e1918;hpb=3d731f6949e2b0099cfbe0cf608d60a52a66d354;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/aarch64-gen.c b/opcodes/aarch64-gen.c index 68b6e14afd..d2685dc3d1 100644 --- a/opcodes/aarch64-gen.c +++ b/opcodes/aarch64-gen.c @@ -1,6 +1,6 @@ /* aarch64-gen.c -- Generate tables and routines for opcode lookup and instruction encoding and decoding. - Copyright (C) 2012-2016 Free Software Foundation, Inc. + Copyright (C) 2012-2017 Free Software Foundation, Inc. Contributed by ARM Ltd. This file is part of the GNU opcodes library. @@ -143,9 +143,9 @@ read_table (const struct aarch64_opcode* table) /* F_PSEUDO needs to be used together with F_ALIAS to indicate an alias opcode is a programmer friendly pseudo instruction available only in the assembly code (thus will not show up in the disassembly). */ - assert (pseudo_opcode_p (ent) == FALSE || alias_opcode_p (ent) == TRUE); + assert (!pseudo_opcode_p (ent) || alias_opcode_p (ent)); /* Skip alias (inc. pseudo) opcode. */ - if (alias_opcode_p (ent) == TRUE) + if (alias_opcode_p (ent)) { index++; continue; @@ -704,7 +704,7 @@ find_alias_opcode (const aarch64_opcode *opcode) /* The mask of an alias opcode must be equal to or a super-set (i.e. more constrained) of that of the aliased opcode; so is the base opcode value. */ - if (alias_opcode_p (ent) == TRUE + if (alias_opcode_p (ent) && (ent->mask & opcode->mask) == opcode->mask && (opcode->mask & ent->opcode) == (opcode->mask & opcode->opcode)) { @@ -1241,7 +1241,7 @@ main (int argc, char **argv) print_divide_result (decoder_tree); printf ("/* This file is automatically generated by aarch64-gen. Do not edit! */\n"); - printf ("/* Copyright (C) 2012-2016 Free Software Foundation, Inc.\n\ + printf ("/* Copyright (C) 2012-2017 Free Software Foundation, Inc.\n\ Contributed by ARM Ltd.\n\ \n\ This file is part of the GNU opcodes library.\n\