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 2021-06-10 03:00:09 -04:00
parent 43c018f3bc dfabdaa367
commit e7ae84bbc8
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.184 1.5.185

28
base/netcmp.c
View File

@ -5691,7 +5691,7 @@ PropertyMatch(struct objlist *ob1, int file1,
#endif #endif
} }
/* WIP---Check for no-connect pins in merged devices on both sides. */ /* Check for no-connect pins in merged devices on both sides. */
/* Both sides should either have no-connects marked, or neither. */ /* Both sides should either have no-connects marked, or neither. */
/* (Permutable pins may need to be handled correctly. . . */ /* (Permutable pins may need to be handled correctly. . . */
@ -5746,10 +5746,12 @@ PropertyMatch(struct objlist *ob1, int file1,
if ((t1type != PROPERTY) && (checked_one == TRUE)) { if ((t1type != PROPERTY) && (checked_one == TRUE)) {
// t2 has more property records than t1, and they did not get // t2 has more property records than t1, and they did not get
// merged equally by PropertySortAndCombine(). // merged equally by PropertySortAndCombine().
if (do_print) {
Fprintf(stdout, "Circuit 1 parallel/series network does not match" Fprintf(stdout, "Circuit 1 parallel/series network does not match"
" Circuit 2\n"); " Circuit 2\n");
DumpNetwork(ob1, 1); DumpNetwork(ob1, 1);
DumpNetwork(ob2, 2); DumpNetwork(ob2, 2);
}
mismatches++; mismatches++;
} }
else if (t1type != PROPERTY) { else if (t1type != PROPERTY) {
@ -7342,14 +7344,6 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
Fprintf(stderr, "No netlist match for cell %s pin %s\n", Fprintf(stderr, "No netlist match for cell %s pin %s\n",
tc2->name, ob2->name); tc2->name, ob2->name);
} }
#ifdef TCL_NETGEN
if (dolist) {
Tcl_ListObjAppendElement(netgeninterp, plist1,
Tcl_NewStringObj("(no matching pin)", -1));
Tcl_ListObjAppendElement(netgeninterp, plist2,
Tcl_NewStringObj(ob2->name, -1));
}
#endif
/* Before making a proxy pin, check to see if */ /* Before making a proxy pin, check to see if */
/* flattening instances has left a port with a */ /* flattening instances has left a port with a */
@ -7366,11 +7360,27 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
if ((obt == NULL) && (notempty == 1)) { if ((obt == NULL) && (notempty == 1)) {
ob2->node = -2; // Will run this through cleanuppins ob2->node = -2; // Will run this through cleanuppins
needclean2 = 1; needclean2 = 1;
#ifdef TCL_NETGEN
if (dolist) {
Tcl_ListObjAppendElement(netgeninterp, plist1,
Tcl_NewStringObj("(no pin)", -1));
Tcl_ListObjAppendElement(netgeninterp, plist2,
Tcl_NewStringObj(ob2->name, -1));
}
#endif
continue; continue;
} }
else if (notempty == 1) { else if (notempty == 1) {
/* Flag this as an error */ /* Flag this as an error */
result = 0; result = 0;
#ifdef TCL_NETGEN
if (dolist) {
Tcl_ListObjAppendElement(netgeninterp, plist1,
Tcl_NewStringObj("(no matching pin)", -1));
Tcl_ListObjAppendElement(netgeninterp, plist2,
Tcl_NewStringObj(ob2->name, -1));
}
#endif
} }
ob2->model.port = numnodes++; // Assign a port order ob2->model.port = numnodes++; // Assign a port order