diff options
| -rw-r--r-- | gdbserver/ChangeLog | 26 | ||||
| -rw-r--r-- | gdbserver/linux-low.cc | 5 | ||||
| -rw-r--r-- | gdbserver/linux-low.h | 2 | ||||
| -rw-r--r-- | gdbserver/lynx-low.cc | 1 | ||||
| -rw-r--r-- | gdbserver/mem-break.cc | 3 | ||||
| -rw-r--r-- | gdbserver/nto-low.cc | 9 | ||||
| -rw-r--r-- | gdbserver/nto-low.h | 2 | ||||
| -rw-r--r-- | gdbserver/target.cc | 6 | ||||
| -rw-r--r-- | gdbserver/target.h | 20 | ||||
| -rw-r--r-- | gdbserver/win32-low.cc | 5 | ||||
| -rw-r--r-- | gdbserver/win32-low.h | 2 |
11 files changed, 57 insertions, 24 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 4f759af..7afc59f 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,5 +1,31 @@ 2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + Turn process_stratum_target's supports_z_point_type op into a + method of process_target. + + * target.h (struct process_stratum_target): Remove the target op. + (class process_target): Add the target op. + * target.cc (process_target::supports_z_point_type): Define. + + Update the derived classes and callers below. + + * mem-break.cc (z_type_supported): Update. + * linux-low.cc (linux_target_ops): Update. + (linux_supports_z_point_type): Turn into ... + (linux_process_target::supports_z_point_type): ... this. + * linux-low.h (class linux_process_target): Update. + * lynx-low.cc (lynx_target_ops): Update. + * nto-low.cc (nto_target_ops): Update. + (nto_supports_z_point_type): Turn into ... + (nto_process_target::supports_z_point_type): ... this. + * nto-low.h (class nto_process_target): Update. + * win32-low.cc (win32_target_ops): Update. + (win32_supports_z_point_type): Turn into ... + (win32_process_target::supports_z_point_type): ... this. + * win32-low.h (class win32_process_target): Update. + +2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + Turn process_stratum_target's read_auxv op into a method of process_target. diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 47ac768..37e46a8 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -5957,8 +5957,8 @@ linux_process_target::read_auxv (CORE_ADDR offset, unsigned char *myaddr, pass on the function call if the target has registered a corresponding function. */ -static int -linux_supports_z_point_type (char z_type) +bool +linux_process_target::supports_z_point_type (char z_type) { return (the_low_target.supports_z_point_type != NULL && the_low_target.supports_z_point_type (z_type)); @@ -7376,7 +7376,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_supports_z_point_type, linux_insert_point, linux_remove_point, linux_stopped_by_sw_breakpoint, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 0130c22..052beb6 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -314,6 +314,8 @@ public: int read_auxv (CORE_ADDR offset, unsigned char *myaddr, unsigned int len) override; + + bool supports_z_point_type (char z_type) 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 bf73e81..dd45847 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -729,7 +729,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* supports_z_point_type */ NULL, /* insert_point */ NULL, /* remove_point */ NULL, /* stopped_by_sw_breakpoint */ diff --git a/gdbserver/mem-break.cc b/gdbserver/mem-break.cc index 43a07c39..b00e9fc 100644 --- a/gdbserver/mem-break.cc +++ b/gdbserver/mem-break.cc @@ -1005,8 +1005,7 @@ static int z_type_supported (char z_type) { return (z_type >= '0' && z_type <= '4' - && the_target->supports_z_point_type != NULL - && the_target->supports_z_point_type (z_type)); + && the_target->pt->supports_z_point_type (z_type)); } /* Create a new GDB breakpoint of type Z_TYPE at ADDR with kind KIND. diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index d828fa7..204d806 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -789,8 +789,8 @@ nto_process_target::read_auxv (CORE_ADDR offset, unsigned char *myaddr, return nto_read_auxv_from_initial_stack (initial_stack, myaddr, len); } -static int -nto_supports_z_point_type (char z_type) +bool +nto_process_target::supports_z_point_type (char z_type) { switch (z_type) { @@ -799,9 +799,9 @@ nto_supports_z_point_type (char z_type) case Z_PACKET_WRITE_WP: case Z_PACKET_READ_WP: case Z_PACKET_ACCESS_WP: - return 1; + return true; default: - return 0; + return false; } } @@ -950,7 +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_supports_z_point_type, nto_insert_point, nto_remove_point, NULL, /* stopped_by_sw_breakpoint */ diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h index e135dd3..65bbf7e 100644 --- a/gdbserver/nto-low.h +++ b/gdbserver/nto-low.h @@ -84,6 +84,8 @@ public: int read_auxv (CORE_ADDR offset, unsigned char *myaddr, unsigned int len) override; + + bool supports_z_point_type (char z_type) override; }; /* The inferior's target description. This is a global because the diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 97e9d4a..2233962 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -427,3 +427,9 @@ process_target::read_auxv (CORE_ADDR offset, unsigned char *myaddr, { gdb_assert_not_reached ("target op read_auxv not supported"); } + +bool +process_target::supports_z_point_type (char z_type) +{ + return false; +} diff --git a/gdbserver/target.h b/gdbserver/target.h index cd11da6..3262371 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,16 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Returns true if GDB Z breakpoint type TYPE is supported, false - otherwise. The type is coded as follows: - '0' - software-breakpoint - '1' - hardware-breakpoint - '2' - write watchpoint - '3' - read watchpoint - '4' - access watchpoint - */ - int (*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. */ @@ -476,6 +466,16 @@ public: Read LEN bytes at OFFSET into a buffer at MYADDR. */ virtual int read_auxv (CORE_ADDR offset, unsigned char *myaddr, unsigned int len); + + /* Returns true if GDB Z breakpoint type TYPE is supported, false + otherwise. The type is coded as follows: + '0' - software-breakpoint + '1' - hardware-breakpoint + '2' - write watchpoint + '3' - read watchpoint + '4' - access watchpoint + */ + virtual bool supports_z_point_type (char z_type); }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 2d617d8..024748e 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -254,8 +254,8 @@ child_delete_thread (DWORD pid, DWORD tid) /* These watchpoint related wrapper functions simply pass on the function call if the low target has registered a corresponding function. */ -static int -win32_supports_z_point_type (char z_type) +bool +win32_process_target::supports_z_point_type (char z_type) { return (the_low_target.supports_z_point_type != NULL && the_low_target.supports_z_point_type (z_type)); @@ -1838,7 +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_supports_z_point_type, win32_insert_point, win32_remove_point, NULL, /* stopped_by_sw_breakpoint */ diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index 2cb38a1..a095ed8 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -138,6 +138,8 @@ public: int len) override; void request_interrupt () override; + + bool supports_z_point_type (char z_type) override; }; /* Retrieve the context for this thread, if not already retrieved. */ |