diff options
| author | Yao Qi <yao.qi@linaro.org> | 2018-02-21 11:20:03 +0000 |
|---|---|---|
| committer | Yao Qi <yao.qi@linaro.org> | 2018-02-21 11:20:03 +0000 |
| commit | fc5b87361580d915e28ae5f3cc4794b75b671b5a (patch) | |
| tree | 467350f5b0a6a236ec88f665f3eb8cfbe941f3fb /gdb/regcache.c | |
| parent | 849d0ba802323fe05e3039ed5b22957db2c85a67 (diff) | |
| download | gdb-fc5b87361580d915e28ae5f3cc4794b75b671b5a.zip gdb-fc5b87361580d915e28ae5f3cc4794b75b671b5a.tar.gz gdb-fc5b87361580d915e28ae5f3cc4794b75b671b5a.tar.bz2 | |
Remove regcache_save and regcache_cpy
... instead we start to use regcache methods save and restore. It is
quite straightforward to replace regcache_save with regcache->save.
regcache_cpy has some asserts, some of them not necessary, like
gdb_assert (src != dst);
because we already assert !m_readonly_p and src->m_readonly_p, so
src isn't dst. Some of the asserts are moved to ::restore.
gdb:
2018-02-21 Yao Qi <yao.qi@linaro.org>
* frame.c (frame_save_as_regcache): Use regcache method save.
(frame_pop): Use regcache method restore.
* infrun.c (restore_infcall_suspend_state): Likewise.
* linux-fork.c (fork_load_infrun_state): Likewise.
* ppc-linux-tdep.c (ppu2spu_sniffer): User regcache method
save.
* regcache.c (regcache_save): Remove.
(regcache::restore): More asserts.
(regcache_cpy): Remove.
* regcache.h (regcache_save): Remove the declaration.
(regcache::restore): Move from private to public.
Remove the friend declaration of regcache_cpy.
(regcache_cpy): Remove declaration.
Diffstat (limited to 'gdb/regcache.c')
| -rw-r--r-- | gdb/regcache.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/gdb/regcache.c b/gdb/regcache.c index ad5e0a2..0df6a88 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -282,13 +282,6 @@ reg_buffer::register_buffer (int regnum) const } void -regcache_save (struct regcache *regcache, - regcache_cooked_read_ftype *cooked_read, void *src) -{ - regcache->save (cooked_read, src); -} - -void regcache::save (regcache_cooked_read_ftype *cooked_read, void *src) { @@ -329,10 +322,14 @@ regcache::restore (struct regcache *src) struct gdbarch *gdbarch = m_descr->gdbarch; int regnum; + gdb_assert (src != NULL); /* The dst had better not be read-only. If it is, the `restore' doesn't make much sense. */ gdb_assert (!m_readonly_p); gdb_assert (src->m_readonly_p); + + gdb_assert (gdbarch == src->arch ()); + /* 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 @@ -347,17 +344,6 @@ regcache::restore (struct regcache *src) } } -void -regcache_cpy (struct regcache *dst, struct regcache *src) -{ - gdb_assert (src != NULL && dst != NULL); - gdb_assert (src->m_descr->gdbarch == dst->m_descr->gdbarch); - gdb_assert (src != dst); - gdb_assert (src->m_readonly_p && !dst->m_readonly_p); - - dst->restore (src); -} - struct regcache * regcache_dup (struct regcache *src) { |