From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4177 invoked by alias); 21 Nov 2013 01:18:28 -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 4163 invoked by uid 89); 21 Nov 2013 01:18:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.1 required=5.0 tests=AWL,BAYES_50,RDNS_NONE,URIBL_BLOCKED autolearn=no version=3.3.2 X-HELO: relay1.mentorg.com Received: from Unknown (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 21 Nov 2013 01:18:26 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1VjIuJ-00069b-Ev from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Wed, 20 Nov 2013 17:18:11 -0800 Received: from SVR-ORW-FEM-04.mgc.mentorg.com ([147.34.97.41]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Wed, 20 Nov 2013 17:18:11 -0800 Received: from qiyao.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, 20 Nov 2013 17:18:10 -0800 From: Yao Qi To: Subject: [PATCH 1/3] Renaming in target-dcache.c Date: Thu, 21 Nov 2013 01:18:00 -0000 Message-ID: <1384996594-20865-2-git-send-email-yao@codesourcery.com> In-Reply-To: <1384996594-20865-1-git-send-email-yao@codesourcery.com> References: <1384996594-20865-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2013-11/txt/msg00612.txt.bz2 Hi, This patch does some renamings on "stack-cache" related functions and variables. In the review to "code cache" series v2, we have some discussions on the name of predicate function 'stack_cache_enabled', and have some options, 1 keep it unchanged, as it is already a predicate clearly, 2 rename it to stack_cache_enabled_p, 3 rename it to enable_stack_cache_p, I choose #2, because 'stack_cache_enabled' is a predicate, but it's better to add "_p" suffix to stress this. There are some other similar patterns used in GDB source, such as unop_user_defined_p and agent_loaded_p. Then, I have to rename variable stack_cache_enabled_p to something else. The option is "stack-cache", so I'd like to name the variable associated with this command as "stack_cache". Similarly, the commands associated with this command should be renamed to "set_stack_cache" and "show_stack_cache" respectively. gdb: 2013-11-21 Yao Qi * target-dcache.c (stack_cache_enabled_p_1): Rename to ... (stack_cache_1): ... this. New variable. (stack_cache_enabled_p): Rename to ... (stack_cache): ... this. New variable. (set_stack_cache_enabled_p): Rename to ... (set_stack_cache): ... this. Update caller. (show_stack_cache_enabled_p): Rename to ... (show_stack_cache): ... this. Update caller. (stack_cache_enabled): Rename to ... (stack_cache_enabled_p): ... this. Update caller. (_initialize_target_dcache): Replace "data cache" with "target memory cache". * target-dcache.h (stack_cache_enabled): Remove declaration. (stack_cache_enabled_p): Add declaration. --- gdb/target-dcache.c | 29 ++++++++++++++--------------- gdb/target-dcache.h | 2 +- gdb/target.c | 5 ++--- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/gdb/target-dcache.c b/gdb/target-dcache.c index 76160ef..26f6f5d 100644 --- a/gdb/target-dcache.c +++ b/gdb/target-dcache.c @@ -89,11 +89,11 @@ target_dcache_get_or_init (void) } /* The option sets this. */ -static int stack_cache_enabled_p_1 = 1; -/* And set_stack_cache_enabled_p updates this. +static int stack_cache_1 = 1; +/* And set_stack_cache updates this. The reason for the separation is so that we don't flush the cache for on->on transitions. */ -static int stack_cache_enabled_p = 1; +static int stack_cache = 1; /* This is called *after* the stack-cache has been set. Flush the cache for off->on and on->off transitions. @@ -101,18 +101,17 @@ static int stack_cache_enabled_p = 1; except cleanliness. */ static void -set_stack_cache_enabled_p (char *args, int from_tty, - struct cmd_list_element *c) +set_stack_cache (char *args, int from_tty, struct cmd_list_element *c) { - if (stack_cache_enabled_p != stack_cache_enabled_p_1) + if (stack_cache != stack_cache_1) target_dcache_invalidate (); - stack_cache_enabled_p = stack_cache_enabled_p_1; + stack_cache = stack_cache_1; } static void -show_stack_cache_enabled_p (struct ui_file *file, int from_tty, - struct cmd_list_element *c, const char *value) +show_stack_cache (struct ui_file *file, int from_tty, + struct cmd_list_element *c, const char *value) { fprintf_filtered (file, _("Cache use for stack accesses is %s.\n"), value); } @@ -120,9 +119,9 @@ show_stack_cache_enabled_p (struct ui_file *file, int from_tty, /* Return true if "stack cache" is enabled, otherwise, return false. */ int -stack_cache_enabled (void) +stack_cache_enabled_p (void) { - return stack_cache_enabled_p; + return stack_cache; } /* -Wmissing-prototypes */ @@ -132,14 +131,14 @@ void _initialize_target_dcache (void) { add_setshow_boolean_cmd ("stack-cache", class_support, - &stack_cache_enabled_p_1, _("\ + &stack_cache_1, _("\ Set cache use for stack access."), _("\ Show cache use for stack access."), _("\ -When on, use the data cache for all stack access, regardless of any\n\ +When on, use the target memory cache for all stack access, regardless of any\n\ configured memory regions. This improves remote performance significantly.\n\ By default, caching for stack access is on."), - set_stack_cache_enabled_p, - show_stack_cache_enabled_p, + set_stack_cache, + show_stack_cache, &setlist, &showlist); target_dcache_aspace_key diff --git a/gdb/target-dcache.h b/gdb/target-dcache.h index a5e1556..3200dd9 100644 --- a/gdb/target-dcache.h +++ b/gdb/target-dcache.h @@ -28,6 +28,6 @@ extern DCACHE *target_dcache_get_or_init (void); extern int target_dcache_init_p (void); -extern int stack_cache_enabled (void); +extern int stack_cache_enabled_p (void); #endif /* TARGET_DCACHE_H */ diff --git a/gdb/target.c b/gdb/target.c index 5001643..29f06b6 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1547,7 +1547,7 @@ memory_xfer_partial_1 (struct target_ops *ops, enum target_object object, the collected memory range fails. */ && get_traceframe_number () == -1 && (region->attrib.cache - || (stack_cache_enabled () && object == TARGET_OBJECT_STACK_MEMORY))) + || (stack_cache_enabled_p () && object == TARGET_OBJECT_STACK_MEMORY))) { DCACHE *dcache = target_dcache_get_or_init (); @@ -1600,8 +1600,7 @@ memory_xfer_partial_1 (struct target_ops *ops, enum target_object object, && writebuf != NULL && target_dcache_init_p () && !region->attrib.cache - && stack_cache_enabled () - && object != TARGET_OBJECT_STACK_MEMORY) + && stack_cache_enabled_p () && object != TARGET_OBJECT_STACK_MEMORY) { DCACHE *dcache = target_dcache_get (); -- 1.7.7.6