espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-20 01:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb: Remove unneeded parameter from set_breakpoint_location_function

Browse Source 
The explicit_loc parameter in set_breakpoint_location_function is not
useful.  This parameter is set from two possible fields of the
symtab_and_line used to create the breakpoint; the explicit_pc field,
and the explicit_line field.

First, the explicit_line field, this is not currently set for any
breakpoint command, so will never be true.

Next, the explicit_pc field.  This can be true but will never be true
at the same time that the sal->msymbol field is also true - the
sal->msymbol is only ever set in linespec.c:minsym_found, which
doesn't allow for explicitly setting the pc.

The result of this is that if we are setting a breakpoint on an
msymbol that could turn out to be an ifunc, then we will not also have
either an explicit_pc or an explicit_line, this check can therefore be
removed.

There should be no user visible changes after this commit.

gdb/ChangeLog:

	* breakpoint.c (set_breakpoint_location_function): Remove
	explicit_loc parameter.
	(momentary_breakpoint_from_master): Update call to
	set_breakpoint_location_function.
	(add_location_to_breakpoint): Likewise.
This commit is contained in:
Andrew Burgess
2019-07-01 16:00:52 +01:00
parent b3a7d1711e
commit 0ba852ab41
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2019-07-09 Andrew Burgess <andrew.burgess@embecosm.com>
* breakpoint.c (set_breakpoint_location_function): Remove
explicit_loc parameter.
(momentary_breakpoint_from_master): Update call to
set_breakpoint_location_function.
(add_location_to_breakpoint): Likewise.
2019-07-09 Andrew Burgess <andrew.burgess@embecosm.com>
* riscv-tdep.c (riscv_features_from_gdbarch_info): Don't modify

14
gdb/breakpoint.c
View File

@ -7095,12 +7095,10 @@ set_raw_breakpoint_without_location (struct gdbarch *gdbarch,
return add_to_breakpoint_chain (std::move (b));
}
/* Initialize loc->function_name. EXPLICIT_LOC says no indirect function
resolutions should be made as the user specified the location explicitly
enough. */
/* Initialize loc->function_name. */
static void
set_breakpoint_location_function (struct bp_location *loc, int explicit_loc)
set_breakpoint_location_function (struct bp_location *loc)
{
gdb_assert (loc->owner != NULL);
@ -7112,8 +7110,7 @@ set_breakpoint_location_function (struct bp_location *loc, int explicit_loc)
if (loc->msymbol != NULL
&& (MSYMBOL_TYPE (loc->msymbol) == mst_text_gnu_ifunc
|| MSYMBOL_TYPE (loc->msymbol) == mst_data_gnu_ifunc)
&& !explicit_loc)
|| MSYMBOL_TYPE (loc->msymbol) == mst_data_gnu_ifunc))
{
struct breakpoint *b = loc->owner;
@ -8481,7 +8478,7 @@ momentary_breakpoint_from_master (struct breakpoint *orig,
copy = set_raw_breakpoint_without_location (orig->gdbarch, type, ops);
copy->loc = allocate_bp_location (copy);
set_breakpoint_location_function (copy->loc, 1);
set_breakpoint_location_function (copy->loc);
copy->loc->gdbarch = orig->loc->gdbarch;
copy->loc->requested_address = orig->loc->requested_address;
@ -8586,8 +8583,7 @@ add_location_to_breakpoint (struct breakpoint *b,
loc->msymbol = sal->msymbol;
loc->objfile = sal->objfile;
set_breakpoint_location_function (loc,
sal->explicit_pc || sal->explicit_line);
set_breakpoint_location_function (loc);
/* While by definition, permanent breakpoints are already present in the
code, we don't mark the location as inserted. Normally one would expect