From patchwork Tue Feb 11 09:01:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aktemur, Tankut Baris" X-Patchwork-Id: 37911 Received: (qmail 120089 invoked by alias); 11 Feb 2020 09:03: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 118369 invoked by uid 89); 11 Feb 2020 09:03:31 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=31512 X-HELO: mga17.intel.com Received: from mga17.intel.com (HELO mga17.intel.com) (192.55.52.151) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 11 Feb 2020 09:03:21 +0000 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Feb 2020 01:03:20 -0800 Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga004.fm.intel.com with ESMTP; 11 Feb 2020 01:03:19 -0800 Received: from ulvlx001.iul.intel.com (ulvlx001.iul.intel.com [172.28.207.17]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id 01B93IRr002183; Tue, 11 Feb 2020 09:03:18 GMT Received: from ulvlx001.iul.intel.com (localhost [127.0.0.1]) by ulvlx001.iul.intel.com with ESMTP id 01B93ITS010475; Tue, 11 Feb 2020 10:03:18 +0100 Received: (from taktemur@localhost) by ulvlx001.iul.intel.com with LOCAL id 01B93Inf010471; Tue, 11 Feb 2020 10:03:18 +0100 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 19/58] gdbserver: turn target ops 'insert_point' and 'remove_point' into methods Date: Tue, 11 Feb 2020 10:01:31 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes gdbserver/ChangeLog: 2020-02-10 Tankut Baris Aktemur Make process_stratum_target's insert_point and remove_point ops methods of process_target. * target.h (struct process_stratum_target): Remove the target ops. (class process_target): Add the target ops. * target.c (process_target::insert_point): Define. (process_target::remove_point): Define. Update the derived structs and callers below. * mem-break.c (set_raw_breakpoint_at): Update. (delete_raw_breakpoint): Update. (uninsert_raw_breakpoint): Update. (reinsert_raw_breakpoint): Update. * linux-low.c (linux_target_ops): Update. (linux_insert_point): Turn into ... (linux_process_target::insert_point): ... this. (linux_remove_point): Turn into ... (linux_process_target::remove_point): ... this. * linux-low.h (class linux_process_target): Update. * lynx-low.c (lynx_target_ops): Update. * nto-low.c (nto_target_ops): Update. (nto_insert_point): Turn into ... (nto_process_target::insert_point): ... this. (nto_remove_point): Turn into ... (nto_process_target::remove_point): ... this. * nto-low.h (class nto_process_target): Update. * win32-low.c (win32_target_ops): Update. (win32_insert_point): Turn into ... (win32_process_target::insert_point): ... this. (win32_remove_point): Turn into ... (win32_process_target::remove_point): ... this. * win32-low.h (class win32_process_target): Update. --- gdbserver/linux-low.c | 14 ++++++-------- gdbserver/linux-low.h | 6 ++++++ gdbserver/lynx-low.c | 2 -- gdbserver/mem-break.c | 10 +++++----- gdbserver/nto-low.c | 14 ++++++-------- gdbserver/nto-low.h | 6 ++++++ gdbserver/target.c | 14 ++++++++++++++ gdbserver/target.h | 16 ++++++++-------- gdbserver/win32-low.c | 14 ++++++-------- gdbserver/win32-low.h | 6 ++++++ 10 files changed, 63 insertions(+), 39 deletions(-) diff --git a/gdbserver/linux-low.c b/gdbserver/linux-low.c index da03b8c3b03..9427b9bdeb9 100644 --- a/gdbserver/linux-low.c +++ b/gdbserver/linux-low.c @@ -5964,9 +5964,9 @@ linux_process_target::supports_z_point_type (char z_type) && the_low_target.supports_z_point_type (z_type)); } -static int -linux_insert_point (enum raw_bkpt_type type, CORE_ADDR addr, - int size, struct raw_breakpoint *bp) +int +linux_process_target::insert_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) { if (type == raw_bkpt_type_sw) return insert_memory_breakpoint (bp); @@ -5977,9 +5977,9 @@ linux_insert_point (enum raw_bkpt_type type, CORE_ADDR addr, return 1; } -static int -linux_remove_point (enum raw_bkpt_type type, CORE_ADDR addr, - int size, struct raw_breakpoint *bp) +int +linux_process_target::remove_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) { if (type == raw_bkpt_type_sw) return remove_memory_breakpoint (bp); @@ -7376,8 +7376,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_insert_point, - linux_remove_point, linux_stopped_by_sw_breakpoint, linux_supports_stopped_by_sw_breakpoint, linux_stopped_by_hw_breakpoint, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index c51027bb0dc..0887c932d6c 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -315,6 +315,12 @@ public: unsigned int len) override; bool supports_z_point_type (char z_type) override; + + int insert_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) override; + + int remove_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) override; }; #define get_thread_lwp(thr) ((struct lwp_info *) (thread_target_data (thr))) diff --git a/gdbserver/lynx-low.c b/gdbserver/lynx-low.c index 4be6e841d44..60748ae03db 100644 --- a/gdbserver/lynx-low.c +++ b/gdbserver/lynx-low.c @@ -729,8 +729,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* insert_point */ - NULL, /* remove_point */ NULL, /* stopped_by_sw_breakpoint */ NULL, /* supports_stopped_by_sw_breakpoint */ NULL, /* stopped_by_hw_breakpoint */ diff --git a/gdbserver/mem-break.c b/gdbserver/mem-break.c index b00e9fca353..682b3bc1832 100644 --- a/gdbserver/mem-break.c +++ b/gdbserver/mem-break.c @@ -460,7 +460,7 @@ set_raw_breakpoint_at (enum raw_bkpt_type type, CORE_ADDR where, int kind, if (!bp->inserted) { - *err = the_target->insert_point (bp->raw_type, bp->pc, bp->kind, bp); + *err = the_target->pt->insert_point (bp->raw_type, bp->pc, bp->kind, bp); if (*err != 0) { if (debug_threads) @@ -890,8 +890,8 @@ delete_raw_breakpoint (struct process_info *proc, struct raw_breakpoint *todel) *bp_link = bp->next; - ret = the_target->remove_point (bp->raw_type, bp->pc, bp->kind, - bp); + ret = the_target->pt->remove_point (bp->raw_type, bp->pc, + bp->kind, bp); if (ret != 0) { /* Something went wrong, relink the breakpoint. */ @@ -1532,7 +1532,7 @@ uninsert_raw_breakpoint (struct raw_breakpoint *bp) bp->inserted = 0; - err = the_target->remove_point (bp->raw_type, bp->pc, bp->kind, bp); + err = the_target->pt->remove_point (bp->raw_type, bp->pc, bp->kind, bp); if (err != 0) { bp->inserted = 1; @@ -1621,7 +1621,7 @@ reinsert_raw_breakpoint (struct raw_breakpoint *bp) if (bp->inserted) return; - err = the_target->insert_point (bp->raw_type, bp->pc, bp->kind, bp); + err = the_target->pt->insert_point (bp->raw_type, bp->pc, bp->kind, bp); if (err == 0) bp->inserted = 1; else if (debug_threads) diff --git a/gdbserver/nto-low.c b/gdbserver/nto-low.c index 132d57bfe79..c554d91ceea 100644 --- a/gdbserver/nto-low.c +++ b/gdbserver/nto-low.c @@ -807,9 +807,9 @@ nto_process_target::supports_z_point_type (char z_type) /* Insert {break/watch}point at address ADDR. SIZE is not used. */ -static int -nto_insert_point (enum raw_bkpt_type type, CORE_ADDR addr, - int size, struct raw_breakpoint *bp) +int +nto_process_target::insert_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) { int wtype = _DEBUG_BREAK_HW; /* Always request HW. */ @@ -839,9 +839,9 @@ nto_insert_point (enum raw_bkpt_type type, CORE_ADDR addr, /* Remove {break/watch}point at address ADDR. SIZE is not used. */ -static int -nto_remove_point (enum raw_bkpt_type type, CORE_ADDR addr, - int size, struct raw_breakpoint *bp) +int +nto_process_target::remove_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) { int wtype = _DEBUG_BREAK_HW; /* Always request HW. */ @@ -950,8 +950,6 @@ nto_sw_breakpoint_from_kind (int kind, int *size) static nto_process_target the_nto_target; static process_stratum_target nto_target_ops = { - nto_insert_point, - nto_remove_point, NULL, /* stopped_by_sw_breakpoint */ NULL, /* supports_stopped_by_sw_breakpoint */ NULL, /* stopped_by_hw_breakpoint */ diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h index d99d5d7acc7..a51477789e7 100644 --- a/gdbserver/nto-low.h +++ b/gdbserver/nto-low.h @@ -85,6 +85,12 @@ public: unsigned int len) override; bool supports_z_point_type (char z_type) override; + + int insert_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) override; + + int remove_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) override; }; /* The inferior's target description. This is a global because the diff --git a/gdbserver/target.c b/gdbserver/target.c index 22339622e09..fd443efd61e 100644 --- a/gdbserver/target.c +++ b/gdbserver/target.c @@ -433,3 +433,17 @@ process_target::supports_z_point_type (char z_type) { return false; } + +int +process_target::insert_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) +{ + return 1; +} + +int +process_target::remove_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) +{ + return 1; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 383a848fcb9..966741f21ed 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,14 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Insert and remove a break or watchpoint. - Returns 0 on success, -1 on failure and 1 on unsupported. */ - - int (*insert_point) (enum raw_bkpt_type type, CORE_ADDR addr, - int size, struct raw_breakpoint *bp); - int (*remove_point) (enum raw_bkpt_type type, CORE_ADDR addr, - int size, struct raw_breakpoint *bp); - /* Returns 1 if the target stopped because it executed a software breakpoint instruction, 0 otherwise. */ int (*stopped_by_sw_breakpoint) (void); @@ -476,6 +468,14 @@ public: '4' - access watchpoint */ virtual bool supports_z_point_type (char z_type); + + /* Insert and remove a break or watchpoint. + Returns 0 on success, -1 on failure and 1 on unsupported. */ + virtual int insert_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp); + + virtual int remove_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp); }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.c b/gdbserver/win32-low.c index 74b70659465..9f705507e96 100644 --- a/gdbserver/win32-low.c +++ b/gdbserver/win32-low.c @@ -262,9 +262,9 @@ win32_process_target::supports_z_point_type (char z_type) && the_low_target.supports_z_point_type (z_type)); } -static int -win32_insert_point (enum raw_bkpt_type type, CORE_ADDR addr, - int size, struct raw_breakpoint *bp) +int +win32_process_target::insert_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) { if (the_low_target.insert_point != NULL) return the_low_target.insert_point (type, addr, size, bp); @@ -273,9 +273,9 @@ win32_insert_point (enum raw_bkpt_type type, CORE_ADDR addr, return 1; } -static int -win32_remove_point (enum raw_bkpt_type type, CORE_ADDR addr, - int size, struct raw_breakpoint *bp) +int +win32_process_target::remove_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) { if (the_low_target.remove_point != NULL) return the_low_target.remove_point (type, addr, size, bp); @@ -1828,8 +1828,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size) static win32_process_target the_win32_target; static process_stratum_target win32_target_ops = { - win32_insert_point, - win32_remove_point, NULL, /* stopped_by_sw_breakpoint */ NULL, /* supports_stopped_by_sw_breakpoint */ NULL, /* stopped_by_hw_breakpoint */ diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index f40dfb48822..39c4a4ce917 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -139,6 +139,12 @@ public: void request_interrupt () override; bool supports_z_point_type (char z_type) override; + + int insert_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) override; + + int remove_point (enum raw_bkpt_type type, CORE_ADDR addr, + int size, raw_breakpoint *bp) override; }; /* Retrieve the context for this thread, if not already retrieved. */