diff options
| author | Sergio Durigan Junior <sergiodj@redhat.com> | 2016-08-28 23:39:45 -0400 |
|---|---|---|
| committer | Sergio Durigan Junior <sergiodj@redhat.com> | 2016-09-01 14:55:15 -0400 |
| commit | f2b9e3dfd4bc3c5149496fdbeaa5f0907220685f (patch) | |
| tree | 7478f04b0d2ec5dbbda6985fe74e8ea3d70d18ae /gdb/gdbserver | |
| parent | 049a857091cff98371b5688140832a3cf767153c (diff) | |
| download | gdb-f2b9e3dfd4bc3c5149496fdbeaa5f0907220685f.zip gdb-f2b9e3dfd4bc3c5149496fdbeaa5f0907220685f.tar.gz gdb-f2b9e3dfd4bc3c5149496fdbeaa5f0907220685f.tar.bz2 | |
Share target_wait prototype between GDB and gdbserver
This commit moves the target_wait prototype from the GDB-specific
target.h header to the common target/target.h header. Then, it
creates a compatible implementation of target_wait on gdbserver using
the_target->wait, and adjusts the (only) caller (mywait function).
Pretty straightforward, no regressions introduced.
gdb/gdbserver/ChangeLog:
2016-09-01 Sergio Durigan Junior <sergiodj@redhat.com>
* target.c (mywait): Call target_wait instead of
the_target->wait.
(target_wait): New function.
gdb/ChangeLog:
2016-09-01 Sergio Durigan Junior <sergiodj@redhat.com>
* target.c (target_wait): Mention that the function's prototype
can be found at target/target.h.
* target.h (target_wait): Move prototype from here...
* target/target.h (target_wait): ... to here.
Diffstat (limited to 'gdb/gdbserver')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/gdbserver/target.c | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 921a5d4..97d8ca5 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,11 @@ 2016-09-01 Sergio Durigan Junior <sergiodj@redhat.com> + * target.c (mywait): Call target_wait instead of + the_target->wait. + (target_wait): New function. + +2016-09-01 Sergio Durigan Junior <sergiodj@redhat.com> + * server.c (start_inferior): New variable 'ptid'. Replace calls to the_target->resume by target_continue{,_no_signal}, depending on the case. diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c index 8435dc2..053629c 100644 --- a/gdb/gdbserver/target.c +++ b/gdb/gdbserver/target.c @@ -211,7 +211,7 @@ mywait (ptid_t ptid, struct target_waitstatus *ourstatus, int options, if (connected_wait) server_waiting = 1; - ret = (*the_target->wait) (ptid, ourstatus, options); + ret = target_wait (ptid, ourstatus, options); /* We don't expose _LOADED events to gdbserver core. See the `dlls_changed' global. */ @@ -258,6 +258,14 @@ target_stop_and_wait (ptid_t ptid) /* See target/target.h. */ +ptid_t +target_wait (ptid_t ptid, struct target_waitstatus *status, int options) +{ + return (*the_target->wait) (ptid, status, options); +} + +/* See target/target.h. */ + void target_continue_no_signal (ptid_t ptid) { |