From patchwork Fri Dec 1 10:48:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 24667 Received: (qmail 75312 invoked by alias); 1 Dec 2017 10:48:43 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 74863 invoked by uid 89); 1 Dec 2017 10:48:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.7 required=5.0 tests=BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=UD:gdbarch X-HELO: mail-wm0-f51.google.com Received: from mail-wm0-f51.google.com (HELO mail-wm0-f51.google.com) (74.125.82.51) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 01 Dec 2017 10:48:24 +0000 Received: by mail-wm0-f51.google.com with SMTP id f140so2616625wmd.2 for ; Fri, 01 Dec 2017 02:48:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=e0mpQyxRbHphtaTPzRfGL9fyAfVRV3BUz1A3VB4y9ks=; b=bC2rIW3BkfxljuRbqNTtvZqYcIMYPHSomrz6ddDLH0ZetfsygiNec2NdntuAH+2s0O Rk9K8V+nZNVhcBTf+IXbihAjpX4CAG0a2ydp9iDRwiNBNalZr7s5BxyXa+Fcv3V5ZRJn DcPXTAtFilERXnwGJbPq7q0ZCoZJUr8vVjL5rx0v02BmDhdcxNooe4vt4mitlVOVkcJB 0CMg6rjvoCuaPj3Zo5tcdaZ06Lyiu/cJfmOig/vAaZYKRWl3nRgf+5Q219AQ8u6ghZdy aCNfDDBrmbc/qG/sypr1XmjmkLOYnnxnDIOASNJyeBUJp7LaOHP3RHWu2wp8YY/ZFGFA yKKQ== X-Gm-Message-State: AJaThX5Yu8VJ+L8UynZYHjffmpM2rnjKjN9DTykW929HbHs18ddMU6Ro OC6k+q/oVUkJUH/IcBK1zPLC8w== X-Google-Smtp-Source: AGs4zMYTHFUT6W/Ky6cueUhZozr2Ybpt6g5F7XYW/spq5oladE+TBA6U6cRK+14ISn8EYuyVij53Qg== X-Received: by 10.28.224.4 with SMTP id x4mr834731wmg.118.1512125301070; Fri, 01 Dec 2017 02:48:21 -0800 (PST) Received: from E107787-LIN.cambridge.arm.com (static.42.136.251.148.clients.your-server.de. [148.251.136.42]) by smtp.gmail.com with ESMTPSA id o10sm5316833wrg.5.2017.12.01.02.48.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Dec 2017 02:48:20 -0800 (PST) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 09/15] Remove regcache_save and regcache_cpy Date: Fri, 1 Dec 2017 10:48:00 +0000 Message-Id: <1512125286-29788-10-git-send-email-yao.qi@linaro.org> In-Reply-To: <1512125286-29788-1-git-send-email-yao.qi@linaro.org> References: <1512125286-29788-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes ... 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: 2017-10-30 Yao Qi * 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. --- gdb/frame.c | 7 +++---- gdb/infrun.c | 2 +- gdb/linux-fork.c | 2 +- gdb/ppc-linux-tdep.c | 2 +- gdb/regcache.c | 22 ++++------------------ gdb/regcache.h | 30 +++++++++--------------------- 6 files changed, 19 insertions(+), 46 deletions(-) diff --git a/gdb/frame.c b/gdb/frame.c index e643823..4659cf5 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1023,7 +1023,7 @@ frame_save_as_regcache (struct frame_info *this_frame) std::unique_ptr regcache (new struct regcache (get_frame_arch (this_frame))); - regcache_save (regcache.get (), do_frame_register_read, this_frame); + regcache->save (do_frame_register_read, this_frame); return regcache; } @@ -1068,9 +1068,8 @@ frame_pop (struct frame_info *this_frame) Unfortunately, they don't implement it. Their lack of a formal definition can lead to targets writing back bogus values (arguably a bug in the target code mind). */ - /* Now copy those saved registers into the current regcache. - Here, regcache_cpy() calls regcache_restore(). */ - regcache_cpy (get_current_regcache (), scratch.get ()); + /* Now copy those saved registers into the current regcache. */ + get_current_regcache ()->restore (scratch.get ()); /* We've made right mess of GDB's local state, just discard everything. */ diff --git a/gdb/infrun.c b/gdb/infrun.c index d7df3c7..5c128b5 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -8867,7 +8867,7 @@ restore_infcall_suspend_state (struct infcall_suspend_state *inf_state) (and perhaps other times). */ if (target_has_execution) /* NB: The register write goes through to the target. */ - regcache_cpy (regcache, inf_state->registers); + regcache->restore (inf_state->registers); discard_infcall_suspend_state (inf_state); } diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c index f55f743..5d05cb3 100644 --- a/gdb/linux-fork.c +++ b/gdb/linux-fork.c @@ -261,7 +261,7 @@ fork_load_infrun_state (struct fork_info *fp) linux_nat_switch_fork (fp->ptid); if (fp->savedregs && fp->clobber_regs) - regcache_cpy (get_current_regcache (), fp->savedregs); + get_current_regcache ()->restore (fp->savedregs); registers_changed (); reinit_frame_cache (); diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c index 70e5b95..398ac24 100644 --- a/gdb/ppc-linux-tdep.c +++ b/gdb/ppc-linux-tdep.c @@ -1351,7 +1351,7 @@ ppu2spu_sniffer (const struct frame_unwind *self, std::unique_ptr regcache (new struct regcache (data.gdbarch)); - regcache_save (regcache.get (), ppu2spu_unwind_register, &data); + regcache->save (ppu2spu_unwind_register, &data); cache->frame_id = frame_id_build (base, func); cache->regcache = regcache.release (); diff --git a/gdb/regcache.c b/gdb/regcache.c index 5ce6064..f4ef933 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) { diff --git a/gdb/regcache.h b/gdb/regcache.h index b107bbd..d8054b2 100644 --- a/gdb/regcache.h +++ b/gdb/regcache.h @@ -198,20 +198,10 @@ extern struct type *register_type (struct gdbarch *gdbarch, int regnum); extern int register_size (struct gdbarch *gdbarch, int regnum); - -/* Save/restore a register cache. The set of registers saved / - restored into the DST regcache determined by the save_reggroup / - restore_reggroup respectively. COOKED_READ returns zero iff the - register's value can't be returned. */ - typedef enum register_status (regcache_cooked_read_ftype) (void *src, int regnum, gdb_byte *buf); -extern void regcache_save (struct regcache *dst, - regcache_cooked_read_ftype *cooked_read, - void *cooked_read_context); - enum regcache_dump_what { regcache_dump_none, regcache_dump_raw, @@ -315,7 +305,14 @@ public: return m_aspace; } +/* Save/restore a register cache. The set of registers saved / + restored into the regcache determined by the save_reggroup / + restore_reggroup respectively. COOKED_READ returns zero iff the + register's value can't be returned. */ void save (regcache_cooked_read_ftype *cooked_read, void *src); + /* Writes to regcache will go through to the target. SRC is a + read-only register cache. */ + void restore (struct regcache *src); void cooked_write (int regnum, const gdb_byte *buf); @@ -381,7 +378,6 @@ protected: static std::forward_list current_regcache; private: - void restore (struct regcache *src); void transfer_regset (const struct regset *regset, struct regcache *out_regcache, @@ -399,9 +395,8 @@ private: /* Is this a read-only cache? A read-only cache is used for saving the target's register state (e.g, across an inferior function call or just before forcing a function return). A read-only - cache can only be updated via the methods regcache_dup() and - regcache_cpy(). The actual contents are determined by the - reggroup_save and reggroup_restore methods. */ + cache can only be created via a constructor. The actual contents + are determined by the save and restore methods. */ const bool m_readonly_p; /* If this is a read-write cache, which thread's registers is it connected to? */ @@ -413,19 +408,12 @@ private: friend void registers_changed_ptid (ptid_t ptid); - - friend void - regcache_cpy (struct regcache *dst, struct regcache *src); }; /* Duplicate the contents of a register cache to a read-only register cache. The operation is pass-through. */ extern struct regcache *regcache_dup (struct regcache *regcache); -/* Writes to DEST will go through to the target. SRC is a read-only - register cache. */ -extern void regcache_cpy (struct regcache *dest, struct regcache *src); - extern void registers_changed (void); extern void registers_changed_ptid (ptid_t);