caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

machxo2: Fix typos where absolute positions were treated as relative.

Browse Source
This commit is contained in:
William D. Jones 2021-01-28 23:42:15 -05:00 committed by gatecat
parent 722d1f2542
commit 385917059b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
machxo2/arch.h
View File

@ -211,7 +211,7 @@ struct BelPinIterator
{ {
BelPin ret; BelPin ret;
ret.bel.index = ptr->bel_index; 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; ret.pin.index = ptr->port;
return ret; return ret;
} }
@ -338,7 +338,7 @@ struct PipIterator
{ {
PipId ret; PipId ret;
ret.index = cursor->index; ret.index = cursor->index;
ret.location = wire_loc + cursor->rel_loc; ret.location = cursor->rel_loc;
return ret; return ret;
} }
}; };
@ -752,7 +752,7 @@ struct Arch : BaseCtx
WireId dst; WireId dst;
dst.index = tileInfo(pip)->pips_data[pip.index].dst_idx; 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); NPNR_ASSERT(wire_to_net[dst] == nullptr);
// Since NetInfo::wires holds info about uphill pips, bind info about // Since NetInfo::wires holds info about uphill pips, bind info about
@ -771,7 +771,7 @@ struct Arch : BaseCtx
WireId dst; WireId dst;
dst.index = tileInfo(pip)->pips_data[pip.index].dst_idx; 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); NPNR_ASSERT(wire_to_net[dst] != nullptr);
// If we unbind a pip, then the downstream wire is no longer in use // If we unbind a pip, then the downstream wire is no longer in use
@ -837,7 +837,7 @@ struct Arch : BaseCtx
WireId wire; WireId wire;
NPNR_ASSERT(pip != PipId()); NPNR_ASSERT(pip != PipId());
wire.index = tileInfo(pip)->pips_data[pip.index].src_idx; 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; return wire;
} }
@ -846,7 +846,7 @@ struct Arch : BaseCtx
WireId wire; WireId wire;
NPNR_ASSERT(pip != PipId()); NPNR_ASSERT(pip != PipId());
wire.index = tileInfo(pip)->pips_data[pip.index].dst_idx; 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; return wire;
} }