-/* Copyright (C) 1992-2013 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2019 Free Software Foundation, Inc.
This file is part of GDB.
/* The target dcache is kept per-address-space. This key lets us
associate the cache with the address space. */
-static const struct address_space_data *target_dcache_aspace_key;
-
-/* Clean up dcache, represented by ARG, which is associated with
- ASPACE. */
-
-static void
-target_dcache_cleanup (struct address_space *aspace, void *arg)
-{
- dcache_free (arg);
-}
+static const struct address_space_key<DCACHE, dcache_deleter>
+ target_dcache_aspace_key;
/* Target dcache is initialized or not. */
int
target_dcache_init_p (void)
{
- DCACHE *dcache = address_space_data (current_program_space->aspace,
- target_dcache_aspace_key);
+ DCACHE *dcache
+ = target_dcache_aspace_key.get (current_program_space->aspace);
return (dcache != NULL);
}
void
target_dcache_invalidate (void)
{
- DCACHE *dcache = address_space_data (current_program_space->aspace,
- target_dcache_aspace_key);
+ DCACHE *dcache
+ = target_dcache_aspace_key.get (current_program_space->aspace);
if (dcache != NULL)
dcache_invalidate (dcache);
DCACHE *
target_dcache_get (void)
{
- DCACHE *dcache = address_space_data (current_program_space->aspace,
- target_dcache_aspace_key);
-
- return dcache;
+ return target_dcache_aspace_key.get (current_program_space->aspace);
}
/* Return the target dcache. If it is not initialized yet, initialize
DCACHE *
target_dcache_get_or_init (void)
{
- DCACHE *dcache = address_space_data (current_program_space->aspace,
- target_dcache_aspace_key);
+ DCACHE *dcache
+ = target_dcache_aspace_key.get (current_program_space->aspace);
if (dcache == NULL)
{
dcache = dcache_init ();
- set_address_space_data (current_program_space->aspace,
- target_dcache_aspace_key, dcache);
+ target_dcache_aspace_key.set (current_program_space->aspace, dcache);
}
return dcache;
}
/* The option sets this. */
-static int stack_cache_enabled_p_1 = 1;
-/* And set_stack_cache_enabled_p updates this.
+static bool stack_cache_enabled_1 = true;
+/* 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_enabled = 1;
/* This is called *after* the stack-cache has been set.
Flush the cache for off->on and on->off transitions.
except cleanliness. */
static void
-set_stack_cache_enabled_p (char *args, int from_tty,
- struct cmd_list_element *c)
+set_stack_cache (const char *args, int from_tty, 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 ();
- stack_cache_enabled_p = stack_cache_enabled_p_1;
+ stack_cache_enabled = stack_cache_enabled_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);
}
/* 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_enabled;
}
-/* -Wmissing-prototypes */
-extern initialize_file_ftype _initialize_target_dcache;
+/* The option sets this. */
+
+static bool code_cache_enabled_1 = true;
+
+/* And set_code_cache updates this.
+ The reason for the separation is so that we don't flush the cache for
+ on->on transitions. */
+static int code_cache_enabled = 1;
+
+/* This is called *after* the code-cache has been set.
+ Flush the cache for off->on and on->off transitions.
+ There's no real need to flush the cache for on->off transitions,
+ except cleanliness. */
+
+static void
+set_code_cache (const char *args, int from_tty, struct cmd_list_element *c)
+{
+ if (code_cache_enabled != code_cache_enabled_1)
+ target_dcache_invalidate ();
+
+ code_cache_enabled = code_cache_enabled_1;
+}
+
+/* Show option "code-cache". */
+
+static void
+show_code_cache (struct ui_file *file, int from_tty,
+ struct cmd_list_element *c, const char *value)
+{
+ fprintf_filtered (file, _("Cache use for code accesses is %s.\n"), value);
+}
+
+/* Return true if "code cache" is enabled, otherwise, return false. */
+
+int
+code_cache_enabled_p (void)
+{
+ return code_cache_enabled;
+}
void
_initialize_target_dcache (void)
{
add_setshow_boolean_cmd ("stack-cache", class_support,
- &stack_cache_enabled_p_1, _("\
+ &stack_cache_enabled_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
- = register_address_space_data_with_cleanup (NULL,
- target_dcache_cleanup);
+ add_setshow_boolean_cmd ("code-cache", class_support,
+ &code_cache_enabled_1, _("\
+Set cache use for code segment access."), _("\
+Show cache use for code segment access."), _("\
+When on, use the target memory cache for all code segment accesses,\n\
+regardless of any configured memory regions. This improves remote\n\
+performance significantly. By default, caching for code segment\n\
+access is on."),
+ set_code_cache,
+ show_code_cache,
+ &setlist, &showlist);
}
projects / deliverable / binutils-gdb.git / blobdiff