From 1473995743b5a05056f15a90d11baab235ded63e Mon Sep 17 00:00:00 2001 From: davem Date: Tue, 11 Oct 2011 18:35:25 +0000 Subject: [PATCH] Fix regcache_restore() handling of unavailable regs. * regcache.c (regcache_restore): Do not write unavailable regs, mark static. * regcache.h (regcache_restore): Remove declaration. --- gdb/ChangeLog | 6 ++++++ gdb/regcache.c | 7 ++++--- gdb/regcache.h | 3 --- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ccd0530e97..e871fb17fd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2011-10-11 David S. Miller + + * regcache.c (regcache_restore): Do not write unavailable regs, mark + static. + * regcache.h (regcache_restore): Remove declaration. + 2011-10-11 Jan Kratochvil Revert this part of: diff --git a/gdb/regcache.c b/gdb/regcache.c index 37092f8255..ea8189e67d 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -331,7 +331,7 @@ regcache_save (struct regcache *dst, regcache_cooked_read_ftype *cooked_read, } } -void +static void regcache_restore (struct regcache *dst, regcache_cooked_read_ftype *cooked_read, void *cooked_read_context) @@ -351,9 +351,10 @@ regcache_restore (struct regcache *dst, { if (gdbarch_register_reggroup_p (gdbarch, regnum, restore_reggroup)) { - int valid = cooked_read (cooked_read_context, regnum, buf); + enum register_status status; - if (valid) + status = cooked_read (cooked_read_context, regnum, buf); + if (status == REG_VALID) regcache_cooked_write (dst, regnum, buf); } } diff --git a/gdb/regcache.h b/gdb/regcache.h index 5531f398ca..440fbe6094 100644 --- a/gdb/regcache.h +++ b/gdb/regcache.h @@ -174,9 +174,6 @@ typedef enum register_status (regcache_cooked_read_ftype) (void *src, extern void regcache_save (struct regcache *dst, regcache_cooked_read_ftype *cooked_read, void *cooked_read_context); -extern void regcache_restore (struct regcache *dst, - regcache_cooked_read_ftype *cooked_read, - void *cooked_read_context); /* Copy/duplicate the contents of a register cache. By default, the operation is pass-through. Writes to DST and reads from SRC will -- 2.11.0