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

separated @#pin:attr handling in translate() into *get_pin_attr(), replaced sscanf() with dedicated get_pin_and_attr() so we are able to handle stuff like "@#ADD[7:0]:net_name"

This commit is contained in:
stefan schippers 2023-06-16 10:55:22 +02:00
parent a752bb099b
commit 3c16c4bf20
4 changed files with 2099 additions and 2035 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3872
XSchemWin/XSchemWix/heat_xschem_library.wxs
View File

File diff suppressed because it is too large Load Diff

8
XSchemWin/XSchemWix/xschem_library.wxs
View File

@ -4855,6 +4855,12 @@
<Component Id="cmp192C74207CA975756F65616672478110" Guid="{3706C5AD-C104-494A-B664-DEB07667A8B3}"> <Component Id="cmp192C74207CA975756F65616672478110" Guid="{3706C5AD-C104-494A-B664-DEB07667A8B3}">
<File Id="filF6591742485594FADE7363F8CB7C10F7" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\inst_sch_select\comp_65nm_parax.sch" /> <File Id="filF6591742485594FADE7363F8CB7C10F7" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\inst_sch_select\comp_65nm_parax.sch" />
</Component> </Component>
<Component Id="cmp2EA52751158DBB689A9A03A9D3094EB3" Guid="{CA754177-CB2B-4639-9DEC-D5F08BCE9052}">
<File Id="filA6F9E299A8A8FAA10A2F89366D418D56" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\inst_sch_select\comp_65nm_read.cir" />
</Component>
<Component Id="cmp106813C0BB3FE64D6E9D5FC6CDC1FF92" Guid="{7AE49B47-B1C0-4E7C-BB79-B0658CEB5662}">
<File Id="fil6B1B3D42E84BBF6F3073C22FE296B9B4" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\inst_sch_select\comp_65nm_read.sym" />
</Component>
<Component Id="cmp8907B142997C1E0613C32A1C536C5122" Guid="{955C050B-2D41-42AC-A988-92A33E682F4E}"> <Component Id="cmp8907B142997C1E0613C32A1C536C5122" Guid="{955C050B-2D41-42AC-A988-92A33E682F4E}">
<File Id="fil31820620336E6D619A3D1A05DBB16AB7" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\inst_sch_select\inst_sch_select.sch" /> <File Id="fil31820620336E6D619A3D1A05DBB16AB7" KeyPath="yes" Source="$(var.xschemLibrarySrcDir)\inst_sch_select\inst_sch_select.sch" />
</Component> </Component>
@ -7150,6 +7156,8 @@
<ComponentRef Id="cmp9F68EB0D01C258AFF8A160616F017CC6" /> <ComponentRef Id="cmp9F68EB0D01C258AFF8A160616F017CC6" />
<ComponentRef Id="cmpC49759288BFBD4977B75C3C2666BFB1A" /> <ComponentRef Id="cmpC49759288BFBD4977B75C3C2666BFB1A" />
<ComponentRef Id="cmp192C74207CA975756F65616672478110" /> <ComponentRef Id="cmp192C74207CA975756F65616672478110" />
<ComponentRef Id="cmp2EA52751158DBB689A9A03A9D3094EB3" />
<ComponentRef Id="cmp106813C0BB3FE64D6E9D5FC6CDC1FF92" />
<ComponentRef Id="cmp8907B142997C1E0613C32A1C536C5122" /> <ComponentRef Id="cmp8907B142997C1E0613C32A1C536C5122" />
<ComponentRef Id="cmp17EC96974E9D7222C8BAD002E8B6A792" /> <ComponentRef Id="cmp17EC96974E9D7222C8BAD002E8B6A792" />
<ComponentRef Id="cmp9B1CE895DCA915D6CEFBA5A5D4D37400" /> <ComponentRef Id="cmp9B1CE895DCA915D6CEFBA5A5D4D37400" />

253
src/token.c
View File

@ -445,6 +445,37 @@ const char *list_tokens(const char *s, int with_quotes)
} }
} }
/* given @#ADD[3:0]:net_name return ADD[3:0] in pin_num_or_name and net_name in pin_attr */
static void get_pin_and_attr(const char *token, char **pin_num_or_name, char **pin_attr)
{
const char *p = token + 2;
int bracket = 0, done = 0;
const char *colon = strchr(token + 2, ':');
while(colon && *p) {
if(*p == '[') bracket = 1;
if(*p == ':' && !bracket) {
/* 01234567890123456
* @#A[3:0]:net_name */
*pin_num_or_name = my_malloc(_ALLOC_ID_, p - token - 1);
memcpy(*pin_num_or_name, token + 2, p - token - 2);
(*pin_num_or_name)[p - token - 2] = '\0';
my_strdup2(_ALLOC_ID_, pin_attr, p + 1);
done = 1;
break;
}
if(*p == ']') bracket = 0;
p++;
}
if(!done) {
my_strdup2(_ALLOC_ID_, pin_num_or_name, token + 2);
my_strdup2(_ALLOC_ID_, pin_attr, "");
}
dbg(1, "get_pin_and_attr(): token=%s, name=%s, attr=%s\n", token,
*pin_num_or_name ? *pin_num_or_name : "NULL",
*pin_attr ? *pin_attr: "NULL");
}
/* state machine that parses a string made up of <token>=<value> ... */ /* state machine that parses a string made up of <token>=<value> ... */
/* couples and returns the value of the given token */ /* couples and returns the value of the given token */
/* if s==NULL or no match return empty string */ /* if s==NULL or no match return empty string */
@ -951,13 +982,13 @@ static void print_vhdl_primitive(FILE *fd, int inst) /* netlist primitives, 200
* @#0, @#1:net_name, @#2:name, ... */ * @#0, @#1:net_name, @#2:name, ... */
else if(token[0]=='@' && token[1]=='#') { else if(token[0]=='@' && token[1]=='#') {
int n; int n;
char *pin_attr = my_malloc(_ALLOC_ID_, sizetok * sizeof(char)); char *pin_attr = my_malloc(_ALLOC_ID_, sizeof(char));
char *pin_num_or_name = my_malloc(_ALLOC_ID_, sizetok * sizeof(char)); char *pin_num_or_name = my_malloc(_ALLOC_ID_, sizeof(char));
pin_num_or_name[0]='\0'; pin_num_or_name[0]='\0';
pin_attr[0]='\0'; pin_attr[0]='\0';
n=-1; n=-1;
sscanf(token+2, "%[^:]:%[^:]", pin_num_or_name, pin_attr); get_pin_and_attr(token, &pin_num_or_name, &pin_attr);
if(isonlydigit(pin_num_or_name)) { if(isonlydigit(pin_num_or_name)) {
n = atoi(pin_num_or_name); n = atoi(pin_num_or_name);
} }
@ -2052,13 +2083,13 @@ int print_spice_element(FILE *fd, int inst)
* @#0, @#1:net_name, @#2:name, ... */ * @#0, @#1:net_name, @#2:name, ... */
else if(token[0]=='@' && token[1]=='#') { else if(token[0]=='@' && token[1]=='#') {
int n; int n;
char *pin_attr = my_malloc(_ALLOC_ID_, sizetok * sizeof(char)); char *pin_attr = my_malloc(_ALLOC_ID_, sizeof(char));
char *pin_num_or_name = my_malloc(_ALLOC_ID_, sizetok * sizeof(char)); char *pin_num_or_name = my_malloc(_ALLOC_ID_, sizeof(char));
pin_num_or_name[0]='\0'; pin_num_or_name[0]='\0';
pin_attr[0]='\0'; pin_attr[0]='\0';
n=-1; n=-1;
sscanf(token+2, "%[^:]:%[^:]", pin_num_or_name, pin_attr); get_pin_and_attr(token, &pin_num_or_name, &pin_attr);
if(isonlydigit(pin_num_or_name)) { if(isonlydigit(pin_num_or_name)) {
n = atoi(pin_num_or_name); n = atoi(pin_num_or_name);
} }
@ -2696,13 +2727,13 @@ static void print_verilog_primitive(FILE *fd, int inst) /* netlist switch level
* @#0, @#1:net_name, @#2:name, ... */ * @#0, @#1:net_name, @#2:name, ... */
else if(token[0]=='@' && token[1]=='#') { else if(token[0]=='@' && token[1]=='#') {
int n; int n;
char *pin_attr = my_malloc(_ALLOC_ID_, sizetok * sizeof(char)); char *pin_attr = my_malloc(_ALLOC_ID_, sizeof(char));
char *pin_num_or_name = my_malloc(_ALLOC_ID_, sizetok * sizeof(char)); char *pin_num_or_name = my_malloc(_ALLOC_ID_, sizeof(char));
pin_num_or_name[0]='\0'; pin_num_or_name[0]='\0';
pin_attr[0]='\0'; pin_attr[0]='\0';
n=-1; n=-1;
sscanf(token+2, "%[^:]:%[^:]", pin_num_or_name, pin_attr); get_pin_and_attr(token, &pin_num_or_name, &pin_attr);
if(isonlydigit(pin_num_or_name)) { if(isonlydigit(pin_num_or_name)) {
n = atoi(pin_num_or_name); n = atoi(pin_num_or_name);
} }
@ -3133,6 +3164,113 @@ char *find_nth(const char *str, const char *sep, int n)
} }
} }
/* given a token like @#pin:attr get value of pin attribute 'attr'
* if only @#pin is given return name of net attached to 'pin'
* caller should free returned string */
static char *get_pin_attr(const char *token, int inst, int s_pnetname)
{
char *value = NULL;
int n;
char *pin_attr = my_malloc(_ALLOC_ID_, sizeof(char));
char *pin_num_or_name = my_malloc(_ALLOC_ID_, sizeof(char));
pin_num_or_name[0]='\0';
pin_attr[0]='\0';
n=-1;
get_pin_and_attr(token, &pin_num_or_name, &pin_attr);
if(isonlydigit(pin_num_or_name)) {
n = atoi(pin_num_or_name);
}
else if(pin_num_or_name[0]) {
for(n = 0 ; n < (xctx->inst[inst].ptr + xctx->sym)->rects[PINLAYER]; ++n) {
char *prop = (xctx->inst[inst].ptr + xctx->sym)->rect[PINLAYER][n].prop_ptr;
if(!strcmp(get_tok_value(prop,"name",0), pin_num_or_name)) break;
}
}
if(n>=0 && pin_attr[0] && n < (xctx->inst[inst].ptr + xctx->sym)->rects[PINLAYER]) {
char *pin_attr_value = NULL;
int is_net_name = !strcmp(pin_attr, "net_name");
/* get pin_attr value from instance: "pinnumber(ENABLE)=5" --> return 5, attr "pinnumber" of pin "ENABLE"
* "pinnumber(3)=6 --> return 6, attr "pinnumber" of 4th pin */
if(!is_net_name) {
pin_attr_value = get_pin_attr_from_inst(inst, n, pin_attr);
/* get pin_attr from instance pin attribute string */
if(!pin_attr_value) {
my_strdup(_ALLOC_ID_, &pin_attr_value,
get_tok_value((xctx->inst[inst].ptr + xctx->sym)->rect[PINLAYER][n].prop_ptr, pin_attr, 0));
}
}
/* @#n:net_name attribute (n = pin number or name) will translate to net name attached to pin
* if 'net_name=true' attribute is set in instance or symbol */
if(!pin_attr_value && is_net_name) {
char *instprop = xctx->inst[inst].prop_ptr;
char *symprop = (xctx->inst[inst].ptr + xctx->sym)->prop_ptr;
if(s_pnetname && (!strcmp(get_tok_value(symprop, "net_name", 0), "true") ||
!strcmp(get_tok_value(instprop, "net_name", 0), "true"))) {
prepare_netlist_structs(0);
my_strdup2(_ALLOC_ID_, &pin_attr_value,
xctx->inst[inst].node && xctx->inst[inst].node[n] ? xctx->inst[inst].node[n] : "?");
/* do not show net_name: set to empty string */
} else {
my_strdup2(_ALLOC_ID_, &pin_attr_value, "");
}
}
/* @#n:resolved_net attribute (n = pin number or name) will translate to hierarchy-resolved net */
if(!pin_attr_value && !strcmp(pin_attr, "resolved_net")) {
char *rn = NULL;
char *instprop = xctx->inst[inst].prop_ptr;
char *symprop = (xctx->inst[inst].ptr + xctx->sym)->prop_ptr;
dbg(1, "translate(): resolved_net: %s, symbol %s\n", xctx->current_name, xctx->inst[inst].name);
if(s_pnetname && (!strcmp(get_tok_value(symprop, "net_name", 0), "true") ||
!strcmp(get_tok_value(instprop, "net_name", 0), "true"))) {
prepare_netlist_structs(0);
if(xctx->inst[inst].node && xctx->inst[inst].node[n]) {
rn = resolved_net(xctx->inst[inst].node[n]);
}
my_strdup2(_ALLOC_ID_, &pin_attr_value, rn ? rn : "?");
if(rn) my_free(_ALLOC_ID_, &rn);
} else {
my_strdup2(_ALLOC_ID_, &pin_attr_value, "");
}
}
if(!pin_attr_value ) my_strdup(_ALLOC_ID_, &pin_attr_value, "--UNDEF--");
my_strdup2(_ALLOC_ID_, &value, pin_attr_value);
/* recognize slotted devices: instname = "U3:3", value = "a:b:c:d" --> value = "c" */
if(pin_attr_value && pin_attr_value[0] != 0 && !strcmp(pin_attr, "pinnumber") ) {
char *ss;
int slot;
char *tmpstr = NULL;
tmpstr = my_malloc(_ALLOC_ID_, sizeof(xctx->inst[inst].instname));
if( (ss=strchr(xctx->inst[inst].instname, ':')) ) {
sscanf(ss+1, "%s", tmpstr);
if(isonlydigit(tmpstr)) {
slot = atoi(tmpstr);
if(strstr(value,":")) my_strdup2(_ALLOC_ID_, &value, find_nth(value, ":", slot));
}
}
my_free(_ALLOC_ID_, &tmpstr);
}
my_free(_ALLOC_ID_, &pin_attr_value);
my_free(_ALLOC_ID_, &pin_attr_value);
}
else if(n>=0 && n < (xctx->inst[inst].ptr + xctx->sym)->rects[PINLAYER]) {
const char *str_ptr=NULL;
int multip;
size_t tmp;
str_ptr = net_name(inst,n, &multip, 0, 1);
tmp = strlen(str_ptr) +100 ; /* always make room for some extra chars
* so 1-char writes to result do not need reallocs */
value = my_malloc(_ALLOC_ID_, tmp);
my_snprintf(value, tmp, "?%d %s ", multip, str_ptr);
}
my_free(_ALLOC_ID_, &pin_attr);
my_free(_ALLOC_ID_, &pin_num_or_name);
return value;
}
/* substitute given tokens in a string with their corresponding values */ /* substitute given tokens in a string with their corresponding values */
/* ex.: name=@name w=@w l=@l ---> name=m112 w=3e-6 l=0.8e-6 */ /* ex.: name=@name w=@w l=@l ---> name=m112 w=3e-6 l=0.8e-6 */
/* if s==NULL return emty string */ /* if s==NULL return emty string */
@ -3244,105 +3382,14 @@ const char *translate(int inst, const char* s)
} }
} }
} else if(token[0]=='@' && token[1]=='#') { } else if(token[0]=='@' && token[1]=='#') {
int n; value = get_pin_attr(token, inst, s_pnetname);
char *pin_attr = my_malloc(_ALLOC_ID_, sizetok * sizeof(char)); if(value) {
char *pin_num_or_name = my_malloc(_ALLOC_ID_, sizetok * sizeof(char));
pin_num_or_name[0]='\0';
pin_attr[0]='\0';
n=-1;
sscanf(token+2, "%[^:]:%[^:]", pin_num_or_name, pin_attr);
if(isonlydigit(pin_num_or_name)) {
n = atoi(pin_num_or_name);
}
else if(pin_num_or_name[0]) {
for(n = 0 ; n < (xctx->inst[inst].ptr + xctx->sym)->rects[PINLAYER]; ++n) {
char *prop = (xctx->inst[inst].ptr + xctx->sym)->rect[PINLAYER][n].prop_ptr;
if(!strcmp(get_tok_value(prop,"name",0), pin_num_or_name)) break;
}
}
if(n>=0 && pin_attr[0] && n < (xctx->inst[inst].ptr + xctx->sym)->rects[PINLAYER]) {
char *pin_attr_value = NULL;
int is_net_name = !strcmp(pin_attr, "net_name");
/* get pin_attr value from instance: "pinnumber(ENABLE)=5" --> return 5, attr "pinnumber" of pin "ENABLE"
* "pinnumber(3)=6 --> return 6, attr "pinnumber" of 4th pin */
if(!is_net_name) {
pin_attr_value = get_pin_attr_from_inst(inst, n, pin_attr);
/* get pin_attr from instance pin attribute string */
if(!pin_attr_value) {
my_strdup(_ALLOC_ID_, &pin_attr_value,
get_tok_value((xctx->inst[inst].ptr + xctx->sym)->rect[PINLAYER][n].prop_ptr, pin_attr, 0));
}
}
/* @#n:net_name attribute (n = pin number or name) will translate to net name attached to pin
* if 'net_name=true' attribute is set in instance or symbol */
if(!pin_attr_value && is_net_name) {
char *instprop = xctx->inst[inst].prop_ptr;
char *symprop = (xctx->inst[inst].ptr + xctx->sym)->prop_ptr;
if(s_pnetname && (!strcmp(get_tok_value(symprop, "net_name", 0), "true") ||
!strcmp(get_tok_value(instprop, "net_name", 0), "true"))) {
prepare_netlist_structs(0);
my_strdup2(_ALLOC_ID_, &pin_attr_value,
xctx->inst[inst].node && xctx->inst[inst].node[n] ? xctx->inst[inst].node[n] : "?");
/* do not show net_name: set to empty string */
} else {
my_strdup2(_ALLOC_ID_, &pin_attr_value, "");
}
}
/* @#n:resolved_net attribute (n = pin number or name) will translate to hierarchy-resolved net */
if(!pin_attr_value && !strcmp(pin_attr, "resolved_net")) {
char *rn = NULL;
char *instprop = xctx->inst[inst].prop_ptr;
char *symprop = (xctx->inst[inst].ptr + xctx->sym)->prop_ptr;
dbg(1, "translate(): resolved_net: %s, symbol %s\n", xctx->current_name, xctx->inst[inst].name);
if(s_pnetname && (!strcmp(get_tok_value(symprop, "net_name", 0), "true") ||
!strcmp(get_tok_value(instprop, "net_name", 0), "true"))) {
prepare_netlist_structs(0);
if(xctx->inst[inst].node && xctx->inst[inst].node[n]) {
rn = resolved_net(xctx->inst[inst].node[n]);
}
my_strdup2(_ALLOC_ID_, &pin_attr_value, rn ? rn : "?");
if(rn) my_free(_ALLOC_ID_, &rn);
} else {
my_strdup2(_ALLOC_ID_, &pin_attr_value, "");
}
}
if(!pin_attr_value ) my_strdup(_ALLOC_ID_, &pin_attr_value, "--UNDEF--");
value = pin_attr_value;
/* recognize slotted devices: instname = "U3:3", value = "a:b:c:d" --> value = "c" */
if(value && value[0] != 0 && !strcmp(pin_attr, "pinnumber") ) {
char *ss;
int slot;
char *tmpstr = NULL;
tmpstr = my_malloc(_ALLOC_ID_, sizeof(xctx->inst[inst].instname));
if( (ss=strchr(xctx->inst[inst].instname, ':')) ) {
sscanf(ss+1, "%s", tmpstr);
if(isonlydigit(tmpstr)) {
slot = atoi(tmpstr);
if(strstr(value,":")) value = find_nth(value, ":", slot);
}
}
my_free(_ALLOC_ID_, &tmpstr);
}
tmp=strlen(value); tmp=strlen(value);
STR_ALLOC(&result, tmp + result_pos, &size); STR_ALLOC(&result, tmp + result_pos, &size);
memcpy(result+result_pos, value, tmp+1); memcpy(result+result_pos, value, tmp+1);
result_pos+=tmp; result_pos+=tmp;
my_free(_ALLOC_ID_, &pin_attr_value); my_free(_ALLOC_ID_, &value);
} }
else if(n>=0 && n < (xctx->inst[inst].ptr + xctx->sym)->rects[PINLAYER]) {
const char *str_ptr=NULL;
int multip;
str_ptr = net_name(inst,n, &multip, 0, 1);
tmp = strlen(str_ptr) +100 ; /* always make room for some extra chars
* so 1-char writes to result do not need reallocs */
STR_ALLOC(&result, tmp + result_pos, &size);
result_pos += my_snprintf(result + result_pos, tmp, "?%d %s ", multip, str_ptr);
}
my_free(_ALLOC_ID_, &pin_attr);
my_free(_ALLOC_ID_, &pin_num_or_name);
} else if(strcmp(token,"@sch_last_modified")==0) { } else if(strcmp(token,"@sch_last_modified")==0) {
get_sch_from_sym(file_name, xctx->inst[inst].ptr + xctx->sym, inst); get_sch_from_sym(file_name, xctx->inst[inst].ptr + xctx->sym, inst);

1
xschem_library/rom8k/rom3_rowdec.sym
View File

@ -35,3 +35,4 @@ T {LDL3X} -125 -14 0 0 0.2 0.2 {}
T {LDCP} -125 6 0 0 0.2 0.2 {} T {LDCP} -125 6 0 0 0.2 0.2 {}
T {VSS} -125 26 0 0 0.2 0.2 {} T {VSS} -125 26 0 0 0.2 0.2 {}
T {VCC} -125 46 0 0 0.2 0.2 {} T {VCC} -125 46 0 0 0.2 0.2 {}
T {@#0:net_name} -30 -30 0 0 0.4 0.4 {}