From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 6 Jul 2022 22:01:20 +0000 (-0700)
Subject: morello: Remove the tag_map register.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=080f4291b4ebf315dc660e3121d0d2a1d1a98c48;p=thirdparty%2Fbinutils-gdb.git

morello: Remove the tag_map register.
---

diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 1bce9eeb5be..a6375a8bea1 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -271,7 +271,7 @@ static const char *const aarch64_c_register_names[] =
   "c16", "c17", "c18", "c19", "c20", "c21", "c22", "c23",
   "c24", "c25", "c26", "c27", "c28", "c29", "c30", "csp",
   "pcc", "ddc", "ctpidr", "rcsp", "rddc", "rctpidr", "cid",
-  "tag_map", "cctlr"
+  "cctlr"
 };
 
 /* The required core 'R' registers.  */
diff --git a/gdb/features/aarch64-capability.c b/gdb/features/aarch64-capability.c
index a4098af7103..6e6dc06b834 100644
--- a/gdb/features/aarch64-capability.c
+++ b/gdb/features/aarch64-capability.c
@@ -9,7 +9,6 @@ create_feature_aarch64_capability (struct target_desc *result, long regnum)
   struct tdesc_feature *feature;
 
   feature = tdesc_create_feature (result, "org.gnu.gdb.aarch64.capability");
-
   tdesc_create_reg (feature, "c0", regnum++, 1, "general", 128, "data_capability");
   tdesc_create_reg (feature, "c1", regnum++, 1, "general", 128, "data_capability");
   tdesc_create_reg (feature, "c2", regnum++, 1, "general", 128, "data_capability");
@@ -45,11 +44,10 @@ create_feature_aarch64_capability (struct target_desc *result, long regnum)
   tdesc_create_reg (feature, "pcc", regnum++, 1, "general", 128, "code_capability");
   tdesc_create_reg (feature, "ddc", regnum++, 1, "system", 128, "data_capability");
   tdesc_create_reg (feature, "ctpidr", regnum++, 1, "system", 128, "data_capability");
-  tdesc_create_reg (feature, "rcsp", regnum++, 1, "system", 128, "data_capability");
-  tdesc_create_reg (feature, "rddc", regnum++, 1, "system", 128, "data_capability");
+  tdesc_create_reg (feature, "rcsp", regnum++, 1, "general", 128, "data_capability");
+  tdesc_create_reg (feature, "rddc", regnum++, 1, "general", 128, "data_capability");
   tdesc_create_reg (feature, "rctpidr", regnum++, 1, "system", 128, "data_capability");
   tdesc_create_reg (feature, "cid", regnum++, 1, "system", 128, "data_capability");
-  tdesc_create_reg (feature, "tag_map", regnum++, 1, "system", 64, "uint64");
   tdesc_create_reg (feature, "cctlr", regnum++, 1, "system", 64, "uint64");
   return regnum;
 }
diff --git a/gdb/features/aarch64-capability.xml b/gdb/features/aarch64-capability.xml
index e8ae9b2db9f..015ad643c4c 100644
--- a/gdb/features/aarch64-capability.xml
+++ b/gdb/features/aarch64-capability.xml
@@ -46,6 +46,5 @@
   <reg name="rddc" bitsize="128" type="data_capability" group="general"/>
   <reg name="rctpidr" bitsize="128" type="data_capability" group="system"/>
   <reg name="cid" bitsize="128" type="data_capability" group="system"/>
-  <reg name="tag_map" bitsize="64" type="uint64" group="system"/>
   <reg name="cctlr" bitsize="64" type="uint64" group="system"/>
 </feature>