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

optimization in translate(): @spice_get_voltage will use the "lab" attribute (if existing) to build up the net name to look up in raw file, before reverting to a call to net_name() to get the net from the attached net

This commit is contained in:
Stefan Frederik 2022-10-15 08:55:32 +02:00
parent 1482279224
commit adf477fbcc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/save.c
View File

@ -3278,7 +3278,7 @@ int load_sym_def(const char *name, FILE *embed_fd)
read_line(lcc[level-1].fd, 0); /* discard any remaining characters till (but not including) newline */ read_line(lcc[level-1].fd, 0); /* discard any remaining characters till (but not including) newline */
else else
read_line(lcc[level].fd, 0); /* discard any remaining characters till (but not including) newline */ read_line(lcc[level].fd, 0); /* discard any remaining characters till (but not including) newline */
} } /* while(1) */
if(!embed_fd) { if(!embed_fd) {
dbg(1, "l_s_d(): fclose2, level=%d, fd=%p\n", level, lcc[0].fd); dbg(1, "l_s_d(): fclose2, level=%d, fd=%p\n", level, lcc[0].fd);
fclose(lcc[0].fd); fclose(lcc[0].fd);

6
src/token.c
View File

@ -2997,10 +2997,11 @@ const char *translate(int inst, const char* s)
if((start_level = sch_waves_loaded()) >= 0 && xctx->graph_annotate_p>=0) { if((start_level = sch_waves_loaded()) >= 0 && xctx->graph_annotate_p>=0) {
int multip; int multip;
int no_of_pins= (xctx->inst[inst].ptr + xctx->sym)->rects[PINLAYER]; int no_of_pins= (xctx->inst[inst].ptr + xctx->sym)->rects[PINLAYER];
const char *pin_prop_ptr = (xctx->inst[inst].ptr + xctx->sym)->rect[PINLAYER][0].prop_ptr;
if(no_of_pins == 1) { if(no_of_pins == 1) {
char *fqnet = NULL; char *fqnet = NULL;
const char *path = xctx->sch_path[xctx->currsch] + 1; const char *path = xctx->sch_path[xctx->currsch] + 1;
const char *net; const char *net = NULL;
size_t len; size_t len;
int idx; int idx;
double val; double val;
@ -3013,7 +3014,8 @@ const char *translate(int inst, const char* s)
path++; path++;
} }
prepare_netlist_structs(0); prepare_netlist_structs(0);
net = net_name(inst,0, &multip, 0, 0); if(pin_prop_ptr) net = get_tok_value(pin_prop_ptr, "lab", 0);
if(net == 0 || net[0] == '\0') net = net_name(inst,0, &multip, 0, 0);
len = strlen(path) + strlen(net) + 1; len = strlen(path) + strlen(net) + 1;
dbg(1, "net=%s\n", net); dbg(1, "net=%s\n", net);
fqnet = my_malloc(1548, len); fqnet = my_malloc(1548, len);