From f9c72d524f7c66a7ae979f3aa4f7523e16fca2f6 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 9 Jul 2008 22:49:56 +0000 Subject: [PATCH] Adjust all targets to new target_stop interface. * gnu-nat.c (gnu_stop): Add ptid argument. * go32-nat.c (go32_stop): Add ptid argument. (go32_create_inferior): Pass inferior_ptid to go32_stop. * hpux-thread.c (hpux_thread_stop): Add ptid argument. * monitor.c (monitor_stop): Add ptid argument. (monitor_open): Pass inferior_ptid to monitor_stop. (monitor_interrupt): Pass inferior_ptid to target_stop. (monitor_stop): Add ptid argument. * nto-procfs.c (nto_interrupt): Pass inferior_ptid to target_stop. (procfs_create_inferior): Add ptid argument. * procfs.c (procfs_stop): Add ptid argument. * remote-m32r-sdi.c (m32r_stop): Add ptid argument. * remote-sim.c (gdbsim_stop): Add ptid argument. * sol-thread.c (sol_thread_stop): Add ptid argument. * win32-nat.c (win32_stop): Add ptid argument. --- gdb/ChangeLog | 20 ++++++++++++++++++++ gdb/gnu-nat.c | 2 +- gdb/go32-nat.c | 6 +++--- gdb/hpux-thread.c | 4 ++-- gdb/monitor.c | 8 ++++---- gdb/nto-procfs.c | 4 ++-- gdb/procfs.c | 4 ++-- gdb/remote-m32r-sdi.c | 2 +- gdb/remote-sim.c | 4 ++-- gdb/sol-thread.c | 4 ++-- gdb/win32-nat.c | 4 ++-- gdb/windows-nat.c | 4 ++-- 12 files changed, 43 insertions(+), 23 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6231f89aa7d..f1b1558b41f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,23 @@ +2008-07-09 Pedro Alves + + Adjust all targets to new target_stop interface. + + * gnu-nat.c (gnu_stop): Add ptid argument. + * go32-nat.c (go32_stop): Add ptid argument. + (go32_create_inferior): Pass inferior_ptid to go32_stop. + * hpux-thread.c (hpux_thread_stop): Add ptid argument. + * monitor.c (monitor_stop): Add ptid argument. + (monitor_open): Pass inferior_ptid to monitor_stop. + (monitor_interrupt): Pass inferior_ptid to target_stop. + (monitor_stop): Add ptid argument. + * nto-procfs.c (nto_interrupt): Pass inferior_ptid to target_stop. + (procfs_create_inferior): Add ptid argument. + * procfs.c (procfs_stop): Add ptid argument. + * remote-m32r-sdi.c (m32r_stop): Add ptid argument. + * remote-sim.c (gdbsim_stop): Add ptid argument. + * sol-thread.c (sol_thread_stop): Add ptid argument. + * win32-nat.c (win32_stop): Add ptid argument. + 2008-07-09 Pedro Alves Non-stop inferior control. diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c index 558e3578c05..96531a88e0b 100644 --- a/gdb/gnu-nat.c +++ b/gdb/gnu-nat.c @@ -2216,7 +2216,7 @@ gnu_open (char *arg, int from_tty) } static void -gnu_stop (void) +gnu_stop (ptid_t ptid) { error (_("to_stop target function not implemented")); } diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c index 5173251b321..d4744a8b5c4 100644 --- a/gdb/go32-nat.c +++ b/gdb/go32-nat.c @@ -181,7 +181,7 @@ static int go32_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, struct mem_attrib *attrib, struct target_ops *target); static void go32_files_info (struct target_ops *target); -static void go32_stop (void); +static void go32_stop (ptid_t); static void go32_kill_inferior (void); static void go32_create_inferior (char *exec_file, char *args, char **env, int from_tty); static void go32_mourn_inferior (void); @@ -560,7 +560,7 @@ go32_files_info (struct target_ops *target) } static void -go32_stop (void) +go32_stop (ptid_t ptid) { normal_stop (); cleanup_client (); @@ -593,7 +593,7 @@ go32_create_inferior (char *exec_file, char *args, char **env, int from_tty) if (prog_has_started) { - go32_stop (); + go32_stop (inferior_ptid); go32_kill_inferior (); } resume_signal = -1; diff --git a/gdb/hpux-thread.c b/gdb/hpux-thread.c index 4264eed31b9..cd69e19dc3e 100644 --- a/gdb/hpux-thread.c +++ b/gdb/hpux-thread.c @@ -505,9 +505,9 @@ hpux_thread_alive (ptid_t ptid) } static void -hpux_thread_stop (void) +hpux_thread_stop (ptid_t ptid) { - deprecated_child_ops.to_stop (); + deprecated_child_ops.to_stop (ptid); } /* Convert a pid to printable form. */ diff --git a/gdb/monitor.c b/gdb/monitor.c index 5dd597ab5b0..69632f6778d 100644 --- a/gdb/monitor.c +++ b/gdb/monitor.c @@ -61,7 +61,7 @@ static struct target_ops *targ_ops; static void monitor_interrupt_query (void); static void monitor_interrupt_twice (int); -static void monitor_stop (void); +static void monitor_stop (ptid_t); static void monitor_dump_regs (struct regcache *regcache); #if 0 @@ -766,7 +766,7 @@ monitor_open (char *args, struct monitor_ops *mon_ops, int from_tty) if (current_monitor->stop) { - monitor_stop (); + monitor_stop (inferior_ptid); if ((current_monitor->flags & MO_NO_ECHO_ON_OPEN) == 0) { monitor_debug ("EXP Open echo\n"); @@ -983,7 +983,7 @@ monitor_interrupt (int signo) if (monitor_debug_p || remote_debug) fprintf_unfiltered (gdb_stdlog, "monitor_interrupt called\n"); - target_stop (); + target_stop (inferior_ptid); } /* The user typed ^C twice. */ @@ -2168,7 +2168,7 @@ monitor_load (char *file, int from_tty) } static void -monitor_stop (void) +monitor_stop (ptid_t ptid) { monitor_debug ("MON stop\n"); if ((current_monitor->flags & MO_SEND_BREAK_ON_STOP) != 0) diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c index 0cbff727cc6..e37e1581330 100644 --- a/gdb/nto-procfs.c +++ b/gdb/nto-procfs.c @@ -607,7 +607,7 @@ nto_interrupt (int signo) /* If this doesn't work, try more severe steps. */ signal (signo, nto_interrupt_twice); - target_stop (); + target_stop (inferior_ptid); } static ptid_t @@ -1094,7 +1094,7 @@ procfs_create_inferior (char *exec_file, char *allargs, char **env, } static void -procfs_stop (void) +procfs_stop (ptid_t ptid) { devctl (ctl_fd, DCMD_PROC_STOP, NULL, 0, 0); } diff --git a/gdb/procfs.c b/gdb/procfs.c index da9fd4cbbe4..3551dd9afee 100644 --- a/gdb/procfs.c +++ b/gdb/procfs.c @@ -116,7 +116,7 @@ static void procfs_attach (char *, int); static void procfs_detach (char *, int); static void procfs_resume (ptid_t, int, enum target_signal); static int procfs_can_run (void); -static void procfs_stop (void); +static void procfs_stop (ptid_t); static void procfs_files_info (struct target_ops *); static void procfs_fetch_registers (struct regcache *, int); static void procfs_store_registers (struct regcache *, int); @@ -4756,7 +4756,7 @@ procfs_can_run (void) */ static void -procfs_stop (void) +procfs_stop (ptid_t ptid) { kill (-inferior_process_group, SIGINT); } diff --git a/gdb/remote-m32r-sdi.c b/gdb/remote-m32r-sdi.c index 5a8e0c752ae..c048c5bc8f5 100644 --- a/gdb/remote-m32r-sdi.c +++ b/gdb/remote-m32r-sdi.c @@ -1391,7 +1391,7 @@ m32r_load (char *args, int from_tty) } static void -m32r_stop (void) +m32r_stop (ptid_t ptid) { if (remote_debug) fprintf_unfiltered (gdb_stdlog, "m32r_stop()\n"); diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index de5e7de928f..df1cf9b191b 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -96,7 +96,7 @@ static void gdbsim_files_info (struct target_ops *target); static void gdbsim_mourn_inferior (void); -static void gdbsim_stop (void); +static void gdbsim_stop (ptid_t ptid); void simulator_command (char *args, int from_tty); @@ -643,7 +643,7 @@ gdbsim_resume (ptid_t ptid, int step, enum target_signal siggnal) For simulators that do not support this operation, just abort */ static void -gdbsim_stop (void) +gdbsim_stop (ptid_t ptid) { if (!sim_stop (gdbsim_desc)) { diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c index bf31fa0194c..ab7ec5d2244 100644 --- a/gdb/sol-thread.c +++ b/gdb/sol-thread.c @@ -881,9 +881,9 @@ sol_thread_alive (ptid_t ptid) } static void -sol_thread_stop (void) +sol_thread_stop (ptid_t ptid) { - procfs_ops.to_stop (); + procfs_ops.to_stop (ptid); } /* These routines implement the lower half of the thread_db interface, diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c index 74df866c24e..8fedf9e60a3 100644 --- a/gdb/win32-nat.c +++ b/gdb/win32-nat.c @@ -105,7 +105,7 @@ static int debug_registers_used; #define DEBUG_MEM(x) if (debug_memory) printf_unfiltered x #define DEBUG_EXCEPT(x) if (debug_exceptions) printf_unfiltered x -static void win32_stop (void); +static void win32_stop (ptid_t); static int win32_win32_thread_alive (ptid_t); static void win32_kill_inferior (void); @@ -1928,7 +1928,7 @@ win32_mourn_inferior (void) ^C on the controlling terminal. */ static void -win32_stop (void) +win32_stop (ptid_t ptid) { DEBUG_EVENTS (("gdb: GenerateConsoleCtrlEvent (CTRLC_EVENT, 0)\n")); CHECK (GenerateConsoleCtrlEvent (CTRL_C_EVENT, current_event.dwProcessId)); diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index 74df866c24e..8fedf9e60a3 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -105,7 +105,7 @@ static int debug_registers_used; #define DEBUG_MEM(x) if (debug_memory) printf_unfiltered x #define DEBUG_EXCEPT(x) if (debug_exceptions) printf_unfiltered x -static void win32_stop (void); +static void win32_stop (ptid_t); static int win32_win32_thread_alive (ptid_t); static void win32_kill_inferior (void); @@ -1928,7 +1928,7 @@ win32_mourn_inferior (void) ^C on the controlling terminal. */ static void -win32_stop (void) +win32_stop (ptid_t ptid) { DEBUG_EVENTS (("gdb: GenerateConsoleCtrlEvent (CTRLC_EVENT, 0)\n")); CHECK (GenerateConsoleCtrlEvent (CTRL_C_EVENT, current_event.dwProcessId)); -- 2.30.2