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

Added a reference count to the node structure in extflat to account 

for the "equiv" statement---equivalent nodes names have to be
registered in the def->def_nodes hash table, and if they point to
the same node, then that node can't be free'd until the last
referenced node is seen when iterating through the hash table to
free the node records during EFDone().  This is handled by the
reference count.
This commit is contained in:
Tim Edwards 2021-03-17 14:54:36 -04:00
parent 8a0b180cde
commit fd4569081e
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
extflat/EFbuild.c
View File

@ -183,6 +183,7 @@ efBuildNode(def, isSubsnode, nodeName, nodeCap, x, y, layerName, av, ac)
newname = (EFNodeName *) mallocMagic((unsigned)(sizeof (EFNodeName)));
newname->efnn_hier = EFStrToHN((HierName *) NULL, nodeName);
newname->efnn_port = -1; /* No port assignment */
newname->efnn_refc = 0; /* Only reference is self */
newname->efnn_next = NULL;
HashSetValue(he, (char *) newname);
}
@ -491,9 +492,15 @@ efBuildEquiv(def, nodeName1, nodeName2)
/* points to the merged name's hash. */
if (nn1->efnn_node == NULL)
{
HashSetValue(he1, (char *)nn2);
nn2->efnn_refc += nn1->efnn_refc + 1;
}
else if (nn2->efnn_node == NULL)
{
HashSetValue(he2, (char *)nn1);
nn1->efnn_refc += nn2->efnn_refc + 1;
}
}
return;
}
@ -1561,6 +1568,7 @@ efNodeAddName(node, he, hn)
newnn->efnn_node = node;
newnn->efnn_hier = hn;
newnn->efnn_port = -1;
newnn->efnn_refc = 0;
HashSetValue(he, (char *) newnn);
/* If the node is a port of the top level cell, denoted by flag */
@ -1869,7 +1877,15 @@ efFreeNodeTable(table)
{
for (hn = nn->efnn_hier; hn; hn = hn->hn_parent)
(void) HashFind(&efFreeHashTable, (char *) hn);
freeMagic((char *) nn);
/* Node equivalences made by "equiv" statements are handled */
/* by reference count. Don't free the node structure until */
/* all references have been seen. */
if (nn->efnn_refc > 0)
nn->efnn_refc--;
else
freeMagic((char *) nn);
}
}

1
extflat/EFflat.c
View File

@ -545,6 +545,7 @@ efAddNodes(hc, stdcell)
newname->efnn_node = newnode;
newname->efnn_hier = hierName;
newname->efnn_port = -1;
newname->efnn_refc = 0;
if (newnode->efnode_name)
{
newname->efnn_next = newnode->efnode_name->efnn_next;

1
extflat/extflat.h
View File

@ -119,6 +119,7 @@ typedef struct efnn
struct efnn *efnn_next; /* Next name for this node */
HierName *efnn_hier; /* HierName for this node */
int efnn_port; /* Port number for this node */
unsigned char efnn_refc; /* #times referenced in hash */
} EFNodeName;
/*