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

Add more types of wires

Browse Source
This commit is contained in:
Miodrag Milanovic 2019-10-12 17:53:46 +02:00
parent 28d0313ccc
commit 4cbdc388b8
2 changed files with 225 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
ecp5/arch.cc
View File

@ -649,7 +649,42 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
el.y2 = y + slice_y2 - 0.0017f * (tilewire - TILE_WIRE_DUMMY_100 + 1) + 3*slice_pitch; el.y2 = y + slice_y2 - 0.0017f * (tilewire - TILE_WIRE_DUMMY_100 + 1) + 3*slice_pitch;
ret.push_back(el); ret.push_back(el);
} }
if (tilewire >= TILE_WIRE_FCID_SLICE && tilewire <=TILE_WIRE_FCI_SLICE)
{
GraphicElement el;
el.type = GraphicElement::TYPE_LINE;
el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE;
el.x1 = x + slice_x1 + 0.005f;
el.x2 = x + slice_x1 + 0.005f;
if (tilewire==TILE_WIRE_FCI_SLICE)
el.y1 = y + slice_y1 - 0.0007f + (3-(tilewire - TILE_WIRE_FCID_SLICE))*slice_pitch;
else
el.y1 = y + slice_y1 - 0.00125f + (3-(tilewire - TILE_WIRE_FCID_SLICE))*slice_pitch;
el.y2 = y + slice_y1 + (3-(tilewire - TILE_WIRE_FCID_SLICE))*slice_pitch;
ret.push_back(el);
if (tilewire==TILE_WIRE_FCI_SLICE) {
el.x1 = x + slice_x1 - 0.005f;
el.x2 = x + slice_x1 + 0.005f;
el.y2 = el.y1;
ret.push_back(el);
} }
}
}
if (wire_type == id_WIRE_TYPE_V01) {
if (tilewire >= TILE_WIRE_V01N0001 && tilewire <=TILE_WIRE_V01S0100)
//if (tilewire >= TILE_WIRE_V01N0000 && tilewire <=TILE_WIRE_V01S0101) // not existing in trellis
{
GraphicElement el;
el.type = GraphicElement::TYPE_LINE;
el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE;
el.x1 = x + switchbox_x1 + 0.005f + 0.0017f * (tilewire - TILE_WIRE_V01N0001);
el.x2 = el.x1;
el.y1 = y + switchbox_y1;
el.y2 = y + switchbox_y2 - 1;
ret.push_back(el);
}
}
if (wire_type == id_WIRE_TYPE_NONE) {
if (tilewire >= TILE_WIRE_FCO && tilewire <=TILE_WIRE_FCI) if (tilewire >= TILE_WIRE_FCO && tilewire <=TILE_WIRE_FCI)
{ {
GraphicElement el; GraphicElement el;
@ -681,27 +716,6 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
ret.push_back(el); ret.push_back(el);
} }
} }
if (tilewire >= TILE_WIRE_FCID_SLICE && tilewire <=TILE_WIRE_FCI_SLICE)
{
GraphicElement el;
el.type = GraphicElement::TYPE_LINE;
el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE;
el.x1 = x + slice_x1 + 0.005f;
el.x2 = x + slice_x1 + 0.005f;
if (tilewire==TILE_WIRE_FCI_SLICE)
el.y1 = y + slice_y1 - 0.0007f + (3-(tilewire - TILE_WIRE_FCID_SLICE))*slice_pitch;
else
el.y1 = y + slice_y1 - 0.00125f + (3-(tilewire - TILE_WIRE_FCID_SLICE))*slice_pitch;
el.y2 = y + slice_y1 + (3-(tilewire - TILE_WIRE_FCID_SLICE))*slice_pitch;
ret.push_back(el);
if (tilewire==TILE_WIRE_FCI_SLICE) {
el.x1 = x + slice_x1 - 0.005f;
el.x2 = x + slice_x1 + 0.005f;
el.y2 = el.y1;
ret.push_back(el);
}
}
if (tilewire >= TILE_WIRE_LSR1 && tilewire <=TILE_WIRE_CLK0) if (tilewire >= TILE_WIRE_LSR1 && tilewire <=TILE_WIRE_CLK0)
{ {
GraphicElement el; GraphicElement el;
@ -848,6 +862,7 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
ret.push_back(el); ret.push_back(el);
} }
} }
}
if (decal.type == DecalId::TYPE_BEL) { if (decal.type == DecalId::TYPE_BEL) {
BelId bel; BelId bel;
bel.index = decal.z; bel.index = decal.z;

31
ecp5/gfx.h
View File

@ -387,7 +387,36 @@ enum GfxTileWireId
TILE_WIRE_WAD3, TILE_WIRE_WAD3,
TILE_WIRE_WAD2, TILE_WIRE_WAD2,
TILE_WIRE_WAD1, TILE_WIRE_WAD1,
TILE_WIRE_WAD0 TILE_WIRE_WAD0,
TILE_WIRE_V01N0000,
TILE_WIRE_V01N0100,
TILE_WIRE_V01S0001,
TILE_WIRE_V01S0101,
TILE_WIRE_V01N0001,
TILE_WIRE_V01N0101,
TILE_WIRE_V01S0000,
TILE_WIRE_V01S0100,
TILE_WIRE_V00T0000,
TILE_WIRE_V00T0100,
TILE_WIRE_V00B0000,
TILE_WIRE_V00B0100,
TILE_WIRE_H00L0000,
TILE_WIRE_H00L0100,
TILE_WIRE_H00R0000,
TILE_WIRE_H00R0100,
TILE_WIRE_NBOUNCE,
TILE_WIRE_SBOUNCE,
TILE_WIRE_WBOUNCE,
TILE_WIRE_EBOUNCE
}; };
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END