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 2022-06-27 02:00:01 -04:00
parent d3407b3e56 7550ef9258
commit ee92d880d7
4 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.5.224 1.5.226

34
base/flatten.c
View File

@ -1709,13 +1709,21 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
} }
} }
if (match) { if (match) {
if (ecomp->cell2) {
Fprintf(stdout, "Flattening instances of %s in cell %s (%d)" /* Don't flatten if cell1 is a black box, because it */
/* can't also be flattened. */
if ((ecomp->num1 == 0) || (ecomp->cell1->class !=
CLASS_MODULE)) {
if (ecomp->cell2) {
Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
" makes a better match\n", ecomp->cell2->name, " makes a better match\n", ecomp->cell2->name,
name2, file2); name2, file2);
flattenInstancesOf(name2, file2, ecomp->cell2->name); flattenInstancesOf(name2, file2, ecomp->cell2->name);
}
modified++;
} }
modified++;
} }
/* Reset or apply the count adjustments */ /* Reset or apply the count adjustments */
@ -1739,7 +1747,7 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
} }
/* Case 3: Cell1 class is a subcircuit, and flattening */ /* Case 3: Cell1 class is a subcircuit, and flattening */
/* it (without regard to cell1) improves the matching. */ /* it (without regard to cell2) improves the matching. */
else if ((ecomp->num1 != ecomp->num2) && (ecomp->cell1 != NULL) && else if ((ecomp->num1 != ecomp->num2) && (ecomp->cell1 != NULL) &&
(ecomp->num1 != 0) && (ecomp->cell1->class == CLASS_SUBCKT)) { (ecomp->num1 != 0) && (ecomp->cell1->class == CLASS_SUBCKT)) {
@ -1767,13 +1775,21 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
} }
} }
if (match) { if (match) {
if (ecomp->cell1) {
Fprintf(stdout, "Flattening instances of %s in cell %s (%d)" /* Don't flatten if cell2 is a black box, because it */
/* can't also be flattened. */
if ((ecomp->num2 == 0) || (ecomp->cell2->class !=
CLASS_MODULE)) {
if (ecomp->cell1) {
Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
" makes a better match\n", ecomp->cell1->name, " makes a better match\n", ecomp->cell1->name,
name1, file1); name1, file1);
flattenInstancesOf(name1, file1, ecomp->cell1->name); flattenInstancesOf(name1, file1, ecomp->cell1->name);
}
modified++;
} }
modified++;
} }
/* Reset or apply the count adjustments */ /* Reset or apply the count adjustments */

6
base/netcmp.c
View File

@ -875,7 +875,11 @@ struct FormattedList *FormatBadNodeFragment(struct Node *N)
for (n = pins[i]->subelement->element->nodelist; n != NULL; n = n->next){ for (n = pins[i]->subelement->element->nodelist; n != NULL; n = n->next){
if (n->pin_magic == pins[i]->subelement->pin_magic) { if (n->pin_magic == pins[i]->subelement->pin_magic) {
if ((permute == 0) && (ob->instance.name != NULL)) { if ((permute == 0) && (ob->instance.name != NULL)) {
pinname = ob->name + strlen(ob->instance.name) + 1; /* Handle "port_match_error" */
if ((ob->name[0] == 'p') && !strcmp(ob->name, "port_match_error"))
pinname = ob->name;
else
pinname = ob->name + strlen(ob->instance.name) + 1;
} }
else if (ob->instance.name != NULL) { else if (ob->instance.name != NULL) {
char *pinsave = pinname; char *pinsave = pinname;

1
base/verilog.c
View File

@ -2232,6 +2232,7 @@ nextinst:
Node(scan->net); Node(scan->net);
join(scan->net, nobj->name); join(scan->net, nobj->name);
scan->flags |= PORT_FOUND; scan->flags |= PORT_FOUND;
obptr = nobj;
/* Now any previous instance of the same cell must */ /* Now any previous instance of the same cell must */
/* insert the same additional pin as a no-connect. */ /* insert the same additional pin as a no-connect. */