mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-03-01 13:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Share target_wait prototype between GDB and gdbserver

Browse Source 
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.
This commit is contained in:
Sergio Durigan Junior 2016-08-28 23:39:45 -04:00
parent 049a857091
commit f2b9e3dfd4
6 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
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.
2016-09-01 Sergio Durigan Junior <sergiodj@redhat.com>
* fork-child.c (startup_inferior): Replace calls to target_resume

6
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,9 @@
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

10
gdb/gdbserver/target.c
View File

@ -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)
{

2
gdb/target.c
View File

@ -2283,6 +2283,8 @@ target_disconnect (const char *args, int from_tty)
current_target.to_disconnect (&current_target, args, from_tty);
}
/* See target/target.h. */
ptid_t
target_wait (ptid_t ptid, struct target_waitstatus *status, int options)
{

12
gdb/target.h
View File

@ -1341,17 +1341,7 @@ extern void target_disconnect (const char *, int);
extern void target_resume (ptid_t ptid, int step, enum gdb_signal signal);
/* Wait for process pid to do something. PTID = -1 to wait for any
pid to do something. Return pid of child, or -1 in case of error;
store status through argument pointer STATUS. Note that it is
_NOT_ OK to throw_exception() out of target_wait() without popping
the debugging target from the stack; GDB isn't prepared to get back
to the prompt with a debugging target but without the frame cache,
stop_pc, etc., set up. OPTIONS is a bitwise OR of TARGET_W*
options. */
extern ptid_t target_wait (ptid_t ptid, struct target_waitstatus *status,
int options);
/* For target_read_memory see target/target.h. */
/* The default target_ops::to_wait implementation. */

12
gdb/target/target.h
View File

@ -74,4 +74,16 @@ extern void target_continue_no_signal (ptid_t ptid);
extern void target_continue (ptid_t ptid, enum gdb_signal signal);
/* Wait for process pid to do something. PTID = -1 to wait for any
pid to do something. Return pid of child, or -1 in case of error;
store status through argument pointer STATUS. Note that it is
_NOT_ OK to throw_exception() out of target_wait() without popping
the debugging target from the stack; GDB isn't prepared to get back
to the prompt with a debugging target but without the frame cache,
stop_pc, etc., set up. OPTIONS is a bitwise OR of TARGET_W*
options. */
extern ptid_t target_wait (ptid_t ptid, struct target_waitstatus *status,
int options);
#endif /* TARGET_COMMON_H */