From patchwork Tue Feb 17 22:06:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Seitz X-Patchwork-Id: 5143 Received: (qmail 13166 invoked by alias); 17 Feb 2015 22:06:44 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 13097 invoked by uid 89); 17 Feb 2015 22:06:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 17 Feb 2015 22:06:40 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1HM6cjp022581 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 17 Feb 2015 17:06:39 -0500 Received: from valrhona.uglyboxes.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1HM6caB015816 for ; Tue, 17 Feb 2015 17:06:38 -0500 Subject: [PATCH v3 1/9] Explicit locations: rename "address string"/"addr_string" to "location" From: Keith Seitz To: gdb-patches@sourceware.org Date: Tue, 17 Feb 2015 14:06:38 -0800 Message-ID: <20150217220638.1312.68232.stgit@valrhona.uglyboxes.com> In-Reply-To: <20150217220619.1312.39861.stgit@valrhona.uglyboxes.com> References: <20150217220619.1312.39861.stgit@valrhona.uglyboxes.com> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-IsSubscribed: yes This patch renames all occurrances of "addr_string" and "address string" in the breakpoint/linespec APIs. This will emphasize the change from address strings used in setting breakpoints (et al) to the new locations-based API introduced in subsequent patches. gdb/ChangeLog: * breakpoint.h (struct breakpoint_ops) : Renamed to create_sals_from_location. : Renamed to decode_location. Update all callers. * breakpoint.c (create_sals_from_address_default): Renamed to ... (create_sals_from_location_default): ... this. (addr_string_to_sals): Renamed to ... (location_to_sals): ... this. (decode_linespec_default): Renamed to ... (decode_location_default): ... this. (base_breakpoint_create_sals_from_address): Renamed to ... (base_breakpoint_create_sals_from_location): ... this. (bkpt_create_sals_from_address): Renamed to ... (bkpt_create_sals_from_location): ... this. (bkpt_decode_linespec): Renamed to ... (bkpt_decode_location): ... this. (bkpt_probe_create_sals_from_address): Renamed to ... (bkpt_probe_create_sals_from_location): ... this. (tracepoint_create_sals_from_address): Renamed to ... (tracepoint_create_sals_from_location): ... this. (tracepoint_decode_linespec): Renamed to ... (tracepoint_decode_location): ... this. (tracepoint_probe_create_sals_from_address): Renamed to ... (tracepoint_probe_create_sals_from_location): ... this. (tracepoint_probe_decode_linespec): Renamed to ... (tracepoint_probe_decode_location): ... this. (strace_marker_create_sals_from_address): Renamed to ... (strace_marker_create_sals_from_location): ... this. (decode_linespec_default): Renamed to ... (decode_location_default): ... this. --- gdb/break-catch-throw.c | 2 - gdb/breakpoint.c | 116 ++++++++++++++++++++++++----------------------- gdb/breakpoint.h | 14 +++--- 3 files changed, 66 insertions(+), 66 deletions(-) diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c index fb04932..954e98b 100644 --- a/gdb/break-catch-throw.c +++ b/gdb/break-catch-throw.c @@ -225,7 +225,7 @@ re_set_exception_catchpoint (struct breakpoint *self) { char *spec = ASTRDUP (exception_functions[kind].function); - self->ops->decode_linespec (self, &spec, &sals); + self->ops->decode_location (self, &spec, &sals); } /* NOT_FOUND_ERROR just means the breakpoint will be pending, so diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 2804453..c7d6c98 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -109,10 +109,10 @@ static int breakpoint_re_set_one (void *); static void breakpoint_re_set_default (struct breakpoint *); -static void create_sals_from_address_default (char **, - struct linespec_result *, - enum bptype, char *, - char **); +static void create_sals_from_location_default (char **, + struct linespec_result *, + enum bptype, char *, + char **); static void create_breakpoints_sal_default (struct gdbarch *, struct linespec_result *, @@ -122,7 +122,7 @@ static void create_breakpoints_sal_default (struct gdbarch *, const struct breakpoint_ops *, int, int, int, unsigned); -static void decode_linespec_default (struct breakpoint *, char **, +static void decode_location_default (struct breakpoint *, char **, struct symtabs_and_lines *); static void clear_command (char *, int); @@ -9992,8 +9992,8 @@ create_breakpoint (struct gdbarch *gdbarch, TRY_CATCH (e, RETURN_MASK_ALL) { - ops->create_sals_from_address (&arg, &canonical, type_wanted, - addr_start, ©_arg); + ops->create_sals_from_location (&arg, &canonical, type_wanted, + addr_start, ©_arg); } /* If caller is interested in rc value from parse, set value. */ @@ -13189,11 +13189,11 @@ base_breakpoint_print_recreate (struct breakpoint *b, struct ui_file *fp) } static void -base_breakpoint_create_sals_from_address (char **arg, - struct linespec_result *canonical, - enum bptype type_wanted, - char *addr_start, - char **copy_arg) +base_breakpoint_create_sals_from_location (char **arg, + struct linespec_result *canonical, + enum bptype type_wanted, + char *addr_start, + char **copy_arg) { internal_error_pure_virtual_called (); } @@ -13215,7 +13215,7 @@ base_breakpoint_create_breakpoints_sal (struct gdbarch *gdbarch, } static void -base_breakpoint_decode_linespec (struct breakpoint *b, char **s, +base_breakpoint_decode_location (struct breakpoint *b, char **s, struct symtabs_and_lines *sals) { internal_error_pure_virtual_called (); @@ -13253,9 +13253,9 @@ struct breakpoint_ops base_breakpoint_ops = base_breakpoint_print_one_detail, base_breakpoint_print_mention, base_breakpoint_print_recreate, - base_breakpoint_create_sals_from_address, + base_breakpoint_create_sals_from_location, base_breakpoint_create_breakpoints_sal, - base_breakpoint_decode_linespec, + base_breakpoint_decode_location, base_breakpoint_explains_signal, base_breakpoint_after_condition_true, }; @@ -13425,12 +13425,12 @@ bkpt_print_recreate (struct breakpoint *tp, struct ui_file *fp) } static void -bkpt_create_sals_from_address (char **arg, +bkpt_create_sals_from_location (char **arg, struct linespec_result *canonical, enum bptype type_wanted, char *addr_start, char **copy_arg) { - create_sals_from_address_default (arg, canonical, type_wanted, + create_sals_from_location_default (arg, canonical, type_wanted, addr_start, copy_arg); } @@ -13456,10 +13456,10 @@ bkpt_create_breakpoints_sal (struct gdbarch *gdbarch, } static void -bkpt_decode_linespec (struct breakpoint *b, char **s, +bkpt_decode_location (struct breakpoint *b, char **s, struct symtabs_and_lines *sals) { - decode_linespec_default (b, s, sals); + decode_location_default (b, s, sals); } /* Virtual table for internal breakpoints. */ @@ -13659,10 +13659,10 @@ bkpt_probe_remove_location (struct bp_location *bl) } static void -bkpt_probe_create_sals_from_address (char **arg, - struct linespec_result *canonical, - enum bptype type_wanted, - char *addr_start, char **copy_arg) +bkpt_probe_create_sals_from_location (char **arg, + struct linespec_result *canonical, + enum bptype type_wanted, + char *addr_start, char **copy_arg) { struct linespec_sals lsal; @@ -13675,7 +13675,7 @@ bkpt_probe_create_sals_from_address (char **arg, } static void -bkpt_probe_decode_linespec (struct breakpoint *b, char **s, +bkpt_probe_decode_location (struct breakpoint *b, char **s, struct symtabs_and_lines *sals) { *sals = parse_probes (s, NULL); @@ -13768,12 +13768,12 @@ tracepoint_print_recreate (struct breakpoint *self, struct ui_file *fp) } static void -tracepoint_create_sals_from_address (char **arg, +tracepoint_create_sals_from_location (char **arg, struct linespec_result *canonical, enum bptype type_wanted, char *addr_start, char **copy_arg) { - create_sals_from_address_default (arg, canonical, type_wanted, + create_sals_from_location_default (arg, canonical, type_wanted, addr_start, copy_arg); } @@ -13799,10 +13799,10 @@ tracepoint_create_breakpoints_sal (struct gdbarch *gdbarch, } static void -tracepoint_decode_linespec (struct breakpoint *b, char **s, +tracepoint_decode_location (struct breakpoint *b, char **s, struct symtabs_and_lines *sals) { - decode_linespec_default (b, s, sals); + decode_location_default (b, s, sals); } struct breakpoint_ops tracepoint_breakpoint_ops; @@ -13811,22 +13811,22 @@ struct breakpoint_ops tracepoint_breakpoint_ops; static probe. */ static void -tracepoint_probe_create_sals_from_address (char **arg, - struct linespec_result *canonical, - enum bptype type_wanted, - char *addr_start, char **copy_arg) +tracepoint_probe_create_sals_from_location (char **arg, + struct linespec_result *canonical, + enum bptype type_wanted, + char *addr_start, char **copy_arg) { /* We use the same method for breakpoint on probes. */ - bkpt_probe_create_sals_from_address (arg, canonical, type_wanted, - addr_start, copy_arg); + bkpt_probe_create_sals_from_location (arg, canonical, type_wanted, + addr_start, copy_arg); } static void -tracepoint_probe_decode_linespec (struct breakpoint *b, char **s, +tracepoint_probe_decode_location (struct breakpoint *b, char **s, struct symtabs_and_lines *sals) { /* We use the same method for breakpoint on probes. */ - bkpt_probe_decode_linespec (b, s, sals); + bkpt_probe_decode_location (b, s, sals); } static struct breakpoint_ops tracepoint_probe_breakpoint_ops; @@ -13912,10 +13912,10 @@ dprintf_after_condition_true (struct bpstats *bs) markers (`-m'). */ static void -strace_marker_create_sals_from_address (char **arg, - struct linespec_result *canonical, - enum bptype type_wanted, - char *addr_start, char **copy_arg) +strace_marker_create_sals_from_location (char **arg, + struct linespec_result *canonical, + enum bptype type_wanted, + char *addr_start, char **copy_arg) { struct linespec_sals lsal; @@ -13988,7 +13988,7 @@ strace_marker_create_breakpoints_sal (struct gdbarch *gdbarch, } static void -strace_marker_decode_linespec (struct breakpoint *b, char **s, +strace_marker_decode_location (struct breakpoint *b, char **s, struct symtabs_and_lines *sals) { struct tracepoint *tp = (struct tracepoint *) b; @@ -14533,7 +14533,7 @@ update_breakpoint_locations (struct breakpoint *b, On return, FOUND will be 1 if any SaL was found, zero otherwise. */ static struct symtabs_and_lines -addr_string_to_sals (struct breakpoint *b, char *addr_string, int *found) +location_to_sals (struct breakpoint *b, char *addr_string, int *found) { char *s; struct symtabs_and_lines sals = {0}; @@ -14544,7 +14544,7 @@ addr_string_to_sals (struct breakpoint *b, char *addr_string, int *found) TRY_CATCH (e, RETURN_MASK_ERROR) { - b->ops->decode_linespec (b, &s, &sals); + b->ops->decode_location (b, &s, &sals); } if (e.reason < 0) { @@ -14622,7 +14622,7 @@ breakpoint_re_set_default (struct breakpoint *b) struct symtabs_and_lines expanded = {0}; struct symtabs_and_lines expanded_end = {0}; - sals = addr_string_to_sals (b, b->addr_string, &found); + sals = location_to_sals (b, b->addr_string, &found); if (found) { make_cleanup (xfree, sals.sals); @@ -14631,7 +14631,7 @@ breakpoint_re_set_default (struct breakpoint *b) if (b->addr_string_range_end) { - sals_end = addr_string_to_sals (b, b->addr_string_range_end, &found); + sals_end = location_to_sals (b, b->addr_string_range_end, &found); if (found) { make_cleanup (xfree, sals_end.sals); @@ -14646,7 +14646,7 @@ breakpoint_re_set_default (struct breakpoint *b) calls parse_breakpoint_sals. Return 1 for success, zero for failure. */ static void -create_sals_from_address_default (char **arg, +create_sals_from_location_default (char **arg, struct linespec_result *canonical, enum bptype type_wanted, char *addr_start, char **copy_arg) @@ -14679,10 +14679,10 @@ create_breakpoints_sal_default (struct gdbarch *gdbarch, } /* Decode the line represented by S by calling decode_line_full. This is the - default function for the `decode_linespec' method of breakpoint_ops. */ + default function for the `decode_location' method of breakpoint_ops. */ static void -decode_linespec_default (struct breakpoint *b, char **s, +decode_location_default (struct breakpoint *b, char **s, struct symtabs_and_lines *sals) { struct linespec_result canonical; @@ -16130,9 +16130,9 @@ initialize_breakpoint_ops (void) ops->insert_location = bkpt_insert_location; ops->remove_location = bkpt_remove_location; ops->breakpoint_hit = bkpt_breakpoint_hit; - ops->create_sals_from_address = bkpt_create_sals_from_address; + ops->create_sals_from_location = bkpt_create_sals_from_location; ops->create_breakpoints_sal = bkpt_create_breakpoints_sal; - ops->decode_linespec = bkpt_decode_linespec; + ops->decode_location = bkpt_decode_location; /* The breakpoint_ops structure to be used in regular breakpoints. */ ops = &bkpt_breakpoint_ops; @@ -16180,8 +16180,8 @@ initialize_breakpoint_ops (void) *ops = bkpt_breakpoint_ops; ops->insert_location = bkpt_probe_insert_location; ops->remove_location = bkpt_probe_remove_location; - ops->create_sals_from_address = bkpt_probe_create_sals_from_address; - ops->decode_linespec = bkpt_probe_decode_linespec; + ops->create_sals_from_location = bkpt_probe_create_sals_from_location; + ops->decode_location = bkpt_probe_decode_location; /* Watchpoints. */ ops = &watchpoint_breakpoint_ops; @@ -16219,22 +16219,22 @@ initialize_breakpoint_ops (void) ops->print_one_detail = tracepoint_print_one_detail; ops->print_mention = tracepoint_print_mention; ops->print_recreate = tracepoint_print_recreate; - ops->create_sals_from_address = tracepoint_create_sals_from_address; + ops->create_sals_from_location = tracepoint_create_sals_from_location; ops->create_breakpoints_sal = tracepoint_create_breakpoints_sal; - ops->decode_linespec = tracepoint_decode_linespec; + ops->decode_location = tracepoint_decode_location; /* Probe tracepoints. */ ops = &tracepoint_probe_breakpoint_ops; *ops = tracepoint_breakpoint_ops; - ops->create_sals_from_address = tracepoint_probe_create_sals_from_address; - ops->decode_linespec = tracepoint_probe_decode_linespec; + ops->create_sals_from_location = tracepoint_probe_create_sals_from_location; + ops->decode_location = tracepoint_probe_decode_location; /* Static tracepoints with marker (`-m'). */ ops = &strace_marker_breakpoint_ops; *ops = tracepoint_breakpoint_ops; - ops->create_sals_from_address = strace_marker_create_sals_from_address; + ops->create_sals_from_location = strace_marker_create_sals_from_location; ops->create_breakpoints_sal = strace_marker_create_breakpoints_sal; - ops->decode_linespec = strace_marker_decode_linespec; + ops->decode_location = strace_marker_decode_location; /* Fork catchpoints. */ ops = &catch_fork_breakpoint_ops; diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 100d4f2..42c7427 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -554,14 +554,14 @@ struct breakpoint_ops /* Print to FP the CLI command that recreates this breakpoint. */ void (*print_recreate) (struct breakpoint *, struct ui_file *fp); - /* Create SALs from address string, storing the result in linespec_result. + /* Create SALs from location, storing the result in linespec_result. For an explanation about the arguments, see the function - `create_sals_from_address_default'. + `create_sals_from_location_default'. This function is called inside `create_breakpoint'. */ - void (*create_sals_from_address) (char **, struct linespec_result *, - enum bptype, char *, char **); + void (*create_sals_from_location) (char **, struct linespec_result *, + enum bptype, char *, char **); /* This method will be responsible for creating a breakpoint given its SALs. Usually, it just calls `create_breakpoints_sal' (for ordinary @@ -577,12 +577,12 @@ struct breakpoint_ops int, const struct breakpoint_ops *, int, int, int, unsigned); - /* Given the address string (second parameter), this method decodes it + /* Given the location (second parameter), this method decodes it and provides the SAL locations related to it. For ordinary breakpoints, it calls `decode_line_full'. - This function is called inside `addr_string_to_sals'. */ - void (*decode_linespec) (struct breakpoint *, char **, + This function is called inside `location_to_sals'. */ + void (*decode_location) (struct breakpoint *, char **, struct symtabs_and_lines *); /* Return true if this breakpoint explains a signal. See