From 3da7af9f026004dba6b08ffee1b09bec1506b6ee Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 12 Oct 2019 09:27:55 +0200 Subject: clk and lsr muxes --- ecp5/arch.cc | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- ecp5/gfx.h | 31 ++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/ecp5/arch.cc b/ecp5/arch.cc index 3c56e057..947d0f93 100644 --- a/ecp5/arch.cc +++ b/ecp5/arch.cc @@ -701,7 +701,68 @@ std::vector Arch::getDecalGraphics(DecalId decal) const ret.push_back(el); } } - } + + if (tilewire >= TILE_WIRE_LSR1 && tilewire <=TILE_WIRE_CLK0) + { + GraphicElement el; + el.type = GraphicElement::TYPE_LINE; + el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE; + el.x1 = x + switchbox_x2; + el.x2 = x + switchbox_x2 + 0.0017f * (6-(tilewire-TILE_WIRE_LSR1)); + el.y1 = y + slice_y2 - 0.0017f * (tilewire - TILE_WIRE_LSR1 - 5) + 3*slice_pitch; + el.y2 = y + slice_y2 - 0.0017f * (tilewire - TILE_WIRE_LSR1 - 5) + 3*slice_pitch; + ret.push_back(el); + + if (tilewire == TILE_WIRE_LSR1 || tilewire==TILE_WIRE_LSR0) { + el.x1 = el.x2; + el.y2 = y + slice_y2 - 0.0017f * (TILE_WIRE_CE0 - TILE_WIRE_LSR1 - 5 + 1) + 3*slice_pitch; + ret.push_back(el); + if (tilewire == TILE_WIRE_LSR1) { + for (int i=0;i<2;i++){ + el.x2 = x + slice_x1 - 0.005f; + el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CE0 - TILE_WIRE_LSR1 - 5 - 2) + (3+i)*slice_pitch; + el.y2 = el.y1; + ret.push_back(el); + } + } + } else { + el.x1 = el.x2; + el.y2 = y + slice_y2 - 0.0017f * (TILE_WIRE_CE0 - TILE_WIRE_LSR1 -5 + 2) + 3*slice_pitch; + ret.push_back(el); + if (tilewire == TILE_WIRE_CLK1) { + for (int i=0;i<2;i++){ + el.x2 = x + slice_x1 - 0.005f; + el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CE0 - TILE_WIRE_LSR1 - 5 - 1) + (3+i)*slice_pitch; + el.y2 = el.y1; + ret.push_back(el); + } + } + + } + } + if (tilewire >= TILE_WIRE_MUXCLK3 && tilewire <=TILE_WIRE_MUXCLK0) + { + GraphicElement el; + el.type = GraphicElement::TYPE_LINE; + el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE; + el.x1 = x + switchbox_x2 + 0.0017f * 3; + el.x2 = x + slice_x1 - 0.005f; + el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CE0 - TILE_WIRE_LSR1 - 5 + 2) + (3 + tilewire - TILE_WIRE_MUXCLK3)*slice_pitch; + el.y2 = el.y1; + ret.push_back(el); + } + if (tilewire >= TILE_WIRE_MUXLSR3 && tilewire <=TILE_WIRE_MUXLSR0) + { + GraphicElement el; + el.type = GraphicElement::TYPE_LINE; + el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE; + el.x1 = x + switchbox_x2 + 0.0017f * 5; + el.x2 = x + slice_x1 - 0.005f; + el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CE0 - TILE_WIRE_LSR1 - 5 + 1) + (3 + tilewire - TILE_WIRE_MUXLSR3)*slice_pitch; + el.y2 = el.y1; + ret.push_back(el); + } + } if (decal.type == DecalId::TYPE_BEL) { BelId bel; bel.index = decal.z; diff --git a/ecp5/gfx.h b/ecp5/gfx.h index a5c62508..84891e1d 100644 --- a/ecp5/gfx.h +++ b/ecp5/gfx.h @@ -346,6 +346,37 @@ enum GfxTileWireId TILE_WIRE_DUMMY_526, TILE_WIRE_FCI, + + TILE_WIRE_MUXLSR3, + TILE_WIRE_MUXLSR2, + TILE_WIRE_MUXLSR1, + TILE_WIRE_MUXLSR0, + + TILE_WIRE_MUXCLK3, + TILE_WIRE_MUXCLK2, + TILE_WIRE_MUXCLK1, + TILE_WIRE_MUXCLK0, + + + TILE_WIRE_F7, + TILE_WIRE_Q7, + TILE_WIRE_Q6, + TILE_WIRE_F6, + + TILE_WIRE_F5, + TILE_WIRE_Q5, + TILE_WIRE_Q4, + TILE_WIRE_F4, + + TILE_WIRE_F3, + TILE_WIRE_Q3, + TILE_WIRE_Q2, + TILE_WIRE_F2, + + TILE_WIRE_F1, + TILE_WIRE_Q1, + TILE_WIRE_Q0, + TILE_WIRE_F0, }; NEXTPNR_NAMESPACE_END -- cgit v1.2.3