diff options
| -rw-r--r-- | gdbserver/ChangeLog | 31 | ||||
| -rw-r--r-- | gdbserver/linux-low.cc | 7 | ||||
| -rw-r--r-- | gdbserver/linux-low.h | 2 | ||||
| -rw-r--r-- | gdbserver/lynx-low.cc | 5 | ||||
| -rw-r--r-- | gdbserver/lynx-low.h | 2 | ||||
| -rw-r--r-- | gdbserver/nto-low.cc | 5 | ||||
| -rw-r--r-- | gdbserver/nto-low.h | 2 | ||||
| -rw-r--r-- | gdbserver/remote-utils.cc | 8 | ||||
| -rw-r--r-- | gdbserver/server.cc | 2 | ||||
| -rw-r--r-- | gdbserver/target.h | 9 | ||||
| -rw-r--r-- | gdbserver/win32-low.cc | 5 | ||||
| -rw-r--r-- | gdbserver/win32-low.h | 2 |
12 files changed, 57 insertions, 23 deletions
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 0839105..75fb348 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,5 +1,36 @@ 2020-02-20 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> + Turn process_stratum_target's request_interrupt op into a method of + process_target. + + * target.h (struct process_stratum_target): Remove the target op. + (class process_target): Add the target op. + + Update the derived classes and callers below. + + * remote-utils.cc (putpkt_binary_1): Update. + (input_interrupt): Update. + (getpkt): Update. + * server.cc (handle_v_requests): Update. + * linux-low.cc (linux_target_ops): Update. + (linux_request_interrupt): Turn into ... + (linux_process_target::request_interrupt): ... this. + * linux-low.h (class linux_process_target): Update. + * lynx-low.cc (lynx_target_ops): Update. + (lynx_request_interrupt): Turn into ... + (lynx_process_target::request_interrupt): ... this. + * lynx-low.h (class lynx_process_target): Update. + * nto-low.cc (nto_target_ops): Update. + (nto_request_interrupt): Turn into ... + (nto_process_target::request_interrupt): ... this. + * nto-low.h (class nto_process_target): Update. + * win32-low.cc (win32_target_ops): Update. + (win32_request_interrupt): Turn into ... + (win32_process_target::request_interrupt): ... 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 look_up_symbols op into a method of process_target. diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index f073a38..3d02cb5 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -5911,12 +5911,12 @@ linux_process_target::look_up_symbols () #endif } -static void -linux_request_interrupt (void) +void +linux_process_target::request_interrupt () { /* Send a SIGINT to the process group. This acts just like the user typed a ^C on the controlling terminal. */ - kill (-signal_pid, SIGINT); + ::kill (-signal_pid, SIGINT); } /* Copy LEN bytes from inferior's auxiliary vector starting at OFFSET @@ -7369,7 +7369,6 @@ linux_get_hwcap2 (int wordsize) static linux_process_target the_linux_target; static process_stratum_target linux_target_ops = { - linux_request_interrupt, linux_read_auxv, linux_supports_z_point_type, linux_insert_point, diff --git a/gdbserver/linux-low.h b/gdbserver/linux-low.h index 05269dc..197a0bb 100644 --- a/gdbserver/linux-low.h +++ b/gdbserver/linux-low.h @@ -307,6 +307,8 @@ public: int len) override; void look_up_symbols () override; + + void request_interrupt () 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 bedf918..8b5300f 100644 --- a/gdbserver/lynx-low.cc +++ b/gdbserver/lynx-low.cc @@ -714,8 +714,8 @@ lynx_process_target::write_memory (CORE_ADDR memaddr, /* Implement the kill_request target_ops method. */ -static void -lynx_request_interrupt (void) +void +lynx_process_target::request_interrupt () { ptid_t inferior_ptid = ptid_of (get_first_thread ()); @@ -729,7 +729,6 @@ static lynx_process_target the_lynx_target; /* The LynxOS target_ops vector. */ static process_stratum_target lynx_target_ops = { - lynx_request_interrupt, NULL, /* read_auxv */ NULL, /* supports_z_point_type */ NULL, /* insert_point */ diff --git a/gdbserver/lynx-low.h b/gdbserver/lynx-low.h index 9036eb3..795603a 100644 --- a/gdbserver/lynx-low.h +++ b/gdbserver/lynx-low.h @@ -87,6 +87,8 @@ public: int write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len) override; + + void request_interrupt () override; }; /* The inferior's target description. This is a global because the diff --git a/gdbserver/nto-low.cc b/gdbserver/nto-low.cc index c229e41..d60f72a 100644 --- a/gdbserver/nto-low.cc +++ b/gdbserver/nto-low.cc @@ -746,8 +746,8 @@ nto_process_target::write_memory (CORE_ADDR memaddr, /* Stop inferior. We always stop all threads. */ -static void -nto_request_interrupt (void) +void +nto_process_target::request_interrupt () { TRACE ("%s\n", __func__); nto_set_thread (ptid_t (nto_inferior.pid, 1, 0)); @@ -943,7 +943,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_request_interrupt, nto_read_auxv, nto_supports_z_point_type, nto_insert_point, diff --git a/gdbserver/nto-low.h b/gdbserver/nto-low.h index 0f4bb43..c6e0c29 100644 --- a/gdbserver/nto-low.h +++ b/gdbserver/nto-low.h @@ -77,6 +77,8 @@ public: int write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len) override; + + void request_interrupt () override; }; /* The inferior's target description. This is a global because the diff --git a/gdbserver/remote-utils.cc b/gdbserver/remote-utils.cc index b8a8c65..b5248ab 100644 --- a/gdbserver/remote-utils.cc +++ b/gdbserver/remote-utils.cc @@ -710,7 +710,7 @@ putpkt_binary_1 (char *buf, int cnt, int is_notif) /* Check for an input interrupt while we're here. */ if (cc == '\003' && current_thread != NULL) - (*the_target->request_interrupt) (); + the_target->pt->request_interrupt (); } while (cc != '+'); @@ -779,7 +779,7 @@ input_interrupt (int unused) return; } - (*the_target->request_interrupt) (); + the_target->pt->request_interrupt (); } } @@ -986,7 +986,7 @@ getpkt (char *buf) check for an input interrupt. */ if (c == '\003') { - (*the_target->request_interrupt) (); + the_target->pt->request_interrupt (); continue; } @@ -1076,7 +1076,7 @@ getpkt (char *buf) { /* Consume the interrupt character in the buffer. */ readchar (); - (*the_target->request_interrupt) (); + the_target->pt->request_interrupt (); } return bp - buf; diff --git a/gdbserver/server.cc b/gdbserver/server.cc index 4785eab..bc497f8 100644 --- a/gdbserver/server.cc +++ b/gdbserver/server.cc @@ -3088,7 +3088,7 @@ handle_v_requests (char *own_buf, int packet_len, int *new_packet_len) { if (strcmp (own_buf, "vCtrlC") == 0) { - (*the_target->request_interrupt) (); + the_target->pt->request_interrupt (); write_ok (own_buf); return; } diff --git a/gdbserver/target.h b/gdbserver/target.h index 7f37a90..234a183 100644 --- a/gdbserver/target.h +++ b/gdbserver/target.h @@ -70,11 +70,6 @@ class process_target; shared code. */ struct process_stratum_target { - /* Send an interrupt request to the inferior process, - however is appropriate. */ - - void (*request_interrupt) (void); - /* Read auxiliary vector data from the inferior process. Read LEN bytes at OFFSET into a buffer at MYADDR. */ @@ -475,6 +470,10 @@ public: query, which corresponds to every time more symbols (might) become available. */ virtual void look_up_symbols (); + + /* Send an interrupt request to the inferior process, + however is appropriate. */ + virtual void request_interrupt () = 0; }; extern process_stratum_target *the_target; diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc index 4ac1b3a..098da30 100644 --- a/gdbserver/win32-low.cc +++ b/gdbserver/win32-low.cc @@ -1695,8 +1695,8 @@ win32_process_target::write_memory (CORE_ADDR memaddr, } /* Send an interrupt request to the inferior process. */ -static void -win32_request_interrupt (void) +void +win32_process_target::request_interrupt () { winapi_DebugBreakProcess DebugBreakProcess; winapi_GenerateConsoleCtrlEvent GenerateConsoleCtrlEvent; @@ -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_request_interrupt, NULL, /* read_auxv */ win32_supports_z_point_type, win32_insert_point, diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h index 0ecb2f8..2cb38a1 100644 --- a/gdbserver/win32-low.h +++ b/gdbserver/win32-low.h @@ -136,6 +136,8 @@ public: int write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len) override; + + void request_interrupt () override; }; /* Retrieve the context for this thread, if not already retrieved. */ |