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

some code refactoring (inst_table -> inst_name_table)

This commit is contained in:
stefan schippers 2023-09-25 09:05:10 +02:00
parent 03003ab7bf
commit 6c7d7080b9
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions.c
View File

@ -938,7 +938,7 @@ void clear_drawing(void)
xctx->polygons[i] = 0; xctx->polygons[i] = 0;
} }
dbg(1, "clear drawing(): deleted data structures, now deleting hash\n"); dbg(1, "clear drawing(): deleted data structures, now deleting hash\n");
int_hash_free(&xctx->inst_table); int_hash_free(&xctx->inst_name_table);
int_hash_free(&xctx->floater_inst_table); int_hash_free(&xctx->floater_inst_table);
} }

2
src/editprop.c
View File

@ -631,7 +631,7 @@ char *strtoupper(char* s) {
return s; return s;
} }
/* call hash_all_names() (once) before (repeatedly) using this function */ /* caller should do hash_all_names() (once) before (repeatedly) using this function */
void set_inst_prop(int i) void set_inst_prop(int i)
{ {
char *ptr; char *ptr;

29
src/token.c
View File

@ -58,8 +58,8 @@ void hash_all_names(void)
{ {
int i; int i;
char *upinst = NULL, *type = NULL; char *upinst = NULL, *type = NULL;
int_hash_free(&xctx->inst_table); int_hash_free(&xctx->inst_name_table);
int_hash_init(&xctx->inst_table, HASHSIZE); int_hash_init(&xctx->inst_name_table, HASHSIZE);
for(i=0; i<xctx->instances; ++i) { for(i=0; i<xctx->instances; ++i) {
if(xctx->inst[i].instname && xctx->inst[i].instname[0]) { if(xctx->inst[i].instname && xctx->inst[i].instname[0]) {
if(xctx->inst[i].ptr == -1) continue; if(xctx->inst[i].ptr == -1) continue;
@ -67,7 +67,7 @@ void hash_all_names(void)
if(!type) continue; if(!type) continue;
my_strdup(_ALLOC_ID_, &upinst, xctx->inst[i].instname); my_strdup(_ALLOC_ID_, &upinst, xctx->inst[i].instname);
strtoupper(upinst); strtoupper(upinst);
int_hash_lookup(&xctx->inst_table, upinst, i, XINSERT); int_hash_lookup(&xctx->inst_name_table, upinst, i, XINSERT);
} }
} }
my_free(_ALLOC_ID_, &upinst); my_free(_ALLOC_ID_, &upinst);
@ -115,8 +115,8 @@ void check_unique_names(int rename)
clear_all_hilights(); clear_all_hilights();
draw(); draw();
} }
int_hash_free(&xctx->inst_table); int_hash_free(&xctx->inst_name_table);
int_hash_init(&xctx->inst_table, HASHSIZE); int_hash_init(&xctx->inst_name_table, HASHSIZE);
/* look for duplicates */ /* look for duplicates */
first = 1; first = 1;
@ -126,7 +126,8 @@ void check_unique_names(int rename)
if(!(xctx->inst[i].ptr+ xctx->sym)->type) continue; if(!(xctx->inst[i].ptr+ xctx->sym)->type) continue;
my_strdup(_ALLOC_ID_, &upinst, xctx->inst[i].instname); my_strdup(_ALLOC_ID_, &upinst, xctx->inst[i].instname);
strtoupper(upinst); strtoupper(upinst);
if( (entry = int_hash_lookup(&xctx->inst_table, upinst, i, XINSERT_NOREPLACE) ) && entry->value != i) { if( (entry = int_hash_lookup(&xctx->inst_name_table, upinst, i, XINSERT_NOREPLACE) ) &&
entry->value != i) {
dbg(0, "check_unique_names(): found duplicate: i=%d name=%s\n", i, xctx->inst[i].instname); dbg(0, "check_unique_names(): found duplicate: i=%d name=%s\n", i, xctx->inst[i].instname);
xctx->inst[i].color = -PINLAYER; xctx->inst[i].color = -PINLAYER;
inst_hilight_hash_lookup(i, -PINLAYER, XINSERT_NOREPLACE); inst_hilight_hash_lookup(i, -PINLAYER, XINSERT_NOREPLACE);
@ -147,14 +148,14 @@ void check_unique_names(int rename)
} /* for(i...) */ } /* for(i...) */
/* rename duplicates */ /* rename duplicates */
for(i=0;i<xctx->instances; ++i) { if(rename) for(i=0;i<xctx->instances; ++i) {
if( (xctx->inst[i].color != -10000) && rename) { if( (xctx->inst[i].color != -10000)) {
my_strdup(_ALLOC_ID_, &tmp, xctx->inst[i].prop_ptr); my_strdup(_ALLOC_ID_, &tmp, xctx->inst[i].prop_ptr);
new_prop_string(i, tmp, newpropcnt++, 0); new_prop_string(i, tmp, newpropcnt++, 0);
my_strdup(_ALLOC_ID_, &xctx->inst[i].instname, get_tok_value(xctx->inst[i].prop_ptr, "name", 0)); my_strdup(_ALLOC_ID_, &xctx->inst[i].instname, get_tok_value(xctx->inst[i].prop_ptr, "name", 0));
my_strdup(_ALLOC_ID_, &upinst, xctx->inst[i].instname); my_strdup(_ALLOC_ID_, &upinst, xctx->inst[i].instname);
strtoupper(upinst); strtoupper(upinst);
int_hash_lookup(&xctx->inst_table, upinst, i, XINSERT); int_hash_lookup(&xctx->inst_name_table, upinst, i, XINSERT);
symbol_bbox(i, &xctx->inst[i].x1, &xctx->inst[i].y1, &xctx->inst[i].x2, &xctx->inst[i].y2); symbol_bbox(i, &xctx->inst[i].x1, &xctx->inst[i].y1, &xctx->inst[i].x2, &xctx->inst[i].y2);
bbox(ADD, xctx->inst[i].x1, xctx->inst[i].y1, xctx->inst[i].x2, xctx->inst[i].y2); bbox(ADD, xctx->inst[i].x1, xctx->inst[i].y1, xctx->inst[i].x2, xctx->inst[i].y2);
my_free(_ALLOC_ID_, &tmp); my_free(_ALLOC_ID_, &tmp);
@ -168,7 +169,7 @@ void check_unique_names(int rename)
bbox(END,0.0,0.0,0.0,0.0); bbox(END,0.0,0.0,0.0,0.0);
} }
redraw_hilights(0); redraw_hilights(0);
int_hash_free(&xctx->inst_table); int_hash_free(&xctx->inst_name_table);
} }
int is_generator(const char *name) int is_generator(const char *name)
@ -771,11 +772,11 @@ void new_prop_string(int i, const char *old_prop, int fast, int dis_uniq_names)
xctx->prefix=old_name[0]; xctx->prefix=old_name[0];
/* don't change old_prop if name does not conflict. */ /* don't change old_prop if name does not conflict. */
/* if no hash_all_names() is done and inst_table uninitialized --> use old_prop */ /* if no hash_all_names() is done and inst_table uninitialized --> use old_prop */
if(dis_uniq_names || (entry = int_hash_lookup(&xctx->inst_table, up_old_name, i, XLOOKUP))==NULL || if(dis_uniq_names || (entry = int_hash_lookup(&xctx->inst_name_table, up_old_name, i, XLOOKUP))==NULL ||
entry->value == i) entry->value == i)
{ {
my_strdup(_ALLOC_ID_, &xctx->inst[i].prop_ptr, old_prop); my_strdup(_ALLOC_ID_, &xctx->inst[i].prop_ptr, old_prop);
int_hash_lookup(&xctx->inst_table, up_old_name, i, XINSERT); int_hash_lookup(&xctx->inst_name_table, up_old_name, i, XINSERT);
my_free(_ALLOC_ID_, &old_name); my_free(_ALLOC_ID_, &old_name);
my_free(_ALLOC_ID_, &up_old_name); my_free(_ALLOC_ID_, &up_old_name);
return; return;
@ -794,7 +795,7 @@ void new_prop_string(int i, const char *old_prop, int fast, int dis_uniq_names)
} }
my_strdup(_ALLOC_ID_, &up_new_name, new_name); my_strdup(_ALLOC_ID_, &up_new_name, new_name);
strtoupper(up_new_name); strtoupper(up_new_name);
if((entry = int_hash_lookup(&xctx->inst_table, up_new_name, i, XLOOKUP)) == NULL || entry->value == i) if((entry = int_hash_lookup(&xctx->inst_name_table, up_new_name, i, XLOOKUP)) == NULL || entry->value == i)
{ {
last[(int)xctx->prefix]=q+1; last[(int)xctx->prefix]=q+1;
break; break;
@ -804,7 +805,7 @@ void new_prop_string(int i, const char *old_prop, int fast, int dis_uniq_names)
tmp2 = subst_token(old_prop, "name", new_name); tmp2 = subst_token(old_prop, "name", new_name);
if(strcmp(tmp2, old_prop) ) { if(strcmp(tmp2, old_prop) ) {
my_strdup(_ALLOC_ID_, &xctx->inst[i].prop_ptr, tmp2); my_strdup(_ALLOC_ID_, &xctx->inst[i].prop_ptr, tmp2);
int_hash_lookup(&xctx->inst_table, up_new_name, i, XINSERT); /* reinsert in hash */ int_hash_lookup(&xctx->inst_name_table, up_new_name, i, XINSERT); /* reinsert in hash */
} }
my_free(_ALLOC_ID_, &old_name); my_free(_ALLOC_ID_, &old_name);
my_free(_ALLOC_ID_, &up_old_name); my_free(_ALLOC_ID_, &up_old_name);

4
src/xinit.c
View File

@ -506,8 +506,8 @@ static void alloc_xschem_data(const char *top_path, const char *win_path)
} }
} }
xctx->node_table = my_calloc(_ALLOC_ID_, HASHSIZE, sizeof(Node_hashentry *)); xctx->node_table = my_calloc(_ALLOC_ID_, HASHSIZE, sizeof(Node_hashentry *));
xctx->inst_table.table = NULL; xctx->inst_name_table.table = NULL;
xctx->inst_table.size = 0; xctx->inst_name_table.size = 0;
xctx->floater_inst_table.table = NULL; xctx->floater_inst_table.table = NULL;
xctx->floater_inst_table.size = 0; xctx->floater_inst_table.size = 0;
xctx->hilight_table = my_calloc(_ALLOC_ID_, HASHSIZE, sizeof(Hilight_hashentry *)); xctx->hilight_table = my_calloc(_ALLOC_ID_, HASHSIZE, sizeof(Hilight_hashentry *));

2
src/xschem.h
View File

@ -921,7 +921,7 @@ typedef struct {
int cur_undo_ptr; int cur_undo_ptr;
int tail_undo_ptr; int tail_undo_ptr;
int head_undo_ptr; int head_undo_ptr;
Int_hashtable inst_table; Int_hashtable inst_name_table;
Int_hashtable floater_inst_table; Int_hashtable floater_inst_table;
Node_hashentry **node_table; Node_hashentry **node_table;
Hilight_hashentry **hilight_table; Hilight_hashentry **hilight_table;