-/* Copyright (C) 1992-2017 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 ((DCACHE *) arg);
-}
+static const struct address_space_key<DCACHE, dcache_deleter>
+ target_dcache_aspace_key;
/* Target dcache is initialized or not. */
target_dcache_init_p (void)
{
DCACHE *dcache
- = (DCACHE *) address_space_data (current_program_space->aspace,
- target_dcache_aspace_key);
+ = target_dcache_aspace_key.get (current_program_space->aspace);
return (dcache != NULL);
}
target_dcache_invalidate (void)
{
DCACHE *dcache
- = (DCACHE *) address_space_data (current_program_space->aspace,
- target_dcache_aspace_key);
+ = target_dcache_aspace_key.get (current_program_space->aspace);
if (dcache != NULL)
dcache_invalidate (dcache);
DCACHE *
target_dcache_get (void)
{
- DCACHE *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
target_dcache_get_or_init (void)
{
DCACHE *dcache
- = (DCACHE *) address_space_data (current_program_space->aspace,
- target_dcache_aspace_key);
+ = 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_1 = 1;
+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. */
except cleanliness. */
static void
-set_stack_cache (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 != stack_cache_enabled_1)
target_dcache_invalidate ();
/* The option sets this. */
-static int code_cache_enabled_1 = 1;
+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
except cleanliness. */
static void
-set_code_cache (char *args, int from_tty, struct cmd_list_element *c)
+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 ();
set_code_cache,
show_code_cache,
&setlist, &showlist);
-
- target_dcache_aspace_key
- = register_address_space_data_with_cleanup (NULL,
- target_dcache_cleanup);
}