diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2019-10-11 15:31:07 +0200 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2019-10-20 09:41:48 +0200 |
| commit | 49b12a828ad647552fa440c42a8000d84ec9d85a (patch) | |
| tree | 703e4b281ee83623806dc5254282073a4a0d4ea2 /ecp5/arch.cc | |
| parent | 1ae64d7bf53cb988003fa9b3eff1f36c30d4d50d (diff) | |
| download | nextpnr-49b12a828ad647552fa440c42a8000d84ec9d85a.tar.gz nextpnr-49b12a828ad647552fa440c42a8000d84ec9d85a.tar.bz2 nextpnr-49b12a828ad647552fa440c42a8000d84ec9d85a.zip | |
Add other side of slice wires
Diffstat (limited to 'ecp5/arch.cc')
| -rw-r--r-- | ecp5/arch.cc | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/ecp5/arch.cc b/ecp5/arch.cc index 74ed57bc..bc533f24 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -635,15 +635,30 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE; int offset = 0; int wire_offset = 0; - if (tilewire >= TILE_WIRE_D7_SLICE && tilewire <=TILE_WIRE_CLK3_SLICE) { offset = 3; wire_offset = tilewire - TILE_WIRE_D7_SLICE + 1; } - if (tilewire >= TILE_WIRE_D5_SLICE && tilewire <=TILE_WIRE_CLK2_SLICE) { offset = 2; wire_offset = tilewire - TILE_WIRE_D5_SLICE + 1; } - if (tilewire >= TILE_WIRE_D3_SLICE && tilewire <=TILE_WIRE_CLK1_SLICE) { offset = 1; wire_offset = tilewire - TILE_WIRE_D3_SLICE + 1; } - if (tilewire >= TILE_WIRE_D1_SLICE && tilewire <=TILE_WIRE_CLK0_SLICE) { offset = 0; wire_offset = tilewire - TILE_WIRE_D1_SLICE + 1; } - el.x1 = x + slice_x1 - 0.005f; - el.x2 = x + slice_x1; - el.y1 = y + slice_y2 - 0.0017f * wire_offset + offset*slice_pitch; - el.y2 = y + slice_y2 - 0.0017f * wire_offset + offset*slice_pitch; - ret.push_back(el); + if (tilewire >= TILE_WIRE_D7_SLICE && tilewire <=TILE_WIRE_CLK0_SLICE) + { + if (tilewire >= TILE_WIRE_D7_SLICE && tilewire <=TILE_WIRE_CLK3_SLICE) { offset = 3; wire_offset = tilewire - TILE_WIRE_D7_SLICE + 1; } + if (tilewire >= TILE_WIRE_D5_SLICE && tilewire <=TILE_WIRE_CLK2_SLICE) { offset = 2; wire_offset = tilewire - TILE_WIRE_D5_SLICE + 1; } + if (tilewire >= TILE_WIRE_D3_SLICE && tilewire <=TILE_WIRE_CLK1_SLICE) { offset = 1; wire_offset = tilewire - TILE_WIRE_D3_SLICE + 1; } + if (tilewire >= TILE_WIRE_D1_SLICE && tilewire <=TILE_WIRE_CLK0_SLICE) { offset = 0; wire_offset = tilewire - TILE_WIRE_D1_SLICE + 1; } + el.x1 = x + slice_x1 - 0.005f; + el.x2 = x + slice_x1; + el.y1 = y + slice_y2 - 0.0017f * wire_offset + offset*slice_pitch; + el.y2 = y + slice_y2 - 0.0017f * wire_offset + offset*slice_pitch; + ret.push_back(el); + } + if (tilewire >= TILE_WIRE_DUMMY_100 && tilewire <=TILE_WIRE_F5A_SLICE) + { + if (tilewire >= TILE_WIRE_DUMMY_100 && tilewire <=TILE_WIRE_F5D_SLICE) { offset = 3; wire_offset = tilewire - TILE_WIRE_DUMMY_100 + 1; } + if (tilewire >= TILE_WIRE_WDO3C_SLICE && tilewire <=TILE_WIRE_F5C_SLICE) { offset = 2; wire_offset = tilewire - TILE_WIRE_WDO3C_SLICE + 1; } + if (tilewire >= TILE_WIRE_DUMMY_300 && tilewire <=TILE_WIRE_F5B_SLICE) { offset = 1; wire_offset = tilewire - TILE_WIRE_DUMMY_300 + 1; } + if (tilewire >= TILE_WIRE_DUMMY_400 && tilewire <=TILE_WIRE_F5A_SLICE) { offset = 0; wire_offset = tilewire - TILE_WIRE_DUMMY_400 + 1; } + el.x1 = x + slice_x2; + el.x2 = x + slice_x2 + 0.005f; + el.y1 = y + slice_y2 - 0.0017f * wire_offset + offset*slice_pitch; + el.y2 = y + slice_y2 - 0.0017f * wire_offset + offset*slice_pitch; + ret.push_back(el); + } } } if (decal.type == DecalId::TYPE_BEL) { |