2003-11-15 Andrew Cagney <cagney@redhat.com>

* bcache.h (deprecated_bcache): Declare.
	(bcache): Make returned buffer constant.
	* bcache.c (deprecated_bcache): New function.
	(bcache_data): New function.
	(bcache): Call bcache data.
	* symfile.c (add_psymbol_to_list): Use deprecated_bcache.
	(add_psymbol_with_dem_name_to_list): Ditto.
This commit is contained in:
Andrew Cagney 2003-11-15 19:39:04 +00:00
parent 38cf6e11c7
commit 3a16a68c4f
4 changed files with 37 additions and 8 deletions

View file

@ -1,3 +1,13 @@
2003-11-15 Andrew Cagney <cagney@redhat.com>
* bcache.h (deprecated_bcache): Declare.
(bcache): Make returned buffer constant.
* bcache.c (deprecated_bcache): New function.
(bcache_data): New function.
(bcache): Call bcache data.
* symfile.c (add_psymbol_to_list): Use deprecated_bcache.
(add_psymbol_with_dem_name_to_list): Ditto.
2003-11-15 Mark Kettenis <kettenis@gnu.org> 2003-11-15 Mark Kettenis <kettenis@gnu.org>
* glibc-tdep.h (struct gdbarch): Declare opaque. * glibc-tdep.h (struct gdbarch): Declare opaque.

View file

@ -195,8 +195,8 @@ expand_hash_table (struct bcache *bcache)
/* Find a copy of the LENGTH bytes at ADDR in BCACHE. If BCACHE has /* Find a copy of the LENGTH bytes at ADDR in BCACHE. If BCACHE has
never seen those bytes before, add a copy of them to BCACHE. In never seen those bytes before, add a copy of them to BCACHE. In
either case, return a pointer to BCACHE's copy of that string. */ either case, return a pointer to BCACHE's copy of that string. */
void * static void *
bcache (const void *addr, int length, struct bcache *bcache) bcache_data (const void *addr, int length, struct bcache *bcache)
{ {
unsigned long full_hash; unsigned long full_hash;
unsigned short half_hash; unsigned short half_hash;
@ -247,6 +247,17 @@ bcache (const void *addr, int length, struct bcache *bcache)
} }
} }
void *
deprecated_bcache (const void *addr, int length, struct bcache *bcache)
{
return bcache_data (addr, length, bcache);
}
const void *
bcache (const void *addr, int length, struct bcache *bcache)
{
return bcache_data (addr, length, bcache);
}
/* Allocating and freeing bcaches. */ /* Allocating and freeing bcaches. */

View file

@ -143,8 +143,13 @@ struct bcache;
/* Find a copy of the LENGTH bytes at ADDR in BCACHE. If BCACHE has /* Find a copy of the LENGTH bytes at ADDR in BCACHE. If BCACHE has
never seen those bytes before, add a copy of them to BCACHE. In never seen those bytes before, add a copy of them to BCACHE. In
either case, return a pointer to BCACHE's copy of that string. */ either case, return a pointer to BCACHE's copy of that string.
extern void *bcache (const void *addr, int length, struct bcache *bcache); Since the cached value is ment to be read-only, return a const
buffer. */
extern void *deprecated_bcache (const void *addr, int length,
struct bcache *bcache);
extern const void *bcache (const void *addr, int length,
struct bcache *bcache);
/* Free all the storage used by BCACHE. */ /* Free all the storage used by BCACHE. */
extern void bcache_xfree (struct bcache *bcache); extern void bcache_xfree (struct bcache *bcache);

View file

@ -2680,7 +2680,8 @@ add_psymbol_to_list (char *name, int namelength, domain_enum domain,
SYMBOL_SET_NAMES (&psymbol, buf, namelength, objfile); SYMBOL_SET_NAMES (&psymbol, buf, namelength, objfile);
/* Stash the partial symbol away in the cache */ /* Stash the partial symbol away in the cache */
psym = bcache (&psymbol, sizeof (struct partial_symbol), objfile->psymbol_cache); psym = deprecated_bcache (&psymbol, sizeof (struct partial_symbol),
objfile->psymbol_cache);
/* Save pointer to partial symbol in psymtab, growing symtab if needed. */ /* Save pointer to partial symbol in psymtab, growing symtab if needed. */
if (list->next >= list->list + list->size) if (list->next >= list->list + list->size)
@ -2717,7 +2718,8 @@ add_psymbol_with_dem_name_to_list (char *name, int namelength, char *dem_name,
memcpy (buf, name, namelength); memcpy (buf, name, namelength);
buf[namelength] = '\0'; buf[namelength] = '\0';
DEPRECATED_SYMBOL_NAME (&psymbol) = bcache (buf, namelength + 1, objfile->psymbol_cache); DEPRECATED_SYMBOL_NAME (&psymbol) = deprecated_bcache (buf, namelength + 1,
objfile->psymbol_cache);
buf = alloca (dem_namelength + 1); buf = alloca (dem_namelength + 1);
memcpy (buf, dem_name, dem_namelength); memcpy (buf, dem_name, dem_namelength);
@ -2728,7 +2730,7 @@ add_psymbol_with_dem_name_to_list (char *name, int namelength, char *dem_name,
case language_c: case language_c:
case language_cplus: case language_cplus:
SYMBOL_CPLUS_DEMANGLED_NAME (&psymbol) = SYMBOL_CPLUS_DEMANGLED_NAME (&psymbol) =
bcache (buf, dem_namelength + 1, objfile->psymbol_cache); deprecated_bcache (buf, dem_namelength + 1, objfile->psymbol_cache);
break; break;
/* FIXME What should be done for the default case? Ignoring for now. */ /* FIXME What should be done for the default case? Ignoring for now. */
} }
@ -2749,7 +2751,8 @@ add_psymbol_with_dem_name_to_list (char *name, int namelength, char *dem_name,
SYMBOL_INIT_LANGUAGE_SPECIFIC (&psymbol, language); SYMBOL_INIT_LANGUAGE_SPECIFIC (&psymbol, language);
/* Stash the partial symbol away in the cache */ /* Stash the partial symbol away in the cache */
psym = bcache (&psymbol, sizeof (struct partial_symbol), objfile->psymbol_cache); psym = deprecated_bcache (&psymbol, sizeof (struct partial_symbol),
objfile->psymbol_cache);
/* Save pointer to partial symbol in psymtab, growing symtab if needed. */ /* Save pointer to partial symbol in psymtab, growing symtab if needed. */
if (list->next >= list->list + list->size) if (list->next >= list->list + list->size)