From 7e0bde70ca4ea73461365e95d2fcaae8fb925ab4 Mon Sep 17 00:00:00 2001 From: Tankut Baris Aktemur Date: Mon, 17 Feb 2020 16:11:54 +0100 Subject: [PATCH] gdbserver: turn target ops 'insert_point' and 'remove_point' into methods gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's insert_point and remove_point ops into methods of process_target. * target.h (struct process_stratum_target): Remove the target ops. (class process_target): Add the target ops. * target.cc (process_target::insert_point): Define. (process_target::remove_point): Define. Update the derived classes and callers below. * mem-break.cc (set_raw_breakpoint_at): Update. (delete_raw_breakpoint): Update. (uninsert_raw_breakpoint): Update. (reinsert_raw_breakpoint): Update. * linux-low.cc (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.cc (lynx_target_ops): Update. * nto-low.cc (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.cc (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/ChangeLog | 36 ++++++++++++++++++++++++++++++++++++ gdbserver/linux-low.cc | 14 ++++++-------- gdbserver/linux-low.h | 6 ++++++ gdbserver/lynx-low.cc | 2 -- gdbserver/mem-break.cc | 10 +++++----- gdbserver/nto-low.cc | 14 ++++++-------- gdbserver/nto-low.h | 6 ++++++ gdbserver/target.cc | 14 ++++++++++++++ gdbserver/target.h | 16 ++++++++-------- gdbserver/win32-low.cc | 14 ++++++-------- gdbserver/win32-low.h | 6 ++++++ 11 files changed, 99 insertions(+), 39 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 7afc59ffff7..2d613f61a4d 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,39 @@ +2020-02-20 Tankut Baris Aktemur + + Turn process_stratum_target's insert_point and remove_point ops + into methods of process_target. + + * target.h (struct process_stratum_target): Remove the target ops. + (class process_target): Add the target ops. + * target.cc (process_target::insert_point): Define. + (process_target::remove_point): Define. + + Update the derived classes and callers below. + + * mem-break.cc (set_raw_breakpoint_at): Update. + (delete_raw_breakpoint): Update. + (uninsert_raw_breakpoint): Update. + (reinsert_raw_breakpoint): Update. + * linux-low.cc (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.cc (lynx_target_ops): Update. + * nto-low.cc (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.cc (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. + 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's supports_z_point_type op into a diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 37e46a8ca22..96692cd77a7 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -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 052beb6c44c..6d58d6620b6 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -316,6 +316,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.cc b/gdbserver/lynx-low.cc index dd4584797c4..dc864e8bb10 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -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.cc b/gdbserver/mem-break.cc index b00e9fca353..682b3bc1832 100644 --- a/gdbserver/mem-break.cc +++ b/gdbserver/mem-break.cc @@ -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.cc b/gdbserver/nto-low.cc index 204d8066455..56d34626667 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -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 65bbf7e818c..b0b276319d2 100644 --- a/gdbserver/nto-low.h +++ b/gdbserver/nto-low.h @@ -86,6 +86,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.cc b/gdbserver/target.cc index 22339622e09..fd443efd61e 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -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 3262371749e..f04c1c15bcb 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.cc b/gdbserver/win32-low.cc index 024748e9282..c42d8d7414c 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -261,9 +261,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); @@ -272,9 +272,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); @@ -1838,8 +1838,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 a095ed80ffe..a6b27918f4c 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -140,6 +140,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. */ -- 2.30.2