[PATCH 3/4] gdb/riscv: Create each unique target description only once

[Andrew Burgess <andrew.burgess@embecosm.com>]

GDB relies on the fact that if two target descriptions have the same
contents, then they will be the same object instance (having the same
address).  One place where this is a requirement is in
GDBARCH_LIST_LOOKUP_BY_INFO which is used to find previously created
gdbarch objects.

In GDBARCH_LIST_LOOKUP_BY_INFO a pointer comparison is made on the
gdbarch's target description, if the pointers are different then it is
assumed the gdbarches have different, non-compatible target
descriptions.

Previously we would create duplicate target descriptions in the belief
that RISCV_GDBARCH_INIT would spot this duplication and discard the
second instance.  However, this was incorrect, and instead we ended up
creating duplicate gdbarch objects.

With this commit every unique feature set will create one and only one
target description, the feature set and resulting target description
is then cached so that the same target description object can be
returned later.

Many other target avoid this problem by creating a small number of
named target descriptions, and returning one of these.  However, we
currently have 8 possible target descriptions (32 vs 64 bit for x-reg
and f-reg, and h/w or s/w float abi) and creating each of these just
to avoid a dynamic cache seems pointless.

gdb/ChangeLog:

	* arch/riscv.c (class riscv_target_desc_cache): New.
	(riscv_tdesc_cache): New global.
	(riscv_create_target_description): Look in the cache before
	creating a new target description.
---
 gdb/ChangeLog    |  7 +++++++
 gdb/arch/riscv.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/gdb/arch/riscv.c b/gdb/arch/riscv.c
index cb715fabb1f..fef0c403e7b 100644
--- a/gdb/arch/riscv.c
+++ b/gdb/arch/riscv.c
@@ -24,11 +24,65 @@
 #include "../features/riscv/32bit-fpu.c"
 #include "../features/riscv/64bit-fpu.c"
 
+/* Class used to cache previously created RISC-V target descriptions.  */
+
+class riscv_target_desc_cache
+{
+public:
+
+  /* Lookup a previously created target description for FEATURES, or
+     return nullptr if no matching target description has ever been
+     created.  */
+  const target_desc *lookup (struct riscv_gdbarch_features features)
+  {
+    for (auto p : m_tdesc_list)
+      {
+        if (p.first == features)
+          return p.second;
+      }
+
+    return nullptr;
+  }
+
+  /* Add TDESC into the cache, a target description created to match
+     FEATURES.  */
+  void add (const struct riscv_gdbarch_features features,
+            const target_desc *tdesc)
+  {
+    feature_tdesc_pair p (features, tdesc);
+    m_tdesc_list.push_back (p);
+  }
+
+private:
+
+  /* Map from a feature set to the corresponding target description.  */
+  typedef std::pair<const struct riscv_gdbarch_features,
+                    const target_desc *> feature_tdesc_pair;
+
+  /* List of all target descriptions we've previously seen.  */
+  std::vector<feature_tdesc_pair> m_tdesc_list;
+};
+
+/* Cache of previously seen target descriptions, indexed by the feature set
+   that created them.  */
+static riscv_target_desc_cache riscv_tdesc_cache;
+
 /* See arch/riscv.h.  */
 
 const target_desc *
 riscv_create_target_description (struct riscv_gdbarch_features features)
 {
+  /* Have we seen this feature set before?  If we have return the same
+     target description.  GDB expects that if two target descriptions are
+     the same (in content terms) then they will actually be the same
+     instance.  This is important when trying to lookup gdbarch objects as
+     GDBARCH_LIST_LOOKUP_BY_INFO performs a pointer comparison on target
+     descriptions to find candidate gdbarch objects.  */
+  const target_desc *prev_tdesc = riscv_tdesc_cache.lookup (features);
+  if (prev_tdesc != nullptr)
+    return prev_tdesc;
+
+  /* Now we should create a new target description.  */
   target_desc *tdesc = allocate_target_description ();
 
 #ifndef IN_PROCESS_AGENT
@@ -65,5 +119,8 @@ riscv_create_target_description (struct riscv_gdbarch_features features)
   else if (features.flen == 8)
     regnum = create_feature_riscv_64bit_fpu (tdesc, regnum);
 
+  /* Add to the cache.  */
+  riscv_tdesc_cache.add (features, tdesc);
+
   return tdesc;
 }
-- 
2.14.5