[Morello] Add new DWARF defines for capabilities

This patch adds some new definitions required for Morello.

* DWARF base types: DW_ATE_CHERI_signed_intcap and DW_ATE_CHERI_unsigned_intcap.

* DWARF address class: DW_ADDR_capability

* DWARF register numbering

It also adds support for handling DW_ATE_CHERI_signed_intcap and
DW_ATE_CHERI_unsigned_intcap on binutils and GDB.

binutils/ChangeLog

2020-10-20  Luis Machado  <luis.machado@arm.com>

	* dwarf.c (get_type_signedness): Handles capabilities.
	(read_and_display_attr_value): Likewise.

gdb/ChangeLog:

2020-10-20  Luis Machado  <luis.machado@arm.com>

	* aarch64-tdep.h (AARCH64_DWARF_C0, AARCH64_DWARF_CSP)
	(AARCH64_DWARF_PCC, AARCH64_DWARF_DDC)
	(AARCH64_DWARF_RESERVED_1, AARCH64_DWARF_RESERVED_2)
	(C_REGISTER_SIZE): New defines.
	* dwarf2/read.c (read_base_type): Handle capabilities.

include/ChangeLog

2020-10-20  Luis Machado  <luis.machado@arm.com>

	* dwarf2.def (DW_ATE_CHERI_signed_intcap)
	(DW_ATE_CHERI_unsigned_intcap): New defines.
	* dwarf2.h (DW_ADDR_capability): New define.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 635f9211a6f3dcc59909ff45d918b5b70715757e..4fee9910311b005b3923692b551156392ca13a2d 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-20  Luis Machado  <luis.machado@arm.com>
+
+       * dwarf.c (get_type_signedness): Handles capabilities.
+       (read_and_display_attr_value): Likewise.
+
 2020-10-20  Siddhesh Poyarekar  <siddesh.poyarekar@arm.com>
 
        * dwarf.c (dwarf_regnames_aarch64): Add capability registers.

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 9db544232fe9be2dc334e43b0b8c7d118e756f88..f005aa64c639bd14155f151126329f61ba009050 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -2041,6 +2041,7 @@ get_type_signedness (unsigned char *        start,
            case DW_ATE_unsigned:
            case DW_ATE_unsigned_char:
            case DW_ATE_unsigned_fixed:
+           case DW_ATE_CHERI_unsigned_intcap:
              * is_signed = FALSE;
              break;
 
@@ -2052,6 +2053,7 @@ get_type_signedness (unsigned char *        start,
            case DW_ATE_imaginary_float:
            case DW_ATE_decimal_float:
            case DW_ATE_signed_fixed:
+           case DW_ATE_CHERI_signed_intcap:
              * is_signed = TRUE;
              break;
            }
@@ -2788,6 +2790,13 @@ read_and_display_attr_value (unsigned long           attribute,
        case DW_ATE_HP_imaginary_float80:       printf ("(HP_imaginary_float80)"); break;
        case DW_ATE_HP_imaginary_float128:      printf ("(HP_imaginary_float128)"); break;
 
+       case DW_ATE_CHERI_signed_intcap:
+         printf ("(CHERI intcap_t)");
+         break;
+       case DW_ATE_CHERI_unsigned_intcap:
+         printf ("(CHERI uintcap_t)");
+         break;
+
        default:
          if (uvalue >= DW_ATE_lo_user
              && uvalue <= DW_ATE_hi_user)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 94524c28caf0bd715f95c03b086e854b5f282b7e..4ae973ba063e3052eac6b4a0e9142a01344a7d90 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2020-10-20  Luis Machado  <luis.machado@arm.com>
+
+       * aarch64-tdep.h (AARCH64_DWARF_C0, AARCH64_DWARF_CSP)
+       (AARCH64_DWARF_PCC, AARCH64_DWARF_DDC)
+       (AARCH64_DWARF_RESERVED_1, AARCH64_DWARF_RESERVED_2)
+       (C_REGISTER_SIZE): New defines.
+       * dwarf2/read.c (read_base_type): Handle capabilities.
+
 2020-10-20  Luis Machado  <luis.machado@arm.com>
 
        * target-descriptions.c (make_gdb_type): Handle new capability

diff --git a/gdb/aarch64-tdep.h b/gdb/aarch64-tdep.h
index f6ebabeaeb95b49010c0e70cfd9ca714e554a52f..3260a5e15b870fccaef6d7219928124a071cf56e 100644 (file)
--- a/gdb/aarch64-tdep.h
+++ b/gdb/aarch64-tdep.h
@@ -40,6 +40,12 @@ struct regset;
 #define AARCH64_DWARF_SVE_FFR  47
 #define AARCH64_DWARF_SVE_P0   48
 #define AARCH64_DWARF_SVE_Z0   96
+#define AARCH64_DWARF_C0  198
+#define AARCH64_DWARF_CSP 229
+#define AARCH64_DWARF_PCC 230
+#define AARCH64_DWARF_DDC 231
+#define AARCH64_DWARF_RESERVED_1  232
+#define AARCH64_DWARF_RESERVED_2  233
 
 /* Size of integer registers.  */
 #define X_REGISTER_SIZE  8
@@ -49,6 +55,7 @@ struct regset;
 #define D_REGISTER_SIZE  8
 #define V_REGISTER_SIZE 16
 #define Q_REGISTER_SIZE 16
+#define C_REGISTER_SIZE 16
 
 /* Total number of general (X) registers.  */
 #define AARCH64_X_REGISTER_COUNT 32

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 37409c5c3fc64093ac1b23086572b0b3a575cafa..000738bcd6a74441d6420c522b82d8cd169dbc30 100644 (file)
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -18024,6 +18024,15 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu)
        }
        break;
 
+      case DW_ATE_CHERI_signed_intcap:
+      case DW_ATE_CHERI_unsigned_intcap:
+       {
+         /* Turn DW_ATE_CHERI_*_intcap into a void * pointer.  */
+         type = init_type (objfile, TYPE_CODE_VOID, TARGET_CHAR_BIT, NULL);
+         type = init_pointer_type (objfile, bits, name, type);
+         break;
+       }
+
       default:
        complaint (_("unsupported DW_AT_encoding: '%s'"),
                   dwarf_type_encoding_name (encoding));

diff --git a/include/ChangeLog b/include/ChangeLog
index 982e25f8f1445ce12ec9cf3164fa8970c9111379..86f78d471416eff1472869bebdd1e73cb440bf93 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,9 @@
+2020-10-20  Luis Machado  <luis.machado@arm.com>
+
+       * dwarf2.def (DW_ATE_CHERI_signed_intcap)
+       (DW_ATE_CHERI_unsigned_intcap): New defines.
+       * dwarf2.h (DW_ADDR_capability): New define.
+
 2020-10-20  Siddhesh Poyarekar  <siddesh.poyarekar@arm.com>
 
        * elf/aarch64.h: New Morello TLSDESC relocations.

diff --git a/include/dwarf2.def b/include/dwarf2.def
index 13825a3eef7ea5ce3aac790e1082c571cad340ad..c559ed1f5bf391cb7c388edc8a35751f07afc3c6 100644 (file)
--- a/include/dwarf2.def
+++ b/include/dwarf2.def
@@ -750,6 +750,11 @@ DW_ATE (DW_ATE_HP_unsigned_fixed, 0x8e) /* Cobol.  */
 DW_ATE (DW_ATE_HP_VAX_complex_float, 0x8f) /* F or G floating complex.  */
 DW_ATE (DW_ATE_HP_VAX_complex_float_d, 0x90) /* D floating complex.  */
 
+/* Describes a signed integer/capability type __intcap_t.  */
+DW_ATE (DW_ATE_CHERI_signed_intcap, 0xa0)
+/* Describes an unsigned integer/capability type __uintcap_t.  */
+DW_ATE (DW_ATE_CHERI_unsigned_intcap, 0xa1)
+
 DW_END_ATE
 
 DW_FIRST_CFA (DW_CFA_advance_loc, 0x40)

diff --git a/include/dwarf2.h b/include/dwarf2.h
index 83cf50d7bf53d3c275085d2fa01d04d697330639..ce1cc633af721cbd412c45504bb42ae1feed5e58 100644 (file)
--- a/include/dwarf2.h
+++ b/include/dwarf2.h
@@ -331,6 +331,9 @@ enum dwarf_location_list_entry_type
 
 #define DW_ADDR_none           0
 
+/* The type is an address capability and can be dereferenced as such.  */
+#define DW_ADDR_capability  0x1
+
 /* Source language names and codes.  */
 enum dwarf_source_language
   {