luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

eliminated duplicated string hash functions

This commit is contained in:
Stefan Frederik 2021-10-31 13:35:06 +01:00
parent 1fa2486e44
commit 52c508423e
5 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hilight.c
View File

@ -24,7 +24,7 @@
static unsigned int hi_hash(const char *tok)
{
register unsigned int hash = 0;
register unsigned int hash = 14057;
register char *str;
register int c;

13
src/node_hash.c
View File

@ -22,17 +22,6 @@
#include "xschem.h"
static unsigned int nh_hash(const char *tok)
{
register unsigned int hash = 0;
register int c;
while ( (c = *tok++) )
hash = c + hash * 65599;
return hash;
}
struct node_hashentry **get_node_table_ptr(void)
{
return xctx->node_table;
@ -226,7 +215,7 @@ struct node_hashentry *node_hash_lookup(const char *token, const char *dir,int w
else if(!strcmp(dir,"out") ) d.out=1;
else if(!strcmp(dir,"inout") ) d.inout=1;
d.port=port;
hashcode=nh_hash(token);
hashcode=str_hash(token);
index=hashcode % HASHSIZE;
entry=xctx->node_table[index];
preventry=&xctx->node_table[index];

12
src/spice_netlist.c
View File

@ -549,18 +549,6 @@ void spice_netlist(FILE *fd, int spice_stop )
if(!spice_stop && !xctx->netlist_count) redraw_hilights(0); /* draw_hilight_net(1); */
}
/* calculate the hash function relative to string s */
static unsigned int str_hash(const char *tok)
{
unsigned int hash = 0;
int c;
while ( (c = *tok++) )
hash = c + (hash << 6) + (hash << 16) - hash;
return hash;
}
/* GENERIC PURPOSE HASH TABLE */

7
src/token.c
View File

@ -36,10 +36,9 @@ static struct inst_hashentry *table[HASHSIZE];
enum status {TOK_BEGIN, TOK_TOKEN, TOK_SEP, TOK_VALUE, TOK_END, TOK_ENDTOK};
/* calculate the hash function relative to string s */
static unsigned int hash(char *tok)
unsigned int str_hash(const char *tok)
{
register unsigned int hash = 0;
register unsigned int hash = 14057;
register int c;
while ( (c = *tok++) )
@ -84,7 +83,7 @@ static struct inst_hashentry *inst_hash_lookup(struct inst_hashentry **table, ch
int s;
if(token==NULL) return NULL;
hashcode=hash(token);
hashcode=str_hash(token);
idx=hashcode % HASHSIZE;
entry=table[idx];
preventry=&table[idx];

1
src/xschem.h
View File

@ -1058,6 +1058,7 @@ extern void check_unique_names(int rename);
extern void clear_instance_hash();
extern unsigned int str_hash(const char *tok);
extern void free_hash(struct hashentry **table);
extern struct hashentry *str_hash_lookup(struct hashentry **table, const char *token, const char *value, int what);
extern void free_int_hash(struct int_hashentry **table);