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

update xschemtest hashes, uniquify allocation IDs

This commit is contained in:
Stefan Frederik 2022-10-16 14:21:22 +02:00
parent 91ba5fd1d3
commit e8b2385f24
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/get_malloc_id.awk
View File

@ -64,6 +64,6 @@ xinit.c \
prev = $1
}
END{
print ">>>>>>>>>>> FREE >>>>>>>>> " n " ..."
print ">>>>>>> END FREE >>>>>>>>> " prev + 1 " ..."
}
'

8
src/save.c
View File

@ -3112,16 +3112,16 @@ int load_sym_def(const char *name, FILE *embed_fd)
int i;
for(i = 1; i <level; i++) {
const char *instname = get_tok_value(lcc[i].prop_ptr, "name", 0);
my_strcat(1582, &path, instname);
my_strcat(1588, &path, ".");
my_strcat(1590, &path, instname);
my_strcat(1591, &path, ".");
}
}
if(path) new_size += strlen(path);
dev = get_tok_value(prop_ptr, "name", 0);
new_size += xctx->tok_size + 21; /* @spice_get_current(<dev>) */
my_realloc(1587, &tt[i].txt_ptr, new_size);
my_realloc(1592, &tt[i].txt_ptr, new_size);
my_snprintf(tt[i].txt_ptr, new_size, "@spice_get_current(%s%s)", path ? path : "", dev);
my_free(1589, &path);
my_free(1593, &path);
dbg(1, " --> tt[i].txt_ptr=%s\n", tt[i].txt_ptr);
}
ROTATION(rot, flip, 0.0, 0.0, tt[i].x0, tt[i].y0, rx1, ry1);

8
src/token.c
View File

@ -3119,14 +3119,14 @@ const char *translate(int inst, const char* s)
if(*path == '.') skip++;
path++;
}
dev = my_malloc(1550, tmp);
dev = my_malloc(1598, tmp);
n = sscanf(token + 19, "%[^)]", dev);
if(n == 1) {
strtolower(dev);
len = strlen(path) + strlen(xctx->inst[inst].instname) +
strlen(dev) + 11; /* some extra chars for i(..) wrapper */
dbg(1, "dev=%s\n", dev);
fqdev = my_malloc(1556, len);
fqdev = my_malloc(1599, len);
if(!sim_is_xyce) {
int prefix, vsource;
char *ptr = dev;
@ -3163,9 +3163,9 @@ const char *translate(int inst, const char* s)
result_pos += len;
}
dbg(1, "inst %d, dev=%s, fqdev=%s idx=%d valstr=%s\n", inst, dev, fqdev, idx, valstr);
my_free(1557, &fqdev);
my_free(1600, &fqdev);
} /* if(n == 1) */
my_free(1551, &dev);
my_free(1601, &dev);
} /* if(path) */
} /* if((start_level = sch_waves_loaded()) >= 0 && xctx->graph_annotate_p>=0) */
}

2
tests/xschemtest.tcl
View File

@ -196,7 +196,7 @@ proc netlist_test {} {
loading.sch vhdl 3300682141
mos_power_ampli.sch spice 1004049459
hierarchical_tedax.sch tedax 998070173
LCC_instances.sch spice 2610855064
LCC_instances.sch spice 268038818
pcb_test1.sch tedax 1925087189
test_doublepin.sch spice 64707104
simulate_ff.sch spice 1321596936