From a971f6f91b450842af52ae0cdd9f338732d61da2 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Sun, 2 Aug 2020 18:11:39 +0200
Subject: [PATCH] Bug fix: Bad topology in NetBuilderHV::_do_2G_xM1_1PinM2().

* Bug: In Anabatic::NetBuilderHV::_do_2G_xM1_1PinM2(), in the case of a
    bend of global wires, the topology was faulty. Badly connected HTees.
---
 anabatic/src/NetBuilderHV.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/anabatic/src/NetBuilderHV.cpp b/anabatic/src/NetBuilderHV.cpp
index 54a3285d..b5e0a8cc 100644
--- a/anabatic/src/NetBuilderHV.cpp
+++ b/anabatic/src/NetBuilderHV.cpp
@@ -560,7 +560,7 @@ namespace Anabatic {
 
     doRp_AutoContacts( getGCell(), getRoutingPads()[0], rpSourceContact, rpContactTarget, NoFlags );
 
-    AutoContact* turn1 = AutoContactTurn::create( getGCell(), getNet(), Session::getContactLayer(1) );
+    AutoContact* turn1   = AutoContactTurn::create( getGCell(), getNet(), Session::getContactLayer(1) );
     AutoSegment::create( rpSourceContact, turn1, Flags::Horizontal );
 
     if (east() or west()) {
@@ -1081,6 +1081,7 @@ namespace Anabatic {
     rpM1Contact = doRp_Access( getGCell(), rpsM1[0], NoFlags );
 
     if (north() and south()) {
+      cdebug_log(145,0) << "Case north & south." << endl;
       AutoContact* htee = AutoContactHTee::create( getGCell(), getNet(), Session::getContactLayer(1) );
       AutoContact* vtee = AutoContactVTee::create( getGCell(), getNet(), Session::getContactLayer(1) );
 
@@ -1089,6 +1090,7 @@ namespace Anabatic {
       AutoSegment::create( htee        , vtee, Flags::Horizontal );
       setBothCornerContacts( vtee );
     } else if (east() and west()) {
+      cdebug_log(145,0) << "Case east & west." << endl;
       AutoContact* htee1 = AutoContactHTee::create( getGCell(), getNet(), Session::getContactLayer(1) );
       AutoContact* htee2 = AutoContactHTee::create( getGCell(), getNet(), Session::getContactLayer(1) );
       AutoContact* turn  = AutoContactTurn::create( getGCell(), getNet(), Session::getContactLayer(1) );
@@ -1099,18 +1101,17 @@ namespace Anabatic {
       AutoSegment::create( htee2       , turn , Flags::Vertical   );
       setBothCornerContacts( htee2 );
     } else {
+      cdebug_log(145,0) << "Case bend." << endl;
       AutoContact* htee1 = AutoContactHTee::create( getGCell(), getNet(), Session::getContactLayer(1) );
       AutoContact* htee2 = AutoContactHTee::create( getGCell(), getNet(), Session::getContactLayer(1) );
-      AutoContact* turn  = AutoContactTurn::create( getGCell(), getNet(), Session::getContactLayer(1) );
 
       AutoSegment::create( pinM2Contact, htee1, Flags::Horizontal );
       AutoSegment::create( rpM1Contact , htee1, Flags::Vertical   );
       AutoSegment::create( htee1       , htee2, Flags::Horizontal );
-      AutoSegment::create( htee2       , turn , Flags::Vertical   );
-      setNorthEastContact( htee2 );
-      setSouthWestContact( turn  );
+      setBothCornerContacts( htee2 );
     }
-    
+
+    cdebug_log(145,0) << "Wiring all M1 together." << endl;
     for ( size_t i=1 ; i<rpsM1.size() ; ++i ) {
       AutoContact* leftContact  = doRp_Access( getGCell(), getRoutingPads()[i-1], HAccess );
       AutoContact* rightContact = doRp_Access( getGCell(), getRoutingPads()[i  ], HAccess );