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

Corrected an issue that produces potentially incorrect output 

from ext2spice due to "equiv" statements in the .ext file.  The
algorithm was not properly keeping the port as the preferred
name of the node, resulting in the non-preferred name being
used instead of the port name in the output.  This would happen
only if there was a label on a net that had a different name than
the port name.  The error became much more prevalent after changing
the extract behavior to make "extract do aliases" default.  Also
fixed a somewhat related minor error in which magic would print an
error message about ports being shorted together on the same kind
of net where both a port and a (different) label were attached to
the net.  Since the non-port label is not a preferred name, then
there should be no warning message.  The warning is only intended
for cases where two (or more) ports are truly shorted together.
This commit is contained in:
Tim Edwards 2023-06-13 17:14:36 -04:00
parent 31b3c0d8b4
commit 9b131fa96c
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext2spice/ext2spice.c
View File

@ -1899,7 +1899,8 @@ topVisit(def, doStub)
pname = stmp;
}
else
pname = nodeSpiceName(snode->efnode_name->efnn_hier, NULL);
// pname = nodeSpiceName(snode->efnode_name->efnn_hier, NULL);
pname = nodeSpiceName(nodeName->efnn_hier, NULL);
hep = HashLookOnly(&portNameTable, pname);
if (hep == (HashEntry *)NULL)

24
extflat/EFbuild.c
View File

@ -513,6 +513,8 @@ efBuildEquiv(def, nodeName1, nodeName2, resist)
if (nn2 == (EFNodeName *) NULL)
{
bool isNew = TRUE;
/* Create nodeName1 if it doesn't exist */
if (nn1 == (EFNodeName *) NULL)
{
@ -522,11 +524,12 @@ efBuildEquiv(def, nodeName1, nodeName2, resist)
nodeName1, (double)0, 0, 0,
(char *) NULL, (char **) NULL, 0);
nn1 = (EFNodeName *) HashGetValue(he1);
isNew = FALSE;
}
/* Make nodeName2 be another alias for node1 */
efNodeAddName(nn1->efnn_node, he2,
EFStrToHN((HierName *) NULL, nodeName2));
EFStrToHN((HierName *) NULL, nodeName2), isNew);
return;
}
else if (nn2->efnn_node == (EFNode *)NULL)
@ -630,21 +633,13 @@ efBuildEquiv(def, nodeName1, nodeName2, resist)
if ((EFNodeName *)HashGetValue(he2) == nn2)
HashSetValue(he2, (char *)nn1);
}
/* Check if any device terminals point to the old node */
if (nn1->efnn_node == NULL)
{
}
else if (nn2->efnn_node == NULL)
{
}
}
return;
}
/* Make nodeName1 be another alias for node2 */
efNodeAddName(nn2->efnn_node, he1,
EFStrToHN((HierName *) NULL, nodeName1));
EFStrToHN((HierName *) NULL, nodeName1), FALSE);
}
@ -1716,10 +1711,11 @@ again:
*/
void
efNodeAddName(node, he, hn)
efNodeAddName(node, he, hn, isNew)
EFNode *node;
HashEntry *he;
HierName *hn;
bool isNew; // If TRUE, added name is never the preferred name.
{
EFNodeName *newnn;
EFNodeName *oldnn;
@ -1730,7 +1726,8 @@ efNodeAddName(node, he, hn)
newnn->efnn_hier = hn;
newnn->efnn_port = -1;
newnn->efnn_refc = 0;
HashSetValue(he, (char *) newnn);
HashSetValue(he, (char *)newnn);
/* If the node is a port of the top level cell, denoted by flag */
/* EF_TOP_PORT, then the name given to the port always stays at the */
@ -1740,7 +1737,8 @@ efNodeAddName(node, he, hn)
/* Link in the new name */
oldnn = node->efnode_name;
if (oldnn == NULL || (EFHNBest(newnn->efnn_hier, oldnn->efnn_hier) && !topport))
if ((oldnn == NULL) || (EFHNBest(newnn->efnn_hier, oldnn->efnn_hier)
&& !topport && !isNew))
{
/* New head of list */
newnn->efnn_next = oldnn;

4
extract/ExtBasic.c
View File

@ -793,7 +793,11 @@ extOutputNodes(nodeList, outFile)
text, ll->ll_label->lab_text);
lastname = ll->ll_label->lab_text;
}
/* Don't print a warning unless both labels are
* really ports.
*/
if ((portname != NULL) &&
(ll->ll_attr == LL_PORTATTR) &&
(strcmp(ll->ll_label->lab_text, portname)))
TxError("Warning: Ports \"%s\" and \"%s\" are"
" electrically shorted.\n",