From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26751 invoked by alias); 30 May 2013 06:35:30 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 26712 invoked by uid 89); 30 May 2013 06:35:23 -0000 X-Spam-SWARE-Status: No, score=-3.9 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Thu, 30 May 2013 06:35:20 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1UhwSE-0003eo-HP from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Wed, 29 May 2013 23:35:18 -0700 Received: from SVR-ORW-FEM-04.mgc.mentorg.com ([147.34.97.41]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 29 May 2013 23:35:18 -0700 Received: from qiyao.dyndns.org.dyndns.org (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.2.247.3; Wed, 29 May 2013 23:35:17 -0700 From: Yao Qi To: Subject: [PATCH] Remove parameter 'struct breakpoint *t' of encode_actions and encode_actions_1 Date: Thu, 30 May 2013 06:35:00 -0000 Message-ID: <1369895749-17590-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2013-05/txt/msg01044.txt.bz2 Hi, I am going to post a patch series written by Pedro some times ago. Some changes are refactor to existing GDB code base, I extract them from the patch series, and post these preparatory patches at first. Here is one: Functions encode_actions_1 and encode_actions pass both 'bp_location' and 'breakpoint' in parameters, but the latter can be retrieved from the former. The latter one can be removed. The patch is somewhat obvious, and review still is welcome. Regression tested on x86_64-linux. gdb: 2013-05-30 Pedro Alves Yao Qi * tracepoint.c (encode_actions_1): Remove parameter 't'. Caller update. (encode_actions): Likewise. * remote.c (remote_download_tracepoint): Caller update. * tracepoint.h (encode_actions): Update declaration. --- gdb/remote.c | 2 +- gdb/tracepoint.c | 13 ++++++------- gdb/tracepoint.h | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gdb/remote.c b/gdb/remote.c index b96b381..d8854ae 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -10506,7 +10506,7 @@ remote_download_tracepoint (struct bp_location *loc) struct breakpoint *b = loc->owner; struct tracepoint *t = (struct tracepoint *) b; - encode_actions (loc->owner, loc, &tdp_actions, &stepping_actions); + encode_actions (loc, &tdp_actions, &stepping_actions); old_chain = make_cleanup (free_actions_list_cleanup_wrapper, tdp_actions); (void) make_cleanup (free_actions_list_cleanup_wrapper, diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 899e538..26aedac 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -1364,7 +1364,6 @@ stringify_collection_list (struct collection_list *list) static void encode_actions_1 (struct command_line *action, - struct breakpoint *t, struct bp_location *tloc, int frame_reg, LONGEST frame_offset, @@ -1597,7 +1596,7 @@ encode_actions_1 (struct command_line *action, here. */ gdb_assert (stepping_list); - encode_actions_1 (action->body_list[0], t, tloc, frame_reg, + encode_actions_1 (action->body_list[0], tloc, frame_reg, frame_offset, stepping_list, NULL); } else @@ -1608,8 +1607,8 @@ encode_actions_1 (struct command_line *action, /* Render all actions into gdb protocol. */ void -encode_actions (struct breakpoint *t, struct bp_location *tloc, - char ***tdp_actions, char ***stepping_actions) +encode_actions (struct bp_location *tloc, char ***tdp_actions, + char ***stepping_actions) { char *default_collect_line = NULL; struct command_line *actions; @@ -1629,7 +1628,7 @@ encode_actions (struct breakpoint *t, struct bp_location *tloc, gdbarch_virtual_frame_pointer (tloc->gdbarch, tloc->address, &frame_reg, &frame_offset); - actions = breakpoint_commands (t); + actions = breakpoint_commands (tloc->owner); /* If there are default expressions to collect, make up a collect action and prepend to the action list to encode. Note that since @@ -1641,7 +1640,7 @@ encode_actions (struct breakpoint *t, struct bp_location *tloc, default_collect_line = xstrprintf ("collect %s", default_collect); make_cleanup (xfree, default_collect_line); - validate_actionline (default_collect_line, t); + validate_actionline (default_collect_line, tloc->owner); default_collect_action = xmalloc (sizeof (struct command_line)); make_cleanup (xfree, default_collect_action); @@ -1649,7 +1648,7 @@ encode_actions (struct breakpoint *t, struct bp_location *tloc, default_collect_action->line = default_collect_line; actions = default_collect_action; } - encode_actions_1 (actions, t, tloc, frame_reg, frame_offset, + encode_actions_1 (actions, tloc, frame_reg, frame_offset, &tracepoint_list, &stepping_list); memrange_sortmerge (&tracepoint_list); diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h index 18762ca..d7ebc16 100644 --- a/gdb/tracepoint.h +++ b/gdb/tracepoint.h @@ -357,7 +357,7 @@ void free_actions (struct breakpoint *); extern const char *decode_agent_options (const char *exp, int *trace_string); -extern void encode_actions (struct breakpoint *t, struct bp_location *tloc, +extern void encode_actions (struct bp_location *tloc, char ***tdp_actions, char ***stepping_actions); extern void validate_actionline (const char *, struct breakpoint *); -- 1.7.7.6