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

simplified hash table lookup functions (indirect pointer)

This commit is contained in:
stefan schippers 2024-10-14 14:39:22 +02:00
parent e4d9594065
commit c0474a139d
3 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/hilight.c
View File

@ -78,19 +78,19 @@ static Hilight_hashentry *hilight_hash_lookup(const char *token, int value, int
*/
{
unsigned int hashcode, index;
Hilight_hashentry *entry, *saveptr, **preventry;
Hilight_hashentry **preventry;
int s ;
if(token==NULL) return NULL;
hashcode=hi_hash(token);
index=hashcode % HASHSIZE;
preventry=&xctx->hilight_table[index];
entry=*preventry;
while(1) {
if( !entry ) { /* empty slot */
if( !(*preventry) ) { /* empty slot */
size_t lent = strlen(token) + 1;
size_t lenp = strlen(xctx->sch_path[xctx->currsch]) + 1;
if( what==XINSERT || what == XINSERT_NOREPLACE) { /* insert data */
Hilight_hashentry *entry;
s=sizeof( Hilight_hashentry );
entry= (Hilight_hashentry *)my_malloc(_ALLOC_ID_, s );
entry->next = NULL;
@ -107,23 +107,23 @@ static Hilight_hashentry *hilight_hash_lookup(const char *token, int value, int
}
return NULL; /* whether inserted or not return NULL since it was not in */
}
if( entry -> hash==hashcode && !strcmp(token,entry->token) &&
!strcmp(xctx->sch_path[xctx->currsch], entry->path) ) { /* found matching tok */
if( (*preventry) -> hash==hashcode && !strcmp(token,(*preventry)->token) &&
!strcmp(xctx->sch_path[xctx->currsch], (*preventry)->path) ) { /* found matching tok */
if(what==XDELETE) { /* remove token from the hash table ... */
saveptr=entry->next;
my_free(_ALLOC_ID_, &entry->token);
my_free(_ALLOC_ID_, &entry->path);
my_free(_ALLOC_ID_, &entry);
Hilight_hashentry *saveptr;
saveptr=(*preventry)->next;
my_free(_ALLOC_ID_, &(*preventry)->token);
my_free(_ALLOC_ID_, &(*preventry)->path);
my_free(_ALLOC_ID_, &(*preventry));
*preventry=saveptr;
} else if(what == XINSERT ) {
entry->oldvalue = entry->value;
entry->value = value;
entry->time=xctx->hilight_time;
(*preventry)->oldvalue =(*preventry)->value;
(*preventry)->value = value;
(*preventry)->time=xctx->hilight_time;
}
return entry; /* found matching entry, return the address */
return (*preventry); /* found matching entry, return the address */
}
preventry=&entry->next; /* descend into the list. */
entry = entry->next;
preventry=&(*preventry)->next; /* descend into the list. */
}
}

14
src/node_hash.c
View File

@ -34,7 +34,7 @@ static Node_hashentry *node_hash_lookup(const char *token, const char *dir,int w
* "whatever" whatever 1,XLOOKUP only look up element, dont insert */
{
unsigned int hashcode, index;
Node_hashentry *entry, *saveptr, **preventry;
Node_hashentry **preventry;
int s ;
Drivers d;
@ -51,13 +51,13 @@ static Node_hashentry *node_hash_lookup(const char *token, const char *dir,int w
hashcode=str_hash(token);
index=hashcode % HASHSIZE;
preventry=&xctx->node_table[index];
entry=*preventry;
while(1)
{
if( !entry ) /* empty slot */
if( !(*preventry) ) /* empty slot */
{
if( what==XINSERT ) /* insert data */
{
Node_hashentry *entry;
s=sizeof( Node_hashentry );
entry=(Node_hashentry *)my_malloc(_ALLOC_ID_, s);
entry->next = NULL;
@ -82,11 +82,11 @@ static Node_hashentry *node_hash_lookup(const char *token, const char *dir,int w
}
return NULL; /* whether inserted or not return NULL since it was not in */
}
if( entry -> hash==hashcode && strcmp(token,entry->token)==0 ) /* found matching tok */
if( (*preventry) -> hash==hashcode && strcmp(token,(*preventry)->token)==0 ) /* found matching tok */
{
if(what==XDELETE) /* remove token from the hash table ... */
{
saveptr=entry->next;
Node_hashentry *saveptr=(*preventry)->next, *entry = *preventry;
my_free(_ALLOC_ID_, &entry->token);
my_free(_ALLOC_ID_, &entry->verilog_type);
my_free(_ALLOC_ID_, &entry->sig_type);
@ -99,6 +99,7 @@ static Node_hashentry *node_hash_lookup(const char *token, const char *dir,int w
}
else /* found matching entry, return the address and update in/out count */
{
Node_hashentry *entry = *preventry;
entry->d.port+=port;
entry->d.in+=d.in;
entry->d.out+=d.out;
@ -114,8 +115,7 @@ static Node_hashentry *node_hash_lookup(const char *token, const char *dir,int w
return entry;
}
}
preventry=&entry->next; /* descend into the list. */
entry = entry->next;
preventry=&(*preventry)->next; /* descend into the list. */
}
}

68
src/spice_netlist.c
View File

@ -712,7 +712,7 @@ int spice_block_netlist(FILE *fd, int i)
Str_hashentry *str_hash_lookup(Str_hashtable *hashtable, const char *token, const char *value, int what)
{
unsigned int hashcode, idx;
Str_hashentry *entry, *saveptr, **preventry;
Str_hashentry **preventry;
int s ;
int size = hashtable->size;
Str_hashentry **table = hashtable->table;
@ -721,13 +721,13 @@ Str_hashentry *str_hash_lookup(Str_hashtable *hashtable, const char *token, cons
hashcode=str_hash(token);
idx=hashcode % size;
preventry=&table[idx];
entry=*preventry;
while(1)
{
if( !entry ) /* empty slot */
if( !(*preventry) ) /* empty slot */
{
if(what==XINSERT || what == XINSERT_NOREPLACE) /* insert data */
{
Str_hashentry *entry;
s=sizeof( Str_hashentry );
entry=(Str_hashentry *)my_malloc(_ALLOC_ID_, s);
entry->next=NULL;
@ -740,23 +740,23 @@ Str_hashentry *str_hash_lookup(Str_hashtable *hashtable, const char *token, cons
}
return NULL; /* if element inserted return NULL since it was not in table */
}
if( entry -> hash==hashcode && strcmp(token,entry->token)==0 ) /* found a matching token */
if( (*preventry) -> hash==hashcode && strcmp(token,(*preventry)->token)==0 ) /* found a matching token */
{
if(what==XDELETE) /* remove token from the hash table ... */
{
saveptr=entry->next;
my_free(_ALLOC_ID_, &entry->token);
my_free(_ALLOC_ID_, &entry->value);
my_free(_ALLOC_ID_, &entry);
Str_hashentry *saveptr;
saveptr=(*preventry)->next;
my_free(_ALLOC_ID_, &(*preventry)->token);
my_free(_ALLOC_ID_, &(*preventry)->value);
my_free(_ALLOC_ID_, &(*preventry));
*preventry=saveptr;
}
else if(value && what == XINSERT ) {
my_strdup2(_ALLOC_ID_, &entry->value, value);
my_strdup2(_ALLOC_ID_, &(*preventry)->value, value);
}
return entry; /* found matching entry, return the address */
return (*preventry); /* found matching entry, return the address */
}
preventry=&entry->next; /* descend into the list. */
entry = entry->next;
preventry=&(*preventry)->next; /* descend into the list. */
}
}
@ -813,7 +813,7 @@ void str_hash_free(Str_hashtable *hashtable)
Int_hashentry *int_hash_lookup(Int_hashtable *hashtable, const char *token, const int value, int what)
{
unsigned int hashcode, idx;
Int_hashentry *entry, *saveptr, **preventry;
Int_hashentry **preventry;
int s ;
int size = hashtable->size;
Int_hashentry **table = hashtable->table;
@ -822,13 +822,13 @@ Int_hashentry *int_hash_lookup(Int_hashtable *hashtable, const char *token, cons
hashcode=str_hash(token);
idx=hashcode % size;
preventry=&table[idx];
entry=*preventry;
while(1)
{
if( !entry ) /* empty slot */
if( !(*preventry) ) /* empty slot */
{
if(what==XINSERT || what == XINSERT_NOREPLACE) /* insert data */
{
Int_hashentry *entry;
s=sizeof( Int_hashentry );
entry=(Int_hashentry *)my_malloc(_ALLOC_ID_, s);
entry->next=NULL;
@ -840,22 +840,22 @@ Int_hashentry *int_hash_lookup(Int_hashtable *hashtable, const char *token, cons
}
return NULL; /* if element inserted return NULL since it was not in table */
}
if( entry -> hash==hashcode && strcmp(token,entry->token)==0 ) /* found a matching token */
if( (*preventry) -> hash==hashcode && strcmp(token,(*preventry)->token)==0 ) /* found a matching token */
{
if(what==XDELETE) /* remove token from the hash table ... */
{
saveptr=entry->next;
my_free(_ALLOC_ID_, &entry->token);
my_free(_ALLOC_ID_, &entry);
Int_hashentry *saveptr;
saveptr=(*preventry)->next;
my_free(_ALLOC_ID_, &(*preventry)->token);
my_free(_ALLOC_ID_, &(*preventry));
*preventry=saveptr;
}
else if(what == XINSERT ) {
entry->value = value;
(*preventry)->value = value;
}
return entry; /* found matching entry, return the address */
return *preventry; /* found matching entry, return the address */
}
preventry=&entry->next; /* descend into the list. */
entry = entry->next;
preventry=&(*preventry)->next; /* descend into the list. */
}
}
@ -913,7 +913,7 @@ void int_hash_free(Int_hashtable *hashtable)
Ptr_hashentry *ptr_hash_lookup(Ptr_hashtable *hashtable, const char *token, void *const value, int what)
{
unsigned int hashcode, idx;
Ptr_hashentry *entry, *saveptr, **preventry;
Ptr_hashentry **preventry;
int s ;
int size = hashtable->size;
Ptr_hashentry **table = hashtable->table;
@ -922,13 +922,13 @@ Ptr_hashentry *ptr_hash_lookup(Ptr_hashtable *hashtable, const char *token, void
hashcode=str_hash(token);
idx=hashcode % size;
preventry=&table[idx];
entry=*preventry;
while(1)
{
if( !entry ) /* empty slot */
if( !(*preventry) ) /* empty slot */
{
if(what==XINSERT || what == XINSERT_NOREPLACE) /* insert data */
{
Ptr_hashentry *entry;
s=sizeof( Ptr_hashentry );
entry=(Ptr_hashentry *)my_malloc(_ALLOC_ID_, s);
entry->next=NULL;
@ -940,22 +940,22 @@ Ptr_hashentry *ptr_hash_lookup(Ptr_hashtable *hashtable, const char *token, void
}
return NULL; /* if element inserted return NULL since it was not in table */
}
if( entry -> hash==hashcode && strcmp(token,entry->token)==0 ) /* found a matching token */
if( (*preventry) -> hash==hashcode && strcmp(token,(*preventry)->token)==0 ) /* found a matching token */
{
if(what==XDELETE) /* remove token from the hash table ... */
{
saveptr=entry->next;
my_free(_ALLOC_ID_, &entry->token);
my_free(_ALLOC_ID_, &entry);
Ptr_hashentry *saveptr;
saveptr=(*preventry)->next;
my_free(_ALLOC_ID_, &(*preventry)->token);
my_free(_ALLOC_ID_, &(*preventry));
*preventry=saveptr;
}
else if(what == XINSERT ) {
entry->value = value;
(*preventry)->value = value;
}
return entry; /* found matching entry, return the address */
return (*preventry); /* found matching entry, return the address */
}
preventry=&entry->next; /* descend into the list. */
entry = entry->next;
preventry=&(*preventry)->next; /* descend into the list. */
}
}