Uncovered a major error that was causing some routes not to reach

a terminal because it was attempting to define an offset on a via
outside of the geometry defining the pin, where it would need a
stub route to reach the tap.  Since the flags are set up to make
stub routes and offset routes mutually exclusive, the stub route
got lost.

1 files changed, 30 insertions, 4 deletions

diff --git a/lef.c b/lef.c
index be1cd4f..9b65786 100644
--- a/lef.c
+++ b/lef.c
@@ -717,22 +717,48 @@ LefGetRouteOffset(int layer)
  * because the center can be on a half-grid position; so,
  * return half the value obtained.
  *
- * To-do:  Differentiate between X and Y vias when doing
- * checkerboard via patterning.
+ * This routine always uses a horizontally oriented via if
+ * available.  See the specific LefGetXYViaWidth() routine
+ * for differentiation between via orientations.
  *------------------------------------------------------------
  */
 
 double
 LefGetViaWidth(int base, int layer, int dir)
 {
+   return LefGetXYViaWidth(base, layer, dir, 0);
+}
+
+/*
+ *------------------------------------------------------------
+ * The base routing used by LefGetViaWidth(), with an
+ * additional argument that specifies which via orientation
+ * to use, if an alternative orientation is available.  This
+ * is necessary for doing checkerboard via patterning and
+ * for certain standard cells with ports that do not always
+ * fit one orientation of via.
+ *------------------------------------------------------------
+ */
+
+double
+LefGetXYViaWidth(int base, int layer, int dir, int orient)
+{
     DSEG lrect;
     LefList lefl;
     double width;
+    char **viatable;
 
-    lefl = LefFindLayer(ViaX[base]);
+    viatable = (orient == 1) ? ViaY : ViaX;
+
+    lefl = LefFindLayer(*(viatable + base));
+    if (!lefl) {
+	viatable = (orient == 1) ? ViaX : ViaY;
+	lefl = LefFindLayer(*(viatable + base));
+	viatable = (orient == 1) ? ViaY : ViaX;
+    }
     if (!lefl) {
 	if (base == Num_layers)
-	    lefl = LefFindLayer(ViaX[base - 1]);
+	    lefl = LefFindLayer(*(viatable + base - 1));
     }
     if (lefl) {
 	if (lefl->lefClass == CLASS_VIA) {