From 6e3fd7e948d158a04c0af7130e6648ad75aaba66 Mon Sep 17 00:00:00 2001 From: Tankut Baris Aktemur Date: Mon, 17 Feb 2020 16:11:56 +0100 Subject: [PATCH] gdbserver: turn target op 'get_tls_address' into a method gdbserver/ChangeLog: 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's get_tls_address op into a method of process_target. * target.h (struct process_stratum_target): Remove the target op. (class process_target): Add the target op. Also add 'supports_get_tls_address'. * target.cc (process_target::get_tls_address): Define. (process_target::supports_get_tls_address): Define. Update the derived classes and callers below. * server.cc (handle_query): Update. * linux-low.cc (linux_target_ops): Update. (linux_process_target::supports_get_tls_address): Define. (linux_process_target::get_tls_address): Define. * linux-low.h (class linux_process_target): Update. * lynx-low.cc (lynx_target_ops): Update. * nto-low.cc (nto_target_ops): Update. * win32-low.cc (win32_target_ops): Update. --- gdbserver/ChangeLog | 22 ++++++++++++++++++++++ gdbserver/linux-low.cc | 28 +++++++++++++++++++++++----- gdbserver/linux-low.h | 5 +++++ gdbserver/lynx-low.cc | 1 - gdbserver/nto-low.cc | 1 - gdbserver/server.cc | 6 +++--- gdbserver/target.cc | 13 +++++++++++++ gdbserver/target.h | 20 +++++++++++--------- gdbserver/win32-low.cc | 1 - 9 files changed, 77 insertions(+), 20 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index fd2c6271505..8b1d55cf4b1 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,25 @@ +2020-02-20 Tankut Baris Aktemur + + Turn process_stratum_target's get_tls_address op into a method of + process_target. + + * target.h (struct process_stratum_target): Remove the target op. + (class process_target): Add the target op. Also add + 'supports_get_tls_address'. + * target.cc (process_target::get_tls_address): Define. + (process_target::supports_get_tls_address): Define. + + Update the derived classes and callers below. + + * server.cc (handle_query): Update. + * linux-low.cc (linux_target_ops): Update. + (linux_process_target::supports_get_tls_address): Define. + (linux_process_target::get_tls_address): Define. + * linux-low.h (class linux_process_target): Update. + * lynx-low.cc (lynx_target_ops): Update. + * nto-low.cc (nto_target_ops): Update. + * win32-low.cc (win32_target_ops): Update. + 2020-02-20 Tankut Baris Aktemur Turn process_stratum_target's read_offsets op into a method of diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 34bbc0d3484..ee5a6c02712 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6123,6 +6123,29 @@ linux_process_target::read_offsets (CORE_ADDR *text_p, CORE_ADDR *data_p) #endif } +bool +linux_process_target::supports_get_tls_address () +{ +#ifdef USE_THREAD_DB + return true; +#else + return false; +#endif +} + +int +linux_process_target::get_tls_address (thread_info *thread, + CORE_ADDR offset, + CORE_ADDR load_module, + CORE_ADDR *address) +{ +#ifdef USE_THREAD_DB + return thread_db_get_tls_address (thread, offset, load_module, address); +#else + return -1; +#endif +} + static int linux_qxfer_osdata (const char *annex, unsigned char *readbuf, unsigned const char *writebuf, @@ -7392,11 +7415,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { -#ifdef USE_THREAD_DB - thread_db_get_tls_address, -#else - NULL, -#endif hostio_last_error_from_errno, linux_qxfer_osdata, linux_xfer_siginfo, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index f2e2dfd98e2..3c2fdaf8fc3 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -340,6 +340,11 @@ public: bool supports_read_offsets () override; int read_offsets (CORE_ADDR *text, CORE_ADDR *data) override; + + bool supports_get_tls_address () override; + + int get_tls_address (thread_info *thread, CORE_ADDR offset, + CORE_ADDR load_module, CORE_ADDR *address) 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 44c57a5ca71..f0d0d4456c4 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -735,7 +735,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - NULL, /* get_tls_address */ NULL, /* hostio_last_error */ NULL, /* qxfer_osdata */ NULL, /* qxfer_siginfo */ diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index 040fa93859f..b9e7ed06337 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -956,7 +956,6 @@ nto_sw_breakpoint_from_kind (int kind, int *size) static nto_process_target the_nto_target; static process_stratum_target nto_target_ops = { - NULL, /* thread_db_set_tls_address */ hostio_last_error_from_errno, NULL, /* nto_qxfer_osdata */ NULL, /* xfer_siginfo */ diff --git a/gdbserver/server.cc b/gdbserver/server.cc index b4fd9c6a5e5..01d41af0f89 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -2467,7 +2467,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) } /* Thread-local storage support. */ - if (the_target->get_tls_address != NULL + if (the_target->pt->supports_get_tls_address () && startswith (own_buf, "qGetTLSAddr:")) { char *p = own_buf + 12; @@ -2513,8 +2513,8 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p) if (thread == NULL) err = 2; else - err = the_target->get_tls_address (thread, parts[0], parts[1], - &address); + err = the_target->pt->get_tls_address (thread, parts[0], parts[1], + &address); } if (err == 0) diff --git a/gdbserver/target.cc b/gdbserver/target.cc index 501a8d675db..f578dbea0da 100644 --- a/gdbserver/target.cc +++ b/gdbserver/target.cc @@ -493,3 +493,16 @@ process_target::read_offsets (CORE_ADDR *text, CORE_ADDR *data) { gdb_assert_not_reached ("target op read_offsets not supported"); } + +bool +process_target::supports_get_tls_address () +{ + return false; +} + +int +process_target::get_tls_address (thread_info *thread, CORE_ADDR offset, + CORE_ADDR load_module, CORE_ADDR *address) +{ + gdb_assert_not_reached ("target op get_tls_address not supported"); +} diff --git a/gdbserver/target.h b/gdbserver/target.h index 5cf039e5f70..2c818b3fb12 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,15 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Fetch the address associated with a specific thread local storage - area, determined by the specified THREAD, OFFSET, and LOAD_MODULE. - Stores it in *ADDRESS and returns zero on success; otherwise returns - an error code. A return value of -1 means this system does not - support the operation. */ - - int (*get_tls_address) (struct thread_info *thread, CORE_ADDR offset, - CORE_ADDR load_module, CORE_ADDR *address); - /* Fill BUF with an hostio error packet representing the last hostio error. */ void (*hostio_last_error) (char *buf); @@ -477,6 +468,17 @@ public: needed for uclinux where the executable is relocated during load time. */ virtual int read_offsets (CORE_ADDR *text, CORE_ADDR *data); + + /* Return true if the get_tls_address target op is supported. */ + virtual bool supports_get_tls_address (); + + /* Fetch the address associated with a specific thread local storage + area, determined by the specified THREAD, OFFSET, and LOAD_MODULE. + Stores it in *ADDRESS and returns zero on success; otherwise returns + an error code. A return value of -1 means this system does not + support the operation. */ + virtual int get_tls_address (thread_info *thread, CORE_ADDR offset, + CORE_ADDR load_module, CORE_ADDR *address); }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 875736a5eec..84223e129bf 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1844,7 +1844,6 @@ win32_sw_breakpoint_from_kind (int kind, int *size) static win32_process_target the_win32_target; static process_stratum_target win32_target_ops = { - NULL, /* get_tls_address */ #ifdef _WIN32_WCE wince_hostio_last_error, #else -- 2.30.2