/* Target operations for the remote server for GDB.
- Copyright (C) 2002-2017 Free Software Foundation, Inc.
+ Copyright (C) 2002-2020 Free Software Foundation, Inc.
Contributed by MontaVista Software.
#include "server.h"
#include "tracepoint.h"
+#include "gdbsupport/byte-vector.h"
-struct target_ops *the_target;
+process_stratum_target *the_target;
int
-set_desired_thread (int use_general)
+set_desired_thread ()
{
- struct thread_info *found;
-
- if (use_general == 1)
- found = find_thread_ptid (general_thread);
- else
- found = find_thread_ptid (cont_thread);
+ client_state &cs = get_client_state ();
+ thread_info *found = find_thread_ptid (cs.general_thread);
current_thread = found;
return (current_thread != NULL);
}
-/* Structure used to look up a thread to use as current when accessing
- memory. */
-
-struct thread_search
-{
- /* The PTID of the current general thread. This is an input
- parameter. */
- ptid_t current_gen_ptid;
-
- /* The first thread found. */
- struct thread_info *first;
-
- /* The first stopped thread found. */
- struct thread_info *stopped;
-
- /* The current general thread, if found. */
- struct thread_info *current;
-};
-
-/* Callback for find_inferior. Search for a thread to use as current
- when accessing memory. */
-
-static int
-thread_search_callback (struct inferior_list_entry *entry, void *args)
-{
- struct thread_info *thread = (struct thread_info *) entry;
- struct thread_search *s = (struct thread_search *) args;
-
- if (ptid_get_pid (entry->id) == ptid_get_pid (s->current_gen_ptid)
- && mythread_alive (ptid_of (thread)))
- {
- if (s->stopped == NULL
- && the_target->thread_stopped != NULL
- && thread_stopped (thread))
- s->stopped = thread;
-
- if (s->first == NULL)
- s->first = thread;
-
- if (s->current == NULL && ptid_equal (s->current_gen_ptid, entry->id))
- s->current = thread;
- }
-
- return 0;
-}
-
/* The thread that was current before prepare_to_access_memory was
called. done_accessing_memory uses this to restore the previous
selected thread. */
int
prepare_to_access_memory (void)
{
- struct thread_search search;
- struct thread_info *thread;
+ client_state &cs = get_client_state ();
+
+ /* The first thread found. */
+ struct thread_info *first = NULL;
+ /* The first stopped thread found. */
+ struct thread_info *stopped = NULL;
+ /* The current general thread, if found. */
+ struct thread_info *current = NULL;
- memset (&search, 0, sizeof (search));
- search.current_gen_ptid = general_thread;
- prev_general_thread = general_thread;
+ /* Save the general thread value, since prepare_to_access_memory could change
+ it. */
+ prev_general_thread = cs.general_thread;
if (the_target->prepare_to_access_memory != NULL)
{
return res;
}
- find_inferior (&all_threads, thread_search_callback, &search);
+ for_each_thread (prev_general_thread.pid (), [&] (thread_info *thread)
+ {
+ if (mythread_alive (thread->id))
+ {
+ if (stopped == NULL && the_target->thread_stopped != NULL
+ && thread_stopped (thread))
+ stopped = thread;
+
+ if (first == NULL)
+ first = thread;
+
+ if (current == NULL && prev_general_thread == thread->id)
+ current = thread;
+ }
+ });
+
+ /* The thread we end up choosing. */
+ struct thread_info *thread;
/* Prefer a stopped thread. If none is found, try the current
thread. Otherwise, take the first thread in the process. If
none is found, undo the effects of
target->prepare_to_access_memory() and return error. */
- if (search.stopped != NULL)
- thread = search.stopped;
- else if (search.current != NULL)
- thread = search.current;
- else if (search.first != NULL)
- thread = search.first;
+ if (stopped != NULL)
+ thread = stopped;
+ else if (current != NULL)
+ thread = current;
+ else if (first != NULL)
+ thread = first;
else
{
done_accessing_memory ();
}
current_thread = thread;
- general_thread = ptid_of (thread);
+ cs.general_thread = ptid_of (thread);
return 0;
}
void
done_accessing_memory (void)
{
+ client_state &cs = get_client_state ();
+
if (the_target->done_accessing_memory != NULL)
the_target->done_accessing_memory ();
/* Restore the previous selected thread. */
- general_thread = prev_general_thread;
- current_thread = find_thread_ptid (general_thread);
+ cs.general_thread = prev_general_thread;
+ switch_to_thread (the_target, cs.general_thread);
}
int
return read_inferior_memory (memaddr, (gdb_byte *) result, sizeof (*result));
}
-int
-write_inferior_memory (CORE_ADDR memaddr, const unsigned char *myaddr,
- int len)
-{
- /* Lacking cleanups, there is some potential for a memory leak if the
- write fails and we go through error(). Make sure that no more than
- one buffer is ever pending by making BUFFER static. */
- static unsigned char *buffer = 0;
- int res;
-
- if (buffer != NULL)
- free (buffer);
-
- buffer = (unsigned char *) xmalloc (len);
- memcpy (buffer, myaddr, len);
- check_mem_write (memaddr, buffer, myaddr, len);
- res = (*the_target->write_memory) (memaddr, buffer, len);
- free (buffer);
- buffer = NULL;
-
- return res;
-}
-
/* See target/target.h. */
int
-target_write_memory (CORE_ADDR memaddr, const gdb_byte *myaddr, ssize_t len)
+target_write_memory (CORE_ADDR memaddr, const unsigned char *myaddr,
+ ssize_t len)
{
- return write_inferior_memory (memaddr, myaddr, len);
+ /* Make a copy of the data because check_mem_write may need to
+ update it. */
+ gdb::byte_vector buffer (myaddr, myaddr + len);
+ check_mem_write (memaddr, buffer.data (), myaddr, len);
+ return (*the_target->write_memory) (memaddr, buffer.data (), len);
}
ptid_t
target_stop_and_wait (ptid_t ptid)
{
struct target_waitstatus status;
- int was_non_stop = non_stop;
+ bool was_non_stop = non_stop;
struct thread_resume resume_info;
resume_info.thread = ptid;
resume_info.sig = GDB_SIGNAL_0;
(*the_target->resume) (&resume_info, 1);
- non_stop = 1;
+ non_stop = true;
mywait (ptid, &status, 0, 0);
non_stop = was_non_stop;
}
void
target_mourn_inferior (ptid_t ptid)
{
- (*the_target->mourn) (find_process_pid (ptid_get_pid (ptid)));
+ (*the_target->mourn) (find_process_pid (ptid.pid ()));
}
/* See target/target.h. */
}
void
-set_target_ops (struct target_ops *target)
+set_target_ops (process_stratum_target *target)
{
- the_target = XNEW (struct target_ops);
+ the_target = XNEW (process_stratum_target);
memcpy (the_target, target, sizeof (*the_target));
}
{
static char buf[80];
- if (ptid_equal (ptid, minus_one_ptid))
+ if (ptid == minus_one_ptid)
xsnprintf (buf, sizeof (buf), "<all threads>");
- else if (ptid_equal (ptid, null_ptid))
+ else if (ptid == null_ptid)
xsnprintf (buf, sizeof (buf), "<null thread>");
- else if (ptid_get_tid (ptid) != 0)
+ else if (ptid.tid () != 0)
xsnprintf (buf, sizeof (buf), "Thread %d.0x%lx",
- ptid_get_pid (ptid), ptid_get_tid (ptid));
- else if (ptid_get_lwp (ptid) != 0)
+ ptid.pid (), ptid.tid ());
+ else if (ptid.lwp () != 0)
xsnprintf (buf, sizeof (buf), "LWP %d.%ld",
- ptid_get_pid (ptid), ptid_get_lwp (ptid));
+ ptid.pid (), ptid.lwp ());
else
xsnprintf (buf, sizeof (buf), "Process %d",
- ptid_get_pid (ptid));
+ ptid.pid ());
return buf;
}
int
-kill_inferior (int pid)
+kill_inferior (process_info *proc)
{
- gdb_agent_about_to_close (pid);
+ gdb_agent_about_to_close (proc->pid);
- return (*the_target->kill) (pid);
+ return (*the_target->kill) (proc);
}
/* Target can do hardware single step. */
/* Define it. */
-enum target_terminal::terminal_state target_terminal::terminal_state
- = target_terminal::terminal_is_ours;
+target_terminal_state target_terminal::m_terminal_state
+ = target_terminal_state::is_ours;
/* See target/target.h. */
projects / deliverable / binutils-gdb.git / blobdiff