From 264f98902f27497f7494933628b0f5c4e117fe59 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 23 May 2022 20:15:18 +0100 Subject: event_location -> location_spec Currently, GDB internally uses the term "location" for both the location specification the user input (linespec, explicit location, or an address location), and for actual resolved locations, like the breakpoint locations, or the result of decoding a location spec to SaLs. This is expecially confusing in the breakpoints module, as struct breakpoint has these two fields: breakpoint::location; breakpoint::loc; "location" is the location spec, and "loc" is the resolved locations. And then, we have a method called "locations()", which returns the resolved locations as range... The location spec type is presently called event_location: /* Location we used to set the breakpoint. */ event_location_up location; and it is described like this: /* The base class for all an event locations used to set a stop event in the inferior. */ struct event_location { and even that is incorrect... Location specs are used for finding actual locations in the program in scenarios that have nothing to do with stop events. E.g., "list" works with location specs. To clean all this confusion up, this patch renames "event_location" to "location_spec" throughout, and then all the variables that hold a location spec, they are renamed to include "spec" in their name, like e.g., "location" -> "locspec". Similarly, functions that work with location specs, and currently have just "location" in their name are renamed to include "spec" in their name too. Change-Id: I5814124798aa2b2003e79496e78f95c74e5eddca --- gdb/probe.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gdb/probe.c') diff --git a/gdb/probe.c b/gdb/probe.c index f0a40f5..0b056eb 100644 --- a/gdb/probe.c +++ b/gdb/probe.c @@ -114,7 +114,7 @@ parse_probes_in_pspace (const static_probe_ops *spops, /* See definition in probe.h. */ std::vector -parse_probes (const struct event_location *location, +parse_probes (const location_spec *locspec, struct program_space *search_pspace, struct linespec_result *canonical) { @@ -122,8 +122,8 @@ parse_probes (const struct event_location *location, char *objfile_namestr = NULL, *provider = NULL, *name, *p; const char *arg_start, *cs; - gdb_assert (event_location_type (location) == PROBE_LOCATION); - arg_start = get_probe_location (location); + gdb_assert (location_spec_type (locspec) == PROBE_LOCATION_SPEC); + arg_start = get_probe_location_spec_string (locspec); cs = arg_start; const static_probe_ops *spops = probe_linespec_to_static_ops (&cs); @@ -204,7 +204,7 @@ parse_probes (const struct event_location *location, std::string canon (arg_start, arg_end - arg_start); canonical->special_display = 1; canonical->pre_expanded = 1; - canonical->location = new_probe_location (std::move (canon)); + canonical->locspec = new_probe_location_spec (std::move (canon)); } return result; -- cgit v1.1