OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor default_breakpoint_kind_from_pc to be used by all targets in GDBServer. 

This patch moves default_breakpoint_kind_from_pc to target.c and creates a macro
so that all targets can easily use it.

This allows the breakpoint_kind_from_pc operation to be left unimplemented in
targets that do not need it.

This is preparation to fix the win32/nto/spu build that was broken by this
patch: https://sourceware.org/ml/gdb-patches/2015-10/msg00369.html

No regression on Ubuntu 14.04 x86-64 with gdbserver-{native-extended}

gdb/gdbserver/ChangeLog:

	* linux-low.c (default_breakpoint_kind_from_pc): Move to target.c.
	* mem-break.c (set_breakpoint_at): Use target_breakpoint_kind_from_pc.
	* target.c (default_breakpoint_kind_from_pc): Moved from linux-low.c
	* target.h (target_breakpoint_kind_from_pc): New macro.
This commit is contained in:
Antoine Tremblay 2015-10-23 13:20:39 -04:00
parent 1cce69b9dc
commit 2e6ee069ae
5 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,10 @@
2015-10-23 Antoine Tremblay <antoine.tremblay@ericsson.com>
* linux-low.c (default_breakpoint_kind_from_pc): Move to target.c.
* mem-break.c (set_breakpoint_at): Use target_breakpoint_kind_from_pc.
* target.c (default_breakpoint_kind_from_pc): Moved from linux-low.c
* target.h (target_breakpoint_kind_from_pc): New macro.
2015-10-22 Antoine Tremblay <antoine.tremblay@ericsson.com>
* linux-low.c (default_breakpoint_kind_from_pc): New function.

13
gdb/gdbserver/linux-low.c
View File

@ -6937,19 +6937,6 @@ current_lwp_ptid (void)
return ptid_of (current_thread);
}
/* Return the default breakpoint kind as the size of the breakpoint. */
static int
default_breakpoint_kind_from_pc (CORE_ADDR *pcptr)
{
int size = 0;
gdb_assert (the_low_target.sw_breakpoint_from_kind != NULL);
(*the_low_target.sw_breakpoint_from_kind) (0, &size);
return size;
}
/* Implementation of the target_ops method "breakpoint_kind_from_pc". */
static int

2
gdb/gdbserver/mem-break.c
View File

@ -784,7 +784,7 @@ set_breakpoint_at (CORE_ADDR where, int (*handler) (CORE_ADDR))
{
int err_ignored;
CORE_ADDR placed_address = where;
int breakpoint_kind = the_target->breakpoint_kind_from_pc (&placed_address);
int breakpoint_kind = target_breakpoint_kind_from_pc (&placed_address);
return set_breakpoint (other_breakpoint, raw_bkpt_type_sw,
placed_address, breakpoint_kind, handler,

16
gdb/gdbserver/target.c
View File

@ -224,3 +224,19 @@ target_can_do_hardware_single_step (void)
{
return 1;
}
/* Default implementation for breakpoint_kind_for_pc.
The default behavior for targets that don't implement breakpoint_kind_for_pc
is to use the size of a breakpoint as the kind. */
int
default_breakpoint_kind_from_pc (CORE_ADDR *pcptr)
{
int size = 0;
gdb_assert (the_target->sw_breakpoint_from_kind != NULL);
(*the_target->sw_breakpoint_from_kind) (0, &size);
return size;
}

7
gdb/gdbserver/target.h
View File

@ -633,6 +633,11 @@ int kill_inferior (int);
(the_target->stopped_by_hw_breakpoint ? \
(*the_target->stopped_by_hw_breakpoint) () : 0)
#define target_breakpoint_kind_from_pc(pcptr) \
(the_target->breakpoint_kind_from_pc \
? (*the_target->breakpoint_kind_from_pc) (pcptr) \
: default_breakpoint_kind_from_pc (pcptr))
/* Start non-stop mode, returns 0 on success, -1 on failure. */
int start_non_stop (int nonstop);
@ -667,4 +672,6 @@ const char *target_pid_to_str (ptid_t);
int target_can_do_hardware_single_step (void);
int default_breakpoint_kind_from_pc (CORE_ADDR *pcptr);
#endif /* TARGET_H */