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

allow parametric models in subcircuits. Symbol inv.sym contains template="... modp=cmos_p_10 ...", pmos instance in inv.sch contains model=@modp, instance format string contains format="@name @pinlist @model w=@w l=@l, result is: "m2 y a VCCPIN VCCPIN cmos_p_10 w=wp l=lp"

This commit is contained in:
stefan schippers 2024-02-03 13:43:18 +01:00
parent 7bfed5907c
commit 8ec3e52122
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions.c
View File

@ -2218,6 +2218,8 @@ void go_back(int confirm) /* 20171006 add confirm */
xctx->sch_path_hash[xctx->currsch] = 0;
xctx->currsch--;
my_free(_ALLOC_ID_, &xctx->hier_attr[xctx->currsch].prop_ptr);
my_free(_ALLOC_ID_, &xctx->hier_attr[xctx->currsch].templ);
save_modified = xctx->modified; /* we propagate modified flag (cleared by load_schematic */
/* by default) to parent schematic if going back from embedded symbol */

12
src/spice_netlist.c
View File

@ -434,6 +434,17 @@ int global_spice_netlist(int global) /* netlister driver */
if(xctx->sym[i].flags & (SPICE_IGNORE | SPICE_SHORT)) continue;
if(lvs_ignore && (xctx->sym[i].flags & LVS_IGNORE)) continue;
if(!xctx->sym[i].type) continue;
/* normally empty, if not raise a warning... */
if(xctx->hier_attr[xctx->currsch - 1].templ) {
dbg(0, "xctx->hier_attr[xctx->currsch - 1].templ not empty: %s\n",
xctx->hier_attr[xctx->currsch - 1].templ);
}
/* store parent symbol template attr (before descending into it)
* to resolve subschematic instances with model=@modp in format string,
* modp will be first looked up in instance prop_ptr string, and if not found
* in parent symbol template string */
my_strdup(_ALLOC_ID_, &xctx->hier_attr[xctx->currsch - 1].templ,
get_tok_value(xctx->sym[i].prop_ptr, "template", 0));
my_strdup(_ALLOC_ID_, &abs_path, abs_sym_path(xctx->sym[i].name, ""));
if(strcmp(xctx->sym[i].type,"subcircuit")==0 && check_lib(1, abs_path))
{
@ -459,6 +470,7 @@ int global_spice_netlist(int global) /* netlister driver */
err |= spice_block_netlist(fd, i);
}
}
my_free(_ALLOC_ID_, &xctx->hier_attr[xctx->currsch - 1].templ);
}
my_free(_ALLOC_ID_, &abs_path);
/* get_additional_symbols(0); */

22
src/token.c
View File

@ -2148,16 +2148,36 @@ int print_spice_element(FILE *fd, int inst)
value=NULL;
} else {
size_t tok_val_len;
size_t tok_size;
dbg(1, "print_spice_element(): token: |%s|\n", token);
my_strdup2(_ALLOC_ID_, &val, get_tok_value(xctx->inst[inst].prop_ptr, token+1, 0));
tok_size = xctx->tok_size;
value = val;
if(!strcmp(token + 1, "model") && strchr(value, '@')) value = translate(inst, val);
if(!strcmp(token + 1, "model") && strchr(value, '@')) {
value = translate(inst, val);
/* Symbol format string contains model=@modp,
* instance attributes does not contain a modp=xxx,
* look up modp in **parent** symbol template attribute */
if(value[0] == '\0') {
value=get_tok_value(xctx->hier_attr[xctx->currsch - 1].templ, val+1, 0);
}
}
else if(val[0] == '@' && !strpbrk(value + 1, "@ ")) {
/* value = translate(inst, val); */
value = get_tok_value(xctx->inst[inst].prop_ptr, val + 1, 0);
dbg(1, "val=%s, tok=%s, value=%s template=%s\n",
val, token, value, xctx->hier_attr[xctx->currsch - 1].templ);
if(value[0] == '\0') {
value=get_tok_value(xctx->hier_attr[xctx->currsch - 1].templ, val+1, 0);
}
}
tok_val_len = strlen(value);
if(!strcmp(token, "@spiceprefix")) {
my_realloc(_ALLOC_ID_, &spiceprefixtag, tok_val_len+22);
my_snprintf(spiceprefixtag, tok_val_len+22, "**** spice_prefix %s\n", value);
value = spiceprefixtag;
}
xctx->tok_size = tok_size;
/* xctx->tok_size==0 indicates that token(+1) does not exist in instance attributes */
if (!xctx->tok_size) value=get_tok_value(template, token+1, 0);