From 5b616beff49ce5fe10c5efc2784b6b234bb8cb4f Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Tue, 27 Feb 2018 16:40:45 +0000 Subject: [PATCH] [ARM] Remove ARM_FEATURE_COPY macro Among the macros to manipulate an arm_feature_set structure is the ARM_FEATURE_COPY which copy the value of a feature set into another. This can be achieved with a simple assignement which most of the existing code does. This patch removes the last 2 uses of that macro and remove the macro altogether. 2018-02-27 Thomas Preud'homme include/ * opcode/arm.h (ARM_FEATURE_COPY): Remove macro definition. 2018-02-27 Thomas Preud'homme opcodes/ * arm-dis.c (print_insn_coprocessor): Replace uses of ARM_FEATURE_COPY macro by assignements. --- include/ChangeLog | 4 ++++ include/opcode/arm.h | 9 --------- opcodes/ChangeLog | 5 +++++ opcodes/arm-dis.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index e9ac49a..b6f98bc 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2018-02-27 Thomas Preud'homme + + * opcode/arm.h (ARM_FEATURE_COPY): Remove macro definition. + 2018-02-20 Maciej W. Rozycki * opcode/mips.h: Remove `M' operand code. diff --git a/include/opcode/arm.h b/include/opcode/arm.h index 9c5e79b..83b3f22 100644 --- a/include/opcode/arm.h +++ b/include/opcode/arm.h @@ -389,15 +389,6 @@ typedef struct } \ while (0) -#define ARM_FEATURE_COPY(F1, F2) \ - do \ - { \ - (F1).core[0] = (F2).core[0]; \ - (F1).core[1] = (F2).core[1]; \ - (F1).coproc = (F2).coproc; \ - } \ - while (0) - #define ARM_FEATURE_EQUAL(T1,T2) \ ( (T1).core[0] == (T2).core[0] \ && (T1).core[1] == (T2).core[1] \ diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 0659dd1..1885464 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2018-02-27 Thomas Preud'homme + + * arm-dis.c (print_insn_coprocessor): Replace uses of ARM_FEATURE_COPY + macro by assignements. + 2018-02-27 H.J. Lu PR gas/22871 diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c index afa9410..f0fc93c 100644 --- a/opcodes/arm-dis.c +++ b/opcodes/arm-dis.c @@ -3393,7 +3393,7 @@ print_insn_coprocessor (bfd_vma pc, struct arm_private_data *private_data = info->private_data; arm_feature_set allowed_arches = ARM_ARCH_NONE; - ARM_FEATURE_COPY (allowed_arches, private_data->features); + allowed_arches = private_data->features; for (insn = coprocessor_opcodes; insn->assembler; insn++) { @@ -3419,7 +3419,7 @@ print_insn_coprocessor (bfd_vma pc, continue; case SENTINEL_GENERIC_START: - ARM_FEATURE_COPY (allowed_arches, private_data->features); + allowed_arches = private_data->features; continue; default: -- 2.7.4