[binutils-gdb] aarch64: improve debuggability on array of enum

[Matthieu Longo]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=46dace1933f6e9c367edb97c60c23bdac9d040b3

commit 46dace1933f6e9c367edb97c60c23bdac9d040b3
Author: Matthieu Longo <matthieu.longo@arm.com>
Date:   Fri Jun 7 16:59:57 2024 +0100

    aarch64: improve debuggability on array of enum
    
    The current space optmization on enum aarch64_opn_qualifier forced its
    encoding using an unsigned char. This "hard-coded" optimization has the
    bad consequence of making the array of such enums being completely
    unreadable when debugging with GDB because the enum type is lost along
    the way.
    Keeping this space optimization, and the enum type as well, is possible
    when the declaration of the enum is tagged with attribute((packed)).
    attribute((packed)) is a GNU extension, and is wrapped in the macro
    ATTRIBUTE_PACKED (defined in ansidecl.h), and should be used instead.

Diff:
---
 include/opcode/aarch64.h | 6 +++---
 opcodes/aarch64-opc.c    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/opcode/aarch64.h b/include/opcode/aarch64.h
index b258531736a..a964d64095d 100644
--- a/include/opcode/aarch64.h
+++ b/include/opcode/aarch64.h
@@ -984,7 +984,7 @@ enum aarch64_opnd_qualifier
 
   /* Special qualifier used for indicating error in qualifier retrieval.  */
   AARCH64_OPND_QLF_ERR,
-};
+} ATTRIBUTE_PACKED;
 

 /* Instruction class.  */
 
@@ -1235,8 +1235,8 @@ enum err_type
 #define AARCH64_MAX_OPND_NUM 7
 /* Maximum number of qualifier sequences an instruction can have.  */
 #define AARCH64_MAX_QLF_SEQ_NUM 10
-/* Operand qualifier typedef; optimized for the size.  */
-typedef unsigned char aarch64_opnd_qualifier_t;
+/* Operand qualifier typedef  */
+typedef enum aarch64_opnd_qualifier aarch64_opnd_qualifier_t;
 /* Operand qualifier sequence typedef.  */
 typedef aarch64_opnd_qualifier_t	\
 	  aarch64_opnd_qualifier_seq_t [AARCH64_MAX_OPND_NUM];
diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c
index 05e1a248622..93ae8767dfe 100644
--- a/opcodes/aarch64-opc.c
+++ b/opcodes/aarch64-opc.c
@@ -768,9 +768,9 @@ aarch64_get_expected_qualifier (const aarch64_opnd_qualifier_seq_t *qseq_list,
      it can mean no qualifier for the operand, or the qualifer sequence is
      not in use (when all qualifiers in the sequence are NILs), we have to
      handle this special case here.  */
-  if (known_qlf == AARCH64_OPND_NIL)
+  if (((enum aarch64_opnd) known_qlf) == AARCH64_OPND_NIL)
     {
-      assert (qseq_list[0][known_idx] == AARCH64_OPND_NIL);
+      assert (((enum aarch64_opnd) qseq_list[0][known_idx]) == AARCH64_OPND_NIL);
       return qseq_list[0][idx];
     }
 
@@ -781,7 +781,7 @@ aarch64_get_expected_qualifier (const aarch64_opnd_qualifier_seq_t *qseq_list,
 	  if (saved_i != -1)
 	    /* More than one sequences are found to have KNOWN_QLF at
 	       KNOWN_IDX.  */
-	    return AARCH64_OPND_NIL;
+	    return AARCH64_OPND_QLF_NIL;
 	  saved_i = i;
 	}
     }