[PATCH 5/6] Use copy ctor in regcache_dup

[Yao Qi <qiyaoltc at gmail dot com>]

gdb:

2017-04-25  Yao Qi  <yao.qi@linaro.org>

	* regcache.c (regcache::regcache): New copy ctor.
	(do_cooked_read): Moved above.
	(regcache_dup): Use copy ctor.
	* regcache.h (struct regcache): Declare copy ctor and remove
	friend regcache_dup.
---
 gdb/regcache.c | 30 ++++++++++++++++--------------
 gdb/regcache.h |  7 ++++---
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/gdb/regcache.c b/gdb/regcache.c
index 28163c2..3fc0aee 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -209,6 +209,21 @@ regcache::regcache (struct gdbarch *gdbarch, struct address_space *aspace_,
   ptid = minus_one_ptid;
 }
 
+static enum register_status
+do_cooked_read (void *src, int regnum, gdb_byte *buf)
+{
+  struct regcache *regcache = (struct regcache *) src;
+
+  return regcache_cooked_read (regcache, regnum, buf);
+}
+
+regcache::regcache (const regcache &origin)
+  : regcache (origin.get_arch (), origin.get_aspace (), true)
+{
+  gdb_assert (!origin.readonly_p);
+  save (do_cooked_read, (void *) &origin);
+}
+
 struct gdbarch *
 regcache::get_arch () const
 {
@@ -371,14 +386,6 @@ regcache::restore (struct regcache *src)
     }
 }
 
-static enum register_status
-do_cooked_read (void *src, int regnum, gdb_byte *buf)
-{
-  struct regcache *regcache = (struct regcache *) src;
-
-  return regcache_cooked_read (regcache, regnum, buf);
-}
-
 void
 regcache_cpy (struct regcache *dst, struct regcache *src)
 {
@@ -420,12 +427,7 @@ regcache::cpy_no_passthrough (struct regcache *src)
 struct regcache *
 regcache_dup (struct regcache *src)
 {
-  struct regcache *newbuf;
-
-  gdb_assert (!src->readonly_p);
-  newbuf = regcache_xmalloc (src->get_arch (), get_regcache_aspace (src));
-  newbuf->save (do_cooked_read, src);
-  return newbuf;
+  return new regcache (*src);
 }
 
 enum register_status
diff --git a/gdb/regcache.h b/gdb/regcache.h
index e6494a9..0d302a7 100644
--- a/gdb/regcache.h
+++ b/gdb/regcache.h
@@ -240,6 +240,10 @@ public:
     : regcache (gdbarch, aspace_, true)
   {}
 
+  /* Copy constructor, create a readonly regcache from a non-readonly
+     regcache.  */
+  regcache (const regcache &);
+
   ~regcache ()
   {
     xfree (registers);
@@ -378,9 +382,6 @@ private:
 
   friend void
   regcache_cpy (struct regcache *dst, struct regcache *src);
-
-  friend struct regcache *
-  regcache_dup (struct regcache *src);
 };
 
 /* Copy/duplicate the contents of a register cache.  By default, the
-- 
1.9.1