[non-stop v2] 07.2/10 update all targets to target_stop change

Pedro Alves
2008-07-02T03:34:40Z

[-- Attachment #1: Type: text/plain, Size: 513 bytes --]

I wrote:
> Wednesday 25 June 2008 20:44:09, Daniel Jacobowitz wrote:
>> How about adding a ptid argument to to_stop instead? I think the code
>> will be shared in most cases.
>Updated patch adds a ptid_t argument to target_stop, and
>fixes enough targets to build on linux. Patch to update all other
>targets to the new target_stop interface comming up. Nothing else
>changed.
>

Here it is. grepping for "to_stop = " and target_stop didn't find
any other cases. OK with the previous patch?

--
Pedro Alves

[-- Attachment #2: 007_2-to_stop_change_arg.diff --]
[-- Type: text/x-diff, Size: 8319 bytes --]

2008-07-02 Pedro Alves <pedro@codesourcery.com>

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/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 ++--
10 files changed, 21 insertions(+), 21 deletions(-)

Index: src/gdb/gnu-nat.c
===================================================================
--- src.orig/gdb/gnu-nat.c 2008-07-01 22:42:50.000000000 +0100
+++ src/gdb/gnu-nat.c 2008-07-01 22:43:05.000000000 +0100
@@ -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"));
}
Index: src/gdb/go32-nat.c
===================================================================
--- src.orig/gdb/go32-nat.c 2008-07-01 22:42:50.000000000 +0100
+++ src/gdb/go32-nat.c 2008-07-01 22:43:05.000000000 +0100
@@ -181,7 +181,7 @@ static int go32_xfer_memory (CORE_ADDR m
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 *targ
}

static void
-go32_stop (void)
+go32_stop (ptid_t ptid)
{
normal_stop ();
cleanup_client ();
@@ -593,7 +593,7 @@ go32_create_inferior (char *exec_file, c

if (prog_has_started)
{
- go32_stop ();
+ go32_stop (inferior_ptid);
go32_kill_inferior ();
}
resume_signal = -1;
Index: src/gdb/hpux-thread.c
===================================================================
--- src.orig/gdb/hpux-thread.c 2008-07-01 22:42:50.000000000 +0100
+++ src/gdb/hpux-thread.c 2008-07-01 22:43:05.000000000 +0100
@@ -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);
}
\f
/* Convert a pid to printable form. */
Index: src/gdb/monitor.c
===================================================================
--- src.orig/gdb/monitor.c 2008-07-01 22:42:50.000000000 +0100
+++ src/gdb/monitor.c 2008-07-01 22:43:05.000000000 +0100
@@ -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
@@ -759,7 +759,7 @@ monitor_open (char *args, struct monitor

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");
@@ -972,7 +972,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. */
@@ -2156,7 +2156,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)
Index: src/gdb/nto-procfs.c
===================================================================
--- src.orig/gdb/nto-procfs.c 2008-07-01 22:42:50.000000000 +0100
+++ src/gdb/nto-procfs.c 2008-07-01 22:43:05.000000000 +0100
@@ -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,
}

static void
-procfs_stop (void)
+procfs_stop (ptid_t ptid)
{
devctl (ctl_fd, DCMD_PROC_STOP, NULL, 0, 0);
}
Index: src/gdb/procfs.c
===================================================================
--- src.orig/gdb/procfs.c 2008-07-01 22:42:50.000000000 +0100
+++ src/gdb/procfs.c 2008-07-01 22:43:05.000000000 +0100
@@ -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);
}
Index: src/gdb/remote-m32r-sdi.c
===================================================================
--- src.orig/gdb/remote-m32r-sdi.c 2008-07-01 22:42:50.000000000 +0100
+++ src/gdb/remote-m32r-sdi.c 2008-07-01 22:43:05.000000000 +0100
@@ -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");
Index: src/gdb/remote-sim.c
===================================================================
--- src.orig/gdb/remote-sim.c 2008-07-01 22:42:50.000000000 +0100
+++ src/gdb/remote-sim.c 2008-07-01 22:43:05.000000000 +0100
@@ -95,7 +95,7 @@ static void gdbsim_files_info (struct ta

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);

@@ -632,7 +632,7 @@ gdbsim_resume (ptid_t ptid, int step, en
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))
{
Index: src/gdb/sol-thread.c
===================================================================
--- src.orig/gdb/sol-thread.c 2008-07-01 22:42:50.000000000 +0100
+++ src/gdb/sol-thread.c 2008-07-01 22:43:05.000000000 +0100
@@ -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);
}
\f
/* These routines implement the lower half of the thread_db interface,
Index: src/gdb/win32-nat.c
===================================================================
--- src.orig/gdb/win32-nat.c 2008-07-01 22:42:50.000000000 +0100
+++ src/gdb/win32-nat.c 2008-07-01 22:43:05.000000000 +0100
@@ -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));