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

Merge branch 'master' into netgen-1.5

This commit is contained in:
Tim Edwards 2024-10-08 02:00:03 -04:00
parent e659495ef5 d14bf70f1c
commit e94d25b3f1
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.281 1.5.282

21
base/netcmp.c
View File

@ -7629,7 +7629,7 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
if (ob2->model.port == -1) if (ob2->model.port == -1)
snprintf(ostr + left_col_end + 1, left_col_end, "%s **Mismatch**", ob2->name); snprintf(ostr + left_col_end + 1, left_col_end, "%s **Mismatch**", ob2->name);
else else
snprintf(ostr + left_col_end + 1, left_col_end, "(no matching pin)"); snprintf(ostr + left_col_end + 1, left_col_end, "(no matching pin)", ob2->name);
} }
nomatch = TRUE; nomatch = TRUE;
/* Pins with different names are on different nets, /* Pins with different names are on different nets,
@ -7684,7 +7684,7 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
for (m = 0; m < left_col_end; m++) *(ostr + m) = ' '; for (m = 0; m < left_col_end; m++) *(ostr + m) = ' ';
for (m = left_col_end + 1; m < right_col_end; m++) *(ostr + m) = ' '; for (m = left_col_end + 1; m < right_col_end; m++) *(ostr + m) = ' ';
snprintf(ostr, 32, "%s", obn->name); snprintf(ostr, 32, "%s", obn->name);
snprintf(ostr + left_col_end + 1, left_col_end, "(no matching pin)"); snprintf(ostr + left_col_end + 1, left_col_end, "(no pin, node is %s)", obp->name);
for (m = 0; m < right_col_end + 1; m++) for (m = 0; m < right_col_end + 1; m++)
if (*(ostr + m) == '\0') *(ostr + m) = ' '; if (*(ostr + m) == '\0') *(ostr + m) = ' ';
Fprintf(stdout, ostr); Fprintf(stdout, ostr);
@ -8132,23 +8132,6 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
obn->instance.name = NULL; obn->instance.name = NULL;
obn->node = -1; obn->node = -1;
/* Note: Has this pin already been accounted for? */
if (Debug == 0) {
if (strcmp(ob1->name, "(no pins)")) {
for (m = 0; m < left_col_end; m++) *(ostr + m) = ' ';
for (m = left_col_end + 1; m < right_col_end; m++) *(ostr + m) = ' ';
snprintf(ostr, left_col_end, "%s", ob1->name);
snprintf(ostr + left_col_end + 1, left_col_end, "(no matching pin)");
for (m = 0; m < right_col_end + 1; m++)
if (*(ostr + m) == '\0') *(ostr + m) = ' ';
Fprintf(stdout, ostr);
}
}
else {
Fprintf(stderr, "No netlist match for cell %s pin %s\n",
tc1->name, ob1->name);
}
if (ob2 == tc2->cell) { if (ob2 == tc2->cell) {
obn->next = ob2; obn->next = ob2;
tc2->cell = obn; tc2->cell = obn;