aarch64: Remove redundant macros

We no longer encode flags in the aarch64_hint_options value field, so
delete the HINT_VAL, HINT_FLAG and HINT_ENCODE macros.

diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c
index 310a62220cf754c71537b908c01491a201ed15de..8cc2eb3f3c2013a04294edbf0fe4379239243f53 100644 (file)
--- a/opcodes/aarch64-dis.c
+++ b/opcodes/aarch64-dis.c
@@ -1526,7 +1526,7 @@ aarch64_ext_hint (const aarch64_operand *self ATTRIBUTE_UNUSED,
 
   for (i = 0; aarch64_hint_options[i].name != NULL; i++)
     {
-      if (hint_number == HINT_VAL (aarch64_hint_options[i].value))
+      if (hint_number == aarch64_hint_options[i].value)
        {
          info->hint_option = &(aarch64_hint_options[i]);
          return true;

diff --git a/opcodes/aarch64-opc.h b/opcodes/aarch64-opc.h
index 17bbaaa4a552d4107f7b6c978362f35816921d29..2ba48854cc4d2174b34d1afe921697617ebc8141 100644 (file)
--- a/opcodes/aarch64-opc.h
+++ b/opcodes/aarch64-opc.h
@@ -395,11 +395,6 @@ verify_constraints (const struct aarch64_inst *, const aarch64_insn, bfd_vma,
 #define F_REG_MAX_VALUE(X) ((X) << 15)
 #define F_GET_REG_MAX_VALUE(X) (((X) >> 15) & 0x0f)
 
-/* Encode 7-bit HINT #imm in the lower 8 bits.  Use higher bits for flags.  */
-#define HINT_ENCODE(flag, val) ((flag << 8) | val)
-#define HINT_FLAG(val) (val >> 8)
-#define HINT_VAL(val) (val & 0xff)
-
 static inline bool
 operand_has_inserter (const aarch64_operand *operand)
 {