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

pass @device_model in symbols through translate() if it contains @xxx tokens

This commit is contained in:
stefan schippers 2024-02-11 11:47:13 +01:00
parent b3daf97cc4
commit 531a9c168c
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/spice_netlist.c
View File

@ -222,7 +222,10 @@ static int spice_netlist(FILE *fd, int spice_stop )
if(strchr(val, '@')) m = translate(i, val);
if(m[0]) str_hash_lookup(&model_table, model_name(m), m, XINSERT);
else {
m = get_tok_value( (xctx->inst[i].ptr+ xctx->sym)->prop_ptr, "device_model", 0);
my_strdup2(_ALLOC_ID_, &val,
get_tok_value( (xctx->inst[i].ptr+ xctx->sym)->prop_ptr, "device_model", 2));
m = val;
if(strchr(val, '@')) m = translate(i, val);
if(m[0]) str_hash_lookup(&model_table, model_name(m), m, XINSERT);
}
my_free(_ALLOC_ID_, &model_name_result);

27
src/token.c
View File

@ -1000,12 +1000,6 @@ static void print_vhdl_primitive(FILE *fd, int inst) /* netlist primitives, 200
}
else my_mstrcat(_ALLOC_ID_, &result, value, NULL);
}
#if 0 /* Disabled: no hierarchy traversal while netlisting */
else if(strcmp(token,"@path")==0)
{
my_mstrcat(_ALLOC_ID_, &result, xctx->sch_path[xctx->currsch] + 1, NULL);
}
#endif
else if(strcmp(token,"@symref")==0)
{
const char *s = get_sym_name(inst, 9999, 1);
@ -2237,15 +2231,6 @@ int print_spice_element(FILE *fd, int inst)
/* fputs(value,fd); */
}
}
#if 0 /* Disabled: no hierarchy traversal while netlisting */
else if (strcmp(token,"@path")==0) /* of course path must not be present in attributes */
{
const char *s = xctx->sch_path[xctx->currsch] + 1;
/* result_pos += my_snprintf(result + result_pos, tmp, "%s", s); */
my_mstrcat(_ALLOC_ID_, &result, s, NULL);
/* fputs(s,fd); */
}
#endif
else if(strcmp(token,"@symref")==0)
{
const char *s = get_sym_name(inst, 9999, 1);
@ -2671,12 +2656,6 @@ void print_tedax_element(FILE *fd, int inst)
{
fputs(value,fd);
}
#if 0 /* Disabled: no hierarchy traversal while netlisting */
else if(strcmp(token,"@path")==0)
{
fputs(xctx->sch_path[xctx->currsch] + 1, fd);
}
#endif
else if(strcmp(token,"@symref")==0)
{
const char *s = get_sym_name(inst, 9999, 1);
@ -2939,12 +2918,6 @@ static void print_verilog_primitive(FILE *fd, int inst) /* netlist switch level
}
else my_mstrcat(_ALLOC_ID_, &result, value, NULL);
}
#if 0 /* Disabled: no hierarchy traversal while netlisting */
else if(strcmp(token,"@path")==0)
{
my_mstrcat(_ALLOC_ID_, &result, xctx->sch_path[xctx->currsch] + 1, NULL);
}
#endif
else if(strcmp(token,"@symref")==0)
{
const char *s = get_sym_name(inst, 9999, 1);