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

Minor syntactical editing of pull request #33, and updated version 

to go along with the merge of the pull request (from Mitch Bailey).
This commit is contained in:
Tim Edwards 2021-10-14 11:22:20 -04:00
parent 42b1acc564
commit 6ceeddf096
2 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.203 1.5.204

72
base/flatten.c
View File

@ -259,13 +259,16 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
struct objlist *ChildObjList, *ChildListEnd; struct objlist *ChildObjList, *ChildListEnd;
struct objlist *ChildStart, *ChildEnd, *ParentEnd, *ParentNext; struct objlist *ChildStart, *ChildEnd, *ParentEnd, *ParentNext;
struct nlist *ThisCell; struct nlist *ThisCell;
struct nlist *ChildCell; struct nlist *ChildCell;
struct objlist *tmp, *ob2, *ob3; struct objlist *tmp, *ob2, *ob3;
int notdone, rnodenum; int notdone, rnodenum;
char tmpstr[1024]; char tmpstr[1024];
int nextnode, oldmax, numflat = 0; int nextnode, oldmax, numflat = 0;
struct objlist *myObject_p, *myPort_p;
struct objlist *myFirstPin_p, *myPin_p;
int myDeleteCount = 0;
#if !OLDPREFIX #if !OLDPREFIX
int prefixlength; int prefixlength;
#endif #endif
if (name == NULL) { if (name == NULL) {
@ -599,37 +602,36 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
} }
CacheNodeNames(ThisCell); CacheNodeNames(ThisCell);
ThisCell->dumped = 1; /* indicate cell has been flattened */ ThisCell->dumped = 1; /* indicate cell has been flattened */
{ // Remove disconnected ports. New block to ensure isolated scope.
// Fprintf(stdout, "DEBUG: check pins for %s of %d\n", name, fnum);
struct objlist *myObject_p, *myPort_p;
struct objlist *myFirstPin_p, *myPin_p;
int myDeleteCount = 0;
myFirstPin_p = NULL; // Remove disconnected ports.
// Save first pin definition so we don't have to search for each port // Fprintf(stdout, "DEBUG: check pins for %s of %d\n", name, fnum);
for ( myObject_p = ThisCell->cell; myObject_p != NULL; myObject_p = myObject_p->next ) {
if ( myObject_p->type >= FIRSTPIN ) { myFirstPin_p = NULL;
myFirstPin_p = myObject_p;
break; // Save first pin definition so we don't have to search for each port
for (myObject_p = ThisCell->cell; myObject_p != NULL; myObject_p = myObject_p->next) {
if (myObject_p->type >= FIRSTPIN) {
myFirstPin_p = myObject_p;
break;
}
}
if (myFirstPin_p != NULL) { // Not a black box. Black boxes contain no pins.
// For each port, check for pin connection. If none, mark for deletion.
// Assumes that all ports occur at the beginning of the list
for (myPort_p = ThisCell->cell; myPort_p != NULL && IsPort(myPort_p);
myPort_p = myPort_p->next ) {
for (myPin_p = myFirstPin_p; myPin_p != NULL; myPin_p = myPin_p->next) {
if (myPort_p->node == myPin_p->node) { // only need to find one connection
break;
}
}
if (myPin_p == NULL) { // mark disconnected ports
myDeleteCount++;
myPort_p->node = -2;
} }
} }
if ( myFirstPin_p != NULL ) { // not a black box. Black boxes contain no pins. if (myDeleteCount > 0) { // delete disconnected ports
// For each port, check for pin connection. If none, mark for deletion. CleanupPins(name, fnum);
// Assumes that all ports occur at the beginning of the list
for ( myPort_p = ThisCell->cell; myPort_p != NULL && IsPort(myPort_p); myPort_p = myPort_p->next ) {
for ( myPin_p = myFirstPin_p; myPin_p != NULL; myPin_p = myPin_p->next ) {
if ( myPort_p->node == myPin_p->node ) { // only need to find one connection
break;
}
}
if ( myPin_p == NULL ) { // mark disconnected ports
myDeleteCount++;
myPort_p->node = -2;
}
}
if ( myDeleteCount > 0 ) { // delete disconnected ports
CleanupPins(name, fnum);
}
} }
} }
return numflat; return numflat;
@ -1615,8 +1617,8 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
} }
} }
else { else {
// cell exists in one circuit but not the other, so flatten it. // Apply recursive flattening when a cell exists in
// match = 0; // one circuit but not the other.
break; break;
} }
} }