Renaming in target-dcache.c

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-24  Yao Qi  <yao@codesourcery.com>

	* target-dcache.c (stack_cache_enabled_p_1): Rename to ...
	(stack_cache_enabled_1): ... this.  New variable.
	(stack_cache_enabled_p): Rename to ...
	(stack_cache_enabled): ... 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.
This commit is contained in:
Yao Qi
2013-11-20 16:21:47 +08:00
parent 22825df749
commit 0fb14d8ffd
4 changed files with 34 additions and 18 deletions

View File

@ -1,3 +1,20 @@
2013-11-24 Yao Qi <yao@codesourcery.com>
* target-dcache.c (stack_cache_enabled_p_1): Rename to ...
(stack_cache_enabled_1): ... this. New variable.
(stack_cache_enabled_p): Rename to ...
(stack_cache_enabled): ... 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.
2013-11-23 Doug Evans <xdje42@gmail.com> 2013-11-23 Doug Evans <xdje42@gmail.com>
* python/py-frame.c (gdbpy_initialize_frames): Remove FIRST_ERROR, * python/py-frame.c (gdbpy_initialize_frames): Remove FIRST_ERROR,

View File

@ -89,11 +89,11 @@ target_dcache_get_or_init (void)
} }
/* The option sets this. */ /* The option sets this. */
static int stack_cache_enabled_p_1 = 1; static int stack_cache_enabled_1 = 1;
/* And set_stack_cache_enabled_p updates this. /* And set_stack_cache updates this.
The reason for the separation is so that we don't flush the cache for The reason for the separation is so that we don't flush the cache for
on->on transitions. */ on->on transitions. */
static int stack_cache_enabled_p = 1; static int stack_cache_enabled = 1;
/* This is called *after* the stack-cache has been set. /* This is called *after* the stack-cache has been set.
Flush the cache for off->on and on->off transitions. Flush the cache for off->on and on->off transitions.
@ -101,18 +101,17 @@ static int stack_cache_enabled_p = 1;
except cleanliness. */ except cleanliness. */
static void static void
set_stack_cache_enabled_p (char *args, int from_tty, set_stack_cache (char *args, int from_tty, struct cmd_list_element *c)
struct cmd_list_element *c)
{ {
if (stack_cache_enabled_p != stack_cache_enabled_p_1) if (stack_cache_enabled != stack_cache_enabled_1)
target_dcache_invalidate (); target_dcache_invalidate ();
stack_cache_enabled_p = stack_cache_enabled_p_1; stack_cache_enabled = stack_cache_enabled_1;
} }
static void static void
show_stack_cache_enabled_p (struct ui_file *file, int from_tty, show_stack_cache (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value) struct cmd_list_element *c, const char *value)
{ {
fprintf_filtered (file, _("Cache use for stack accesses is %s.\n"), 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. */ /* Return true if "stack cache" is enabled, otherwise, return false. */
int int
stack_cache_enabled (void) stack_cache_enabled_p (void)
{ {
return stack_cache_enabled_p; return stack_cache_enabled;
} }
/* -Wmissing-prototypes */ /* -Wmissing-prototypes */
@ -132,14 +131,14 @@ void
_initialize_target_dcache (void) _initialize_target_dcache (void)
{ {
add_setshow_boolean_cmd ("stack-cache", class_support, add_setshow_boolean_cmd ("stack-cache", class_support,
&stack_cache_enabled_p_1, _("\ &stack_cache_enabled_1, _("\
Set cache use for stack access."), _("\ Set cache use for stack access."), _("\
Show 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\ configured memory regions. This improves remote performance significantly.\n\
By default, caching for stack access is on."), By default, caching for stack access is on."),
set_stack_cache_enabled_p, set_stack_cache,
show_stack_cache_enabled_p, show_stack_cache,
&setlist, &showlist); &setlist, &showlist);
target_dcache_aspace_key target_dcache_aspace_key

View File

@ -28,6 +28,6 @@ extern DCACHE *target_dcache_get_or_init (void);
extern int target_dcache_init_p (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 */ #endif /* TARGET_DCACHE_H */

View File

@ -1547,7 +1547,7 @@ memory_xfer_partial_1 (struct target_ops *ops, enum target_object object,
the collected memory range fails. */ the collected memory range fails. */
&& get_traceframe_number () == -1 && get_traceframe_number () == -1
&& (region->attrib.cache && (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 (); DCACHE *dcache = target_dcache_get_or_init ();
@ -1600,7 +1600,7 @@ memory_xfer_partial_1 (struct target_ops *ops, enum target_object object,
&& writebuf != NULL && writebuf != NULL
&& target_dcache_init_p () && target_dcache_init_p ()
&& !region->attrib.cache && !region->attrib.cache
&& stack_cache_enabled () && stack_cache_enabled_p ()
&& object != TARGET_OBJECT_STACK_MEMORY) && object != TARGET_OBJECT_STACK_MEMORY)
{ {
DCACHE *dcache = target_dcache_get (); DCACHE *dcache = target_dcache_get ();