From bfab888bc99bac4698ede328038a84945ce14ba4 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Tue, 14 Sep 2021 13:42:27 -0400
Subject: [PATCH] Cleaned up a few lines related to "equiv" nodes, which are
 not actually an issue and probably never relevant.  extresist now works
 except for substrate connections and soft connections between substrate
 regions.  That will require additional coding, not bugfixing, so I'm
 committing the last of this set of bugfixes before starting that.

---
 VERSION            |  2 +-
 resis/ResReadSim.c |  4 ++--
 resis/ResRex.c     | 16 ++++++++++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/VERSION b/VERSION
index b53ac986..075299af 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.207
+8.3.208
diff --git a/resis/ResReadSim.c b/resis/ResReadSim.c
index a0c5944f..96e90ea1 100644
--- a/resis/ResReadSim.c
+++ b/resis/ResReadSim.c
@@ -968,9 +968,9 @@ ResSimMerge(line)
      	TxError("Bad node alias line\n");
 	return(1);
     }
-    node = ResInitializeNode(HashFind(&ResNodeTable, line[REALNAME]));
+    node = ResInitializeNode(HashFind(&ResNodeTable, line[ALIASNAME]));
     node->status |= FORWARD;
-    node->forward = ResInitializeNode(HashFind(&ResNodeTable, line[ALIASNAME]));
+    node->forward = ResInitializeNode(HashFind(&ResNodeTable, line[REALNAME]));
     node->forward->resistance += node->resistance;
     node->forward->capacitance += node->capacitance;
     while (node->firstDev != NULL)
diff --git a/resis/ResRex.c b/resis/ResRex.c
index 9db4ce4b..4428d54b 100644
--- a/resis/ResRex.c
+++ b/resis/ResRex.c
@@ -1240,7 +1240,9 @@ ResFixUpConnections(simDev, layoutDev, simNode, nodename)
      	    sprintf(newname, "%s%s%d", nodename, ".t", resNodeNum++);
 	}
 	else
-	    TxError("Missing gate connection\n");
+	    TxError("Missing gate connection of device at (%d %d) on net %s\n",
+			layoutDev->rd_inside.r_xbot, layoutDev->rd_inside.r_ybot,
+			nodename);
     }
     if (simDev->source == simNode)
     {
@@ -1263,7 +1265,9 @@ ResFixUpConnections(simDev, layoutDev, simNode, nodename)
 	       	/* one to each */
 	    }
 	    else
-	        TxError("Missing SD connection\n");
+		TxError("Missing terminal connection of device at (%d %d) on net %s\n",
+			layoutDev->rd_inside.r_xbot, layoutDev->rd_inside.r_ybot,
+			nodename);
 	}
 	else
 	{
@@ -1306,7 +1310,9 @@ ResFixUpConnections(simDev, layoutDev, simNode, nodename)
 
 	    }
 	    else
-	       	TxError("Missing SD connection\n");
+	       	TxError("Missing terminal connection of device at (%d %d) on net %s\n",
+			layoutDev->rd_inside.r_xbot, layoutDev->rd_inside.r_ybot,
+			nodename);
 	}
     }
     else if (simDev->drain == simNode)
@@ -1353,7 +1359,9 @@ ResFixUpConnections(simDev, layoutDev, simNode, nodename)
 	    }
 	}
 	else
-	    TxError("Missing SD connection\n");
+	    TxError("Missing terminal connection of device at (%d %d) on net %s\n",
+			layoutDev->rd_inside.r_xbot, layoutDev->rd_inside.r_ybot,
+			nodename);
     }
     else
 	resNodeNum--;