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 2024-02-03 02:00:02 -05:00
parent 93b9cf6577 c7fa0324d9
commit b83800d69b
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.265 1.5.266

32
base/netcmp.c
View File

@ -7184,7 +7184,7 @@ int reorderpins(struct hashlist *p, int file)
{ {
struct nlist *ptr; struct nlist *ptr;
struct nlist *tc2 = Circuit2; struct nlist *tc2 = Circuit2;
struct objlist *ob, *ob2, *firstpin; struct objlist *ob, *ob2, *firstpin, *oblast, *newob;
int i, numports, *nodes, unordered; int i, numports, *nodes, unordered;
char **names; char **names;
@ -7236,6 +7236,7 @@ int reorderpins(struct hashlist *p, int file)
names[ob2->model.port] = ob->name; names[ob2->model.port] = ob->name;
} }
oblast = ob;
ob = ob->next; ob = ob->next;
ob2 = ob2->next; ob2 = ob2->next;
if (i < numports - 1) { if (i < numports - 1) {
@ -7243,7 +7244,34 @@ int reorderpins(struct hashlist *p, int file)
Fprintf(stderr, "Instance of %s has only " Fprintf(stderr, "Instance of %s has only "
"%d of %d ports\n", "%d of %d ports\n",
tc2->name, i + 1, numports); tc2->name, i + 1, numports);
break; if (ptr->flags & CELL_VERILOG) {
/* If parent cell is verilog, and the cells
* have been matched, then the instance can
* be assumed to be using an implicit pin.
*/
Fprintf(stderr, "Assuming implicit verilog pin \"%s\".\n",
ob2->name);
newob = (struct objlist *)CALLOC(1,
sizeof(struct objlist));
newob->name = (char *)MALLOC(strlen(oblast->instance.name)
+ strlen(ob2->name) + 2);
sprintf(newob->name, "%s/%s",
oblast->instance.name, ob2->name);
newob->type = oblast->type + 1;
newob->model.class = strsave(oblast->model.class);
newob->instance.name = strsave(oblast->instance.name);
newob->flags = 0;
ptr->nodename_cache_maxnodenum++;
newob->node = ptr->nodename_cache_maxnodenum;
newob->next = ob;
oblast->next = newob; /* Splice into object list */
/* Fill in the missing entries */
nodes[ob2->model.port] = newob->node;
names[ob2->model.port] = newob->name;
ob = newob;
}
else
break;
} }
else if (ob2 == NULL || ob2->type != PORT) { else if (ob2 == NULL || ob2->type != PORT) {
Fprintf(stderr, "Instance of %s has " Fprintf(stderr, "Instance of %s has "