From 385917059b2d06e3b96140418c966a9099ef1e09 Mon Sep 17 00:00:00 2001
From: "William D. Jones" <thor0505@comcast.net>
Date: Thu, 28 Jan 2021 23:42:15 -0500
Subject: machxo2: Fix typos where absolute positions were treated as relative.

---
 machxo2/arch.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'machxo2/arch.h')

diff --git a/machxo2/arch.h b/machxo2/arch.h
index d87b5dbb..aa4138f2 100644
--- a/machxo2/arch.h
+++ b/machxo2/arch.h
@@ -211,7 +211,7 @@ struct BelPinIterator
     {
         BelPin ret;
         ret.bel.index = ptr->bel_index;
-        ret.bel.location = wire_loc + ptr->rel_bel_loc;
+        ret.bel.location = ptr->rel_bel_loc;
         ret.pin.index = ptr->port;
         return ret;
     }
@@ -338,7 +338,7 @@ struct PipIterator
     {
         PipId ret;
         ret.index = cursor->index;
-        ret.location = wire_loc + cursor->rel_loc;
+        ret.location = cursor->rel_loc;
         return ret;
     }
 };
@@ -752,7 +752,7 @@ struct Arch : BaseCtx
 
         WireId dst;
         dst.index = tileInfo(pip)->pips_data[pip.index].dst_idx;
-        dst.location = pip.location + tileInfo(pip)->pips_data[pip.index].dst;
+        dst.location = tileInfo(pip)->pips_data[pip.index].dst;
         NPNR_ASSERT(wire_to_net[dst] == nullptr);
 
         // Since NetInfo::wires holds info about uphill pips, bind info about
@@ -771,7 +771,7 @@ struct Arch : BaseCtx
 
         WireId dst;
         dst.index = tileInfo(pip)->pips_data[pip.index].dst_idx;
-        dst.location = pip.location + tileInfo(pip)->pips_data[pip.index].dst;
+        dst.location = tileInfo(pip)->pips_data[pip.index].dst;
         NPNR_ASSERT(wire_to_net[dst] != nullptr);
 
         // If we unbind a pip, then the downstream wire is no longer in use
@@ -837,7 +837,7 @@ struct Arch : BaseCtx
         WireId wire;
         NPNR_ASSERT(pip != PipId());
         wire.index = tileInfo(pip)->pips_data[pip.index].src_idx;
-        wire.location = pip.location + tileInfo(pip)->pips_data[pip.index].src;
+        wire.location = tileInfo(pip)->pips_data[pip.index].src;
         return wire;
     }
 
@@ -846,7 +846,7 @@ struct Arch : BaseCtx
         WireId wire;
         NPNR_ASSERT(pip != PipId());
         wire.index = tileInfo(pip)->pips_data[pip.index].dst_idx;
-        wire.location = pip.location + tileInfo(pip)->pips_data[pip.index].dst;
+        wire.location = tileInfo(pip)->pips_data[pip.index].dst;
         return wire;
     }
 
-- 
cgit v1.2.3