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

One correction to the last commit, to avoid missing output of 

port nets in "def write".
This commit is contained in:
Tim Edwards 2022-11-18 22:28:20 -05:00
parent 16da74a2f9
commit 6369c44821
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extflat/EFbuild.c
View File

@ -187,6 +187,16 @@ efBuildNode(def, isSubsnode, isDevSubsnode, nodeName, nodeCap, x, y, layerName,
if (isSubsnode == TRUE) if (isSubsnode == TRUE)
newnode->efnode_flags |= EF_GLOB_SUBS_NODE; newnode->efnode_flags |= EF_GLOB_SUBS_NODE;
/* For tracking unique nodes (see below), the first
* node entry for a port is not considered unique,
* since the port itself is not a node.
*/
if (newnode->efnode_flags & EF_PORT_NONODE)
{
newnode->efnode_flags &= ~EF_PORT_NONODE;
return;
}
/* If tracking unique nodes (for "def write", for example), /* If tracking unique nodes (for "def write", for example),
* collect unique node positions in the client data so that * collect unique node positions in the client data so that
* all of them can be visited. * all of them can be visited.
@ -1117,6 +1127,10 @@ efBuildPortNode(def, name, idx, x, y, layername, toplevel)
layername, (char **) NULL, 0); layername, (char **) NULL, 0);
nn = (EFNodeName *) HashGetValue(he); nn = (EFNodeName *) HashGetValue(he);
/* Flag this as a port where the corresponding node has not been seen. */
if (nn != (EFNodeName *) NULL)
nn->efnn_node->efnode_flags |= EF_PORT_NONODE;
} }
if (nn != (EFNodeName *) NULL) if (nn != (EFNodeName *) NULL)
{ {

6
extflat/extflat.h
View File

@ -221,6 +221,12 @@ typedef struct efnhdr
* location is maintained so that the net fragment can be found. * location is maintained so that the net fragment can be found.
*/ */
#define EF_UNIQUE_NODE 0x100 #define EF_UNIQUE_NODE 0x100
/*
* EF_PORT_NONODE is used to mark a port for which no "node"
* record has been seen. When a corresponding node record is
* found, this flag is cleared.
*/
#define EF_PORT_NONODE 0x200
extern int efNumResistClasses; /* Number of resistance classes in efResists */ extern int efNumResistClasses; /* Number of resistance classes in efResists */

6
lef/defWrite.c
View File

@ -295,9 +295,6 @@ defnodeCount(node, res, cap, total)
char ndn[256]; char ndn[256];
char *cp, clast; char *cp, clast;
/* Ignore ports---use the unique node entries instead */
if (node->efnode_flags & EF_TOP_PORT) return 0;
/* Ignore the substrate node if it is not connected to any routing */ /* Ignore the substrate node if it is not connected to any routing */
if (node->efnode_type == TT_SPACE) if (node->efnode_type == TT_SPACE)
return 0; return 0;
@ -672,9 +669,6 @@ defnodeVisit(node, res, cap, defdata)
EFNodeName *thisnn; EFNodeName *thisnn;
int defNetGeometryFunc(); /* Forward declaration */ int defNetGeometryFunc(); /* Forward declaration */
/* Ignore ports---use the unique node entries instead */
if (node->efnode_flags & EF_TOP_PORT) return 0;
/* For regular nets, only count those nodes having port */ /* For regular nets, only count those nodes having port */
/* connections. For special nets, only count those nodes */ /* connections. For special nets, only count those nodes */
/* that were marked with the EF_SPECIAL flag while counting */ /* that were marked with the EF_SPECIAL flag while counting */