Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

gdb: turn gdb::bcache's function pointers into virtual methods

Browse Source 
The two function pointers optionally passed to gdb::bcache are very good
candidates to be turned into virtual methods, this patch does that in
the most straightforward / unsurprising way.

gdb/ChangeLog:

	* bcache.h (struct bcache) <bcache>: Remove constructor.
	<m_hash_function, m_compare_function>: Remove.
	<~bcache>: Make virtual.
	<compare>: Remove static method, introduce virtual method.
	<default_hash>: Remove.
	<hash>: New virtual method.
	* bcache.c (bcache::expand_hash_table): Update.
	(bcache::insert): Update.
	(bcache::hash): New.
	(bcache::compare): Update comment and parameter names.
	* gdbtypes.c (types_deeply_equal): Update.
	* psymtab.h (struct psymbol_bcache): New struct.
	(class psymtab_storage) <psymtab_storage>: Make default.
	<psymbol_cache>: Change type to psymbol_bcache.
	* psymtab.c (psymtab_storage::psymtab_storage): Remove.
	(psymbol_hash): Change to...
	(psymbol_bcache::hash): ... this.
	(psymbol_compare): Change to...
	(psymbol_bcache::compare): ... this.

Change-Id: I41d578e61de8ac1163461a28fbd220d1f855e372
This commit is contained in:
Simon Marchi
2020-09-14 14:02:30 -04:00
committed by Simon Marchi
parent 2ddc8f011a
commit 8980662640
6 changed files with 72 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gdb/bcache.c
View File

@@ -113,7 +113,7 @@ bcache::expand_hash_table ()
struct bstring **new_bucket;
next = s->next;
new_bucket = &new_buckets[(m_hash_function (&s->d.data, s->length)
new_bucket = &new_buckets[(this->hash (&s->d.data, s->length)
% new_num_buckets)];
s->next = *new_bucket;
*new_bucket = s;
@@ -167,7 +167,7 @@ bcache::insert (const void *addr, int length, bool *added)
m_total_count++;
m_total_size += length;
full_hash = m_hash_function (addr, length);
full_hash = this->hash (addr, length);
half_hash = (full_hash >> 16);
hash_index = full_hash % m_num_buckets;
@@ -180,7 +180,7 @@ bcache::insert (const void *addr, int length, bool *added)
if (s->half_hash == half_hash)
{
if (s->length == length
&& m_compare_function (&s->d.data, addr, length))
&& this->compare (&s->d.data, addr, length))
return &s->d.data;
else
m_half_hash_miss_count++;
@@ -211,13 +211,20 @@ bcache::insert (const void *addr, int length, bool *added)
}
/* Compare the byte string at ADDR1 of lenght LENGHT to the
string at ADDR2. Return 1 if they are equal. */
/* See bcache.h. */
unsigned long
bcache::hash (const void *addr, int length)
{
return fast_hash (addr, length, 0);
}
/* See bcache.h. */
int
bcache::compare (const void *addr1, const void *addr2, int length)
bcache::compare (const void *left, const void *right, int length)
{
return memcmp (addr1, addr2, length) == 0;
return memcmp (left, right, length) == 0;
}
/* Free all the storage associated with BCACHE. */