[binutils-gdb] Simplify regcache_restore

[Yao Qi <qiyao at sourceware dot org>]

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

commit 4daf993d4d4686f2707810af3725038d2f289bbb
Author: Yao Qi <yao.qi@linaro.org>
Date:   Fri Apr 21 14:59:27 2017 +0100

    Simplify regcache_restore
    
    This patches removes the 2nd argument of regcache_restore, because it
    is only called by regcache_cpy.  In regcache_cpy, if regcache_restore
    is called, dst is not readonly, but src is readonly.  So this patch
    adds an assert that src is readonly in regcache_restore.
    regcache_cook_read read everything from a readonly regcache cache
    (src)'s register_buffer, and register status is from ->register_status.
    
    gdb:
    
    2017-04-21  Yao Qi  <yao.qi@linaro.org>
    
    	* regcache.c (regcache_restore): Remove argument 2.  Replace
    	argument 3 with regcache.  Get register status from
    	src->register_status and get register contents from
    	register_buffer (src, regnum).
    	(regcache_cpy): Update.

Diff:
---
 gdb/ChangeLog  |  8 ++++++++
 gdb/regcache.c | 15 +++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b30e63f..cb6db1f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2017-04-21  Yao Qi  <yao.qi@linaro.org>
+
+	* regcache.c (regcache_restore): Remove argument 2.  Replace
+	argument 3 with regcache.  Get register status from
+	src->register_status and get register contents from
+	register_buffer (src, regnum).
+	(regcache_cpy): Update.
+
 2017-04-19  Pedro Alves  <palves@redhat.com>
 
 	* gdbthread.h (thread): Add missing closing parenthesis in
diff --git a/gdb/regcache.c b/gdb/regcache.c
index 37bc2f0..41c23a5 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -374,17 +374,15 @@ regcache_save (struct regcache *dst, regcache_cooked_read_ftype *cooked_read,
 }
 
 static void
-regcache_restore (struct regcache *dst,
-		  regcache_cooked_read_ftype *cooked_read,
-		  void *cooked_read_context)
+regcache_restore (struct regcache *dst, struct regcache *src)
 {
   struct gdbarch *gdbarch = dst->descr->gdbarch;
-  gdb_byte buf[MAX_REGISTER_SIZE];
   int regnum;
 
   /* The dst had better not be read-only.  If it is, the `restore'
      doesn't make much sense.  */
   gdb_assert (!dst->readonly_p);
+  gdb_assert (src->readonly_p);
   /* Copy over any registers, being careful to only restore those that
      were both saved and need to be restored.  The full [0 .. gdbarch_num_regs
      + gdbarch_num_pseudo_regs) range is checked since some architectures need
@@ -393,11 +391,8 @@ regcache_restore (struct regcache *dst,
     {
       if (gdbarch_register_reggroup_p (gdbarch, regnum, restore_reggroup))
 	{
-	  enum register_status status;
-
-	  status = cooked_read (cooked_read_context, regnum, buf);
-	  if (status == REG_VALID)
-	    regcache_cooked_write (dst, regnum, buf);
+	  if (src->register_status[regnum] == REG_VALID)
+	    regcache_cooked_write (dst, regnum, register_buffer (src, regnum));
 	}
     }
 }
@@ -424,7 +419,7 @@ regcache_cpy (struct regcache *dst, struct regcache *src)
   if (!src->readonly_p)
     regcache_save (dst, do_cooked_read, src);
   else if (!dst->readonly_p)
-    regcache_restore (dst, do_cooked_read, src);
+    regcache_restore (dst, src);
   else
     regcache_cpy_no_passthrough (dst, src);
 }