Merge branch 'master' into work

Update at Tue Oct 10 22:25:49 EDT 2017 by tim
Corrected two errors in the serial combine function, one which
2026-08-24 23:17:28 +02:00 · 2017-10-10 22:25:50 -04:00 · 2017-10-10 22:25:49 -04:00 · 2017-10-10 22:24:09 -04:00 · 2017-08-24 09:51:46 -04:00 · 2017-08-24 09:51:44 -04:00
3 changed files with 21 additions and 4 deletions
@@ -1 +1 @@
-1.5.84
+1.5.87
@@ -6057,7 +6057,7 @@ int reorderpins(struct hashlist *p, int file)
    struct nlist *ptr;
    struct nlist *tc2 = Circuit2;
    struct objlist *ob, *ob2, *firstpin;
-    int i, numports, *nodes;
+    int i, numports, *nodes, unordered;
    char **names;

    ptr = (struct nlist *)(p->ptr);
@@ -6071,14 +6071,23 @@ int reorderpins(struct hashlist *p, int file)
    /* instances of both cells.					*/

    numports = 0;
+    unordered = 0;
    ob2 = tc2->cell;
    while (ob2 && ob2->type == PORT) {
+	if (ob2->model.port < 0) {
+	    ob2->model.port = numports;
+	    unordered = 1;
+	}
 	numports++;
 	ob2 = ob2->next;
    }
    nodes = (int *)CALLOC(numports, sizeof(int));
    names = (char **)CALLOC(numports, sizeof(char *));

+    if (unordered)
+	Fprintf(stderr, "Ports of %s are unordered.  "
+		"Ordering will be arbitrary.", tc2->name);
+
    for (ob = ptr->cell; ob != NULL; ) {
 	if (ob->type == FIRSTPIN) {
 	    if ((*matchfunc)(ob->model.class, tc2->name)) {
@@ -3309,7 +3309,9 @@ int check_pin_nodes(struct objlist *ob1, struct objlist *ob2)
      pob = pob->next;
   }

-   if (nob->type > FIRSTPIN || pob->type > FIRSTPIN) return FALSE;
+   if (nob && pob && (nob->type > FIRSTPIN || pob->type > FIRSTPIN))
+      return FALSE;
+
   return TRUE;
 }

@@ -3486,7 +3488,13 @@ int CombineSerial(char *model, int file)
 	    /* only pointer to it.					*/
            for (obp = instlist[i][0]; obp->next->type > FIRSTPIN ||
 			obp->next->type == PROPERTY; obp = obp->next);
-            for (ob2 = obp; ob2->next != instlist[i][1]; ob2 = ob2->next);
+            for (ob2 = obp; ob2 && ob2->next != instlist[i][1]; ob2 = ob2->next);
+
+	    /* Device may have been moved by the above code.  If so, look for	*/
+	    /* it from the beginning of the list. */
+	    if (ob2 == NULL)
+               for (ob2 = tp->cell; ob2->next != instlist[i][1]; ob2 = ob2->next);
+
 	    for (obs = ob2->next; obs->next && (obs->next->type > FIRSTPIN
 			|| obs->next->type == PROPERTY); obs = obs->next);
 	    ob2->next = obs->next;
Author	SHA1	Message	Date
Tim Edwards	e15620257c	Merge branch 'master' into work	2017-10-10 22:25:50 -04:00
Tim Edwards	7a947ee9be	Update at Tue Oct 10 22:25:49 EDT 2017 by tim	2017-10-10 22:25:49 -04:00
Tim Edwards	b5f188de42	Corrected two errors in the serial combine function, one which misses a device if it has been already moved due to earlier merging in the serial combine routine, and runs off the end of the list; the other if the pin check routine falls on the last device in the list, leading to an incorrect check for a record where there is only a NULL.	2017-10-10 22:24:09 -04:00
Tim Edwards	ccbb286cf3	Merge branch 'master' into work	2017-08-24 09:51:46 -04:00
Tim Edwards	4809c02f79	Update at Thu Aug 24 09:51:44 EDT 2017 by tim	2017-08-24 09:51:44 -04:00
Tim Edwards	af3982766e	Prevented a crash condition in the error case in which ports are unordered at the time of reaching reorderpins(). Pins will be ordered arbitrarily (in the order of appearance in the linked list), but netgen will not crash.	2017-08-24 09:50:40 -04:00
Tim Edwards	25c1f13e16	Update at Thu Aug 10 22:41:12 EDT 2017 by tim	2017-08-10 22:41:12 -04:00
@@ -1 +1 @@
 .5.84
 .5.87