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

Display rest of slice input wires

Browse Source
This commit is contained in:
Miodrag Milanovic 2019-10-11 08:15:02 +02:00
parent d1dc2c3a5f
commit 1ae64d7bf5
2 changed files with 69 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ecp5/arch.cc
View File

@ -633,10 +633,16 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
GraphicElement el;
el.type = GraphicElement::TYPE_LINE;
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 * tilewire;
el.y2 = y + slice_y2 - 0.0017f * tilewire;
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);
}
}

60
ecp5/gfx.h
View File

@ -51,6 +51,66 @@ enum GfxTileWireId
{
TILE_WIRE_NONE,
TILE_WIRE_D7_SLICE,
TILE_WIRE_C7_SLICE,
TILE_WIRE_B7_SLICE,
TILE_WIRE_A7_SLICE,
TILE_WIRE_D6_SLICE,
TILE_WIRE_C6_SLICE,
TILE_WIRE_B6_SLICE,
TILE_WIRE_A6_SLICE,
TILE_WIRE_DI7_SLICE,
TILE_WIRE_DI6_SLICE,
TILE_WIRE_M7_SLICE,
TILE_WIRE_M6_SLICE,
TILE_WIRE_FXBD_SLICE,
TILE_WIRE_FXAD_SLICE,
TILE_WIRE_WRE3_SLICE_DUMMY,
TILE_WIRE_WCK3_SLICE_DUMMY,
TILE_WIRE_CE3_SLICE,
TILE_WIRE_LSR3_SLICE,
TILE_WIRE_CLK3_SLICE,
TILE_WIRE_D5_SLICE,
TILE_WIRE_C5_SLICE,
TILE_WIRE_B5_SLICE,
TILE_WIRE_A5_SLICE,
TILE_WIRE_D4_SLICE,
TILE_WIRE_C4_SLICE,
TILE_WIRE_B4_SLICE,
TILE_WIRE_A4_SLICE,
TILE_WIRE_DI5_SLICE,
TILE_WIRE_DI4_SLICE,
TILE_WIRE_M5_SLICE,
TILE_WIRE_M4_SLICE,
TILE_WIRE_FXBC_SLICE,
TILE_WIRE_FXAC_SLICE,
TILE_WIRE_WRE2_SLICE_DUMMY,
TILE_WIRE_WCK2_SLICE_DUMMY,
TILE_WIRE_CE2_SLICE,
TILE_WIRE_LSR2_SLICE,
TILE_WIRE_CLK2_SLICE,
TILE_WIRE_D3_SLICE,
TILE_WIRE_C3_SLICE,
TILE_WIRE_B3_SLICE,
TILE_WIRE_A3_SLICE,
TILE_WIRE_D2_SLICE,
TILE_WIRE_C2_SLICE,
TILE_WIRE_B2_SLICE,
TILE_WIRE_A2_SLICE,
TILE_WIRE_DI3_SLICE,
TILE_WIRE_DI2_SLICE,
TILE_WIRE_M3_SLICE,
TILE_WIRE_M2_SLICE,
TILE_WIRE_FXBB_SLICE,
TILE_WIRE_FXAB_SLICE,
TILE_WIRE_WRE1_SLICE,
TILE_WIRE_WCK1_SLICE,
TILE_WIRE_CE1_SLICE,
TILE_WIRE_LSR1_SLICE,
TILE_WIRE_CLK1_SLICE,
TILE_WIRE_D1_SLICE,
TILE_WIRE_C1_SLICE,
TILE_WIRE_B1_SLICE,