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

clangformat run

Browse Source
This commit is contained in:
Miodrag Milanovic 2019-12-08 09:33:06 +01:00
parent 275805d78f
commit 7fd856b866
4 changed files with 367 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ecp5/arch.cc
View File

@ -597,7 +597,6 @@ bool Arch::route()
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
{ {
std::vector<GraphicElement> ret; std::vector<GraphicElement> ret;
@ -641,7 +640,8 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
GfxTileWireId src_id = GfxTileWireId(locInfo(src_wire)->wire_data[src_wire.index].tile_wire); GfxTileWireId src_id = GfxTileWireId(locInfo(src_wire)->wire_data[src_wire.index].tile_wire);
GfxTileWireId dst_id = GfxTileWireId(locInfo(dst_wire)->wire_data[dst_wire.index].tile_wire); GfxTileWireId dst_id = GfxTileWireId(locInfo(dst_wire)->wire_data[dst_wire.index].tile_wire);
GraphicElement::style_t style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_HIDDEN; GraphicElement::style_t style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_HIDDEN;
gfxTilePip(ret, x, y, chip_info->width, chip_info->height, src_wire, getWireType(src_wire), src_id, dst_wire, getWireType(dst_wire), dst_id, style); gfxTilePip(ret, x, y, chip_info->width, chip_info->height, src_wire, getWireType(src_wire), src_id, dst_wire,
getWireType(dst_wire), dst_id, style);
} else if (decal.type == DecalId::TYPE_BEL) { } else if (decal.type == DecalId::TYPE_BEL) {
BelId bel; BelId bel;
bel.index = decal.z; bel.index = decal.z;
@ -664,10 +664,12 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
el.style = GraphicElement::STYLE_FRAME; el.style = GraphicElement::STYLE_FRAME;
el.x1 = x + slice_x2 + 0.0255f; el.x1 = x + slice_x2 + 0.0255f;
el.x2 = el.x1 + 0.0017f; el.x2 = el.x1 + 0.0017f;
el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CLK3_SLICE - TILE_WIRE_DUMMY_D2 + 5 + z*26) + 3*slice_pitch - 0.0007f; el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CLK3_SLICE - TILE_WIRE_DUMMY_D2 + 5 + z * 26) +
3 * slice_pitch - 0.0007f;
el.y2 = el.y1 + 0.0017f * 5; el.y2 = el.y1 + 0.0017f * 5;
ret.push_back(el); ret.push_back(el);
} else if (bel_type == id_TRELLIS_IO || bel_type == id_IOLOGIC || bel_type == id_SIOLOGIC || bel_type == id_DQSBUFM) { } else if (bel_type == id_TRELLIS_IO || bel_type == id_IOLOGIC || bel_type == id_SIOLOGIC ||
bel_type == id_DQSBUFM) {
bool top_bottom = (y == 0 || y == (chip_info->height - 1)); bool top_bottom = (y == 0 || y == (chip_info->height - 1));
GraphicElement el; GraphicElement el;
el.type = GraphicElement::TYPE_BOX; el.type = GraphicElement::TYPE_BOX;
@ -721,7 +723,8 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
el.y1 = y + slice_y1; el.y1 = y + slice_y1;
el.y2 = y + slice_y2; el.y2 = y + slice_y2;
ret.push_back(el); ret.push_back(el);
} else if (bel_type == id_DCUA || bel_type == id_EXTREFB || bel_type == id_PCSCLKDIV || bel_type == id_DTR || bel_type == id_USRMCLK) { } else if (bel_type == id_DCUA || bel_type == id_EXTREFB || bel_type == id_PCSCLKDIV || bel_type == id_DTR ||
bel_type == id_USRMCLK) {
GraphicElement el; GraphicElement el;
el.type = GraphicElement::TYPE_BOX; el.type = GraphicElement::TYPE_BOX;
el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE; el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE;
@ -748,7 +751,8 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
el.y1 = y + 0.2; el.y1 = y + 0.2;
el.y2 = y + 0.8; el.y2 = y + 0.8;
ret.push_back(el); ret.push_back(el);
} else if (bel_type == id_DLLDELD || bel_type == id_CLKDIVF || bel_type == id_ECLKSYNCB || bel_type == id_TRELLIS_ECLKBUF || bel_type == id_ECLKBRIDGECS) { } else if (bel_type == id_DLLDELD || bel_type == id_CLKDIVF || bel_type == id_ECLKSYNCB ||
bel_type == id_TRELLIS_ECLKBUF || bel_type == id_ECLKBRIDGECS) {
GraphicElement el; GraphicElement el;
el.type = GraphicElement::TYPE_BOX; el.type = GraphicElement::TYPE_BOX;
el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE; el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE;
@ -1286,7 +1290,6 @@ std::vector<GroupId> Arch::getGroupGroups(GroupId group) const
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
std::vector<std::pair<IdString, std::string>> Arch::getWireAttrs(WireId wire) const std::vector<std::pair<IdString, std::string>> Arch::getWireAttrs(WireId wire) const
{ {
std::vector<std::pair<IdString, std::string>> ret; std::vector<std::pair<IdString, std::string>> ret;

206
ecp5/gfx.cc
View File

@ -22,14 +22,14 @@
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdString wire_type, GfxTileWireId tilewire, GraphicElement::style_t style) void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdString wire_type, GfxTileWireId tilewire,
GraphicElement::style_t style)
{ {
if (wire_type == id_WIRE_TYPE_SLICE && tilewire != GfxTileWireId::TILE_WIRE_NONE) { if (wire_type == id_WIRE_TYPE_SLICE && tilewire != GfxTileWireId::TILE_WIRE_NONE) {
GraphicElement el; GraphicElement el;
el.type = GraphicElement::TYPE_LINE; el.type = GraphicElement::TYPE_LINE;
el.style = style; el.style = style;
if (tilewire >= TILE_WIRE_FCO_SLICE && tilewire <=TILE_WIRE_FCI_SLICE) if (tilewire >= TILE_WIRE_FCO_SLICE && tilewire <= TILE_WIRE_FCI_SLICE) {
{
int gap = (tilewire - TILE_WIRE_FCO_SLICE) / 24; int gap = (tilewire - TILE_WIRE_FCO_SLICE) / 24;
int item = (tilewire - TILE_WIRE_FCO_SLICE) % 24; int item = (tilewire - TILE_WIRE_FCO_SLICE) % 24;
el.x1 = x + slice_x1 - 0.005f; el.x1 = x + slice_x1 - 0.005f;
@ -38,29 +38,25 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
el.y2 = y + slice_y2 - 0.0017f * (tilewire - TILE_WIRE_FCO_SLICE + 1 + gap * 2) + 3 * slice_pitch; el.y2 = y + slice_y2 - 0.0017f * (tilewire - TILE_WIRE_FCO_SLICE + 1 + gap * 2) + 3 * slice_pitch;
g.push_back(el); g.push_back(el);
// FX to F connection - top // FX to F connection - top
if (item == (TILE_WIRE_FXD_SLICE-TILE_WIRE_FCO_SLICE)) if (item == (TILE_WIRE_FXD_SLICE - TILE_WIRE_FCO_SLICE)) {
{
el.x2 = el.x1; el.x2 = el.x1;
el.y2 = el.y1 - 0.0017f; el.y2 = el.y1 - 0.0017f;
g.push_back(el); g.push_back(el);
} }
// F5 to F connection - bottom // F5 to F connection - bottom
if (item == (TILE_WIRE_F5D_SLICE-TILE_WIRE_FCO_SLICE)) if (item == (TILE_WIRE_F5D_SLICE - TILE_WIRE_FCO_SLICE)) {
{
el.x2 = el.x1; el.x2 = el.x1;
el.y2 = el.y1 + 0.0017f; el.y2 = el.y1 + 0.0017f;
g.push_back(el); g.push_back(el);
} }
// connection between slices // connection between slices
if (item == (TILE_WIRE_FCID_SLICE-TILE_WIRE_FCO_SLICE) && tilewire!=TILE_WIRE_FCI_SLICE) if (item == (TILE_WIRE_FCID_SLICE - TILE_WIRE_FCO_SLICE) && tilewire != TILE_WIRE_FCI_SLICE) {
{
el.x2 = el.x1; el.x2 = el.x1;
el.y2 = el.y1 - 0.0017f * 3; el.y2 = el.y1 - 0.0017f * 3;
g.push_back(el); g.push_back(el);
} }
} }
if (tilewire >= TILE_WIRE_DUMMY_D2 && tilewire <=TILE_WIRE_WAD0A_SLICE) if (tilewire >= TILE_WIRE_DUMMY_D2 && tilewire <= TILE_WIRE_WAD0A_SLICE) {
{
int gap = (tilewire - TILE_WIRE_DUMMY_D2) / 12; int gap = (tilewire - TILE_WIRE_DUMMY_D2) / 12;
el.x1 = x + slice_x2 + 0.005f; el.x1 = x + slice_x2 + 0.005f;
el.x2 = x + slice_x2; el.x2 = x + slice_x2;
@ -70,8 +66,7 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
} }
} }
if (wire_type == id_WIRE_TYPE_V01) { if (wire_type == id_WIRE_TYPE_V01) {
if (tilewire >= TILE_WIRE_V01N0001 && tilewire <=TILE_WIRE_V01S0100) if (tilewire >= TILE_WIRE_V01N0001 && tilewire <= TILE_WIRE_V01S0100) {
{
GraphicElement el; GraphicElement el;
el.type = GraphicElement::TYPE_LINE; el.type = GraphicElement::TYPE_LINE;
el.style = style; el.style = style;
@ -91,8 +86,7 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
} }
} }
if (wire_type == id_WIRE_TYPE_H01) { if (wire_type == id_WIRE_TYPE_H01) {
if (tilewire >= TILE_WIRE_H01E0001 && tilewire <=TILE_WIRE_HL7W0001) if (tilewire >= TILE_WIRE_H01E0001 && tilewire <= TILE_WIRE_HL7W0001) {
{
GraphicElement el; GraphicElement el;
el.type = GraphicElement::TYPE_LINE; el.type = GraphicElement::TYPE_LINE;
el.style = style; el.style = style;
@ -154,18 +148,21 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
el.x2 = el.x1; el.x2 = el.x1;
el.y1 = y + switchbox_y1; el.y1 = y + switchbox_y1;
el.y2 = y + switchbox_y1 - 0.0017f * (20 + (tilewire - TILE_WIRE_H02W0701) + 20 * (x % 3)); el.y2 = y + switchbox_y1 - 0.0017f * (20 + (tilewire - TILE_WIRE_H02W0701) + 20 * (x % 3));
if (x!=0 && x!=w-1) g.push_back(el); if (x != 0 && x != w - 1)
g.push_back(el);
if (x == w - 2) if (x == w - 2)
el.x2 = x + 1 + 0.1; el.x2 = x + 1 + 0.1;
else else
el.x2 = x + 1 + switchbox_x1 + 0.0017f * (16 + (tilewire - TILE_WIRE_H02W0701) + 20 * (x % 3)); el.x2 = x + 1 + switchbox_x1 + 0.0017f * (16 + (tilewire - TILE_WIRE_H02W0701) + 20 * (x % 3));
el.y1 = el.y2; el.y1 = el.y2;
if (x!=w-1) g.push_back(el); if (x != w - 1)
g.push_back(el);
el.x1 = el.x2; el.x1 = el.x2;
el.y1 = y + switchbox_y1; el.y1 = y + switchbox_y1;
if (x!=w-1 && x!=w-2) g.push_back(el); if (x != w - 1 && x != w - 2)
g.push_back(el);
if (x == w - 1) if (x == w - 1)
el.x1 = x + 0.1; el.x1 = x + 0.1;
@ -177,11 +174,13 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
el.x2 = x - 1 + switchbox_x1 + 0.0017f * (16 + (tilewire - TILE_WIRE_H02W0701) + 20 * (x % 3)); el.x2 = x - 1 + switchbox_x1 + 0.0017f * (16 + (tilewire - TILE_WIRE_H02W0701) + 20 * (x % 3));
el.y2 = y + switchbox_y1 - 0.0017f * (20 + (tilewire - TILE_WIRE_H02W0701) + 20 * (x % 3)); el.y2 = y + switchbox_y1 - 0.0017f * (20 + (tilewire - TILE_WIRE_H02W0701) + 20 * (x % 3));
el.y1 = el.y2; el.y1 = el.y2;
if (x!=0) g.push_back(el); if (x != 0)
g.push_back(el);
el.x1 = el.x2; el.x1 = el.x2;
el.y1 = y + switchbox_y1; el.y1 = y + switchbox_y1;
if (x!=0 && x!=1) g.push_back(el); if (x != 0 && x != 1)
g.push_back(el);
} }
if (wire_type == id_WIRE_TYPE_V02) { if (wire_type == id_WIRE_TYPE_V02) {
@ -195,18 +194,21 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
el.y2 = el.y1; el.y2 = el.y1;
el.x1 = x + switchbox_x1; el.x1 = x + switchbox_x1;
el.x2 = x + switchbox_x1 - 0.0017f * (20 + (tilewire - TILE_WIRE_V02N0701) + 20 * (y % 3)); el.x2 = x + switchbox_x1 - 0.0017f * (20 + (tilewire - TILE_WIRE_V02N0701) + 20 * (y % 3));
if (y!=0 && y!=h-1) g.push_back(el); if (y != 0 && y != h - 1)
g.push_back(el);
if (y == h - 2) if (y == h - 2)
el.y2 = y + 1 + 0.1; el.y2 = y + 1 + 0.1;
else else
el.y2 = y + 1 + switchbox_y1 + 0.0017f * (20 + (tilewire - TILE_WIRE_V02N0701) + 20 * (y % 3)); el.y2 = y + 1 + switchbox_y1 + 0.0017f * (20 + (tilewire - TILE_WIRE_V02N0701) + 20 * (y % 3));
el.x1 = el.x2; el.x1 = el.x2;
if (y!=h-1) g.push_back(el); if (y != h - 1)
g.push_back(el);
el.y1 = el.y2; el.y1 = el.y2;
el.x1 = x + switchbox_x1; el.x1 = x + switchbox_x1;
if (y!=h-1 && y!=h-2) g.push_back(el); if (y != h - 1 && y != h - 2)
g.push_back(el);
if (y == h - 1) if (y == h - 1)
el.y1 = y + 0.1; el.y1 = y + 0.1;
@ -218,11 +220,13 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
el.y2 = y - 1 + switchbox_y1 + 0.0017f * (20 + (tilewire - TILE_WIRE_V02N0701) + 20 * (y % 3)); el.y2 = y - 1 + switchbox_y1 + 0.0017f * (20 + (tilewire - TILE_WIRE_V02N0701) + 20 * (y % 3));
el.x2 = x + switchbox_x1 - 0.0017f * (20 + (tilewire - TILE_WIRE_V02N0701) + 20 * (y % 3)); el.x2 = x + switchbox_x1 - 0.0017f * (20 + (tilewire - TILE_WIRE_V02N0701) + 20 * (y % 3));
el.x1 = el.x2; el.x1 = el.x2;
if (y!=0) g.push_back(el); if (y != 0)
g.push_back(el);
el.y1 = el.y2; el.y1 = el.y2;
el.x1 = x + switchbox_x1; el.x1 = x + switchbox_x1;
if (y!=0 && y!=1) g.push_back(el); if (y != 0 && y != 1)
g.push_back(el);
} }
if (wire_type == id_WIRE_TYPE_H06) { if (wire_type == id_WIRE_TYPE_H06) {
@ -236,18 +240,21 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
el.x2 = el.x1; el.x2 = el.x1;
el.y1 = y + switchbox_y1; el.y1 = y + switchbox_y1;
el.y2 = y + switchbox_y1 - 0.0017f * (96 + (tilewire - TILE_WIRE_H06W0303) + 10 * (x % 9)); el.y2 = y + switchbox_y1 - 0.0017f * (96 + (tilewire - TILE_WIRE_H06W0303) + 10 * (x % 9));
if (x!=0 && x!=w-1) g.push_back(el); if (x != 0 && x != w - 1)
g.push_back(el);
if (x == w - 2 || x == w - 3 || x == w - 4) if (x == w - 2 || x == w - 3 || x == w - 4)
el.x2 = w - 1 + 0.1; el.x2 = w - 1 + 0.1;
else else
el.x2 = x + 3 + switchbox_x1 + 0.0017f * (96 + (tilewire - TILE_WIRE_H06W0303) + 10 * (x % 9)); el.x2 = x + 3 + switchbox_x1 + 0.0017f * (96 + (tilewire - TILE_WIRE_H06W0303) + 10 * (x % 9));
el.y1 = el.y2; el.y1 = el.y2;
if (x!=w-1) g.push_back(el); if (x != w - 1)
g.push_back(el);
el.x1 = el.x2; el.x1 = el.x2;
el.y1 = y + switchbox_y1; el.y1 = y + switchbox_y1;
if (x!=w-1 && x!=w-2 && x!=w-3 && x!=w-4) g.push_back(el); if (x != w - 1 && x != w - 2 && x != w - 3 && x != w - 4)
g.push_back(el);
if (x == w - 1) if (x == w - 1)
el.x1 = x + 0.1; el.x1 = x + 0.1;
@ -259,11 +266,13 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
el.x2 = x - 3 + switchbox_x1 + 0.0017f * (96 + (tilewire - TILE_WIRE_H06W0303) + 10 * (x % 9)); el.x2 = x - 3 + switchbox_x1 + 0.0017f * (96 + (tilewire - TILE_WIRE_H06W0303) + 10 * (x % 9));
el.y2 = y + switchbox_y1 - 0.0017f * (96 + (tilewire - TILE_WIRE_H06W0303) + 10 * (x % 9)); el.y2 = y + switchbox_y1 - 0.0017f * (96 + (tilewire - TILE_WIRE_H06W0303) + 10 * (x % 9));
el.y1 = el.y2; el.y1 = el.y2;
if (x!=0) g.push_back(el); if (x != 0)
g.push_back(el);
el.x1 = el.x2; el.x1 = el.x2;
el.y1 = y + switchbox_y1; el.y1 = y + switchbox_y1;
if (x!=0 && x!=1 && x!=2 && x!=3) g.push_back(el); if (x != 0 && x != 1 && x != 2 && x != 3)
g.push_back(el);
} }
if (wire_type == id_WIRE_TYPE_V06) { if (wire_type == id_WIRE_TYPE_V06) {
GraphicElement el; GraphicElement el;
@ -276,18 +285,21 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
el.y2 = el.y1; el.y2 = el.y1;
el.x1 = x + switchbox_x1; el.x1 = x + switchbox_x1;
el.x2 = x + switchbox_x1 - 0.0017f * (96 + (tilewire - TILE_WIRE_V06N0303) + 10 * (y % 9)); el.x2 = x + switchbox_x1 - 0.0017f * (96 + (tilewire - TILE_WIRE_V06N0303) + 10 * (y % 9));
if (y!=0 && y!=h-1) g.push_back(el); if (y != 0 && y != h - 1)
g.push_back(el);
if (y == h - 2 || y == h - 3 || y == h - 4) if (y == h - 2 || y == h - 3 || y == h - 4)
el.y2 = h - 1 + 0.1; el.y2 = h - 1 + 0.1;
else else
el.y2 = y + 3 + switchbox_y1 + 0.0017f * (96 + (tilewire - TILE_WIRE_V06N0303) + 10 * (y % 9)); el.y2 = y + 3 + switchbox_y1 + 0.0017f * (96 + (tilewire - TILE_WIRE_V06N0303) + 10 * (y % 9));
el.x1 = el.x2; el.x1 = el.x2;
if (y!=h-1) g.push_back(el); if (y != h - 1)
g.push_back(el);
el.y1 = el.y2; el.y1 = el.y2;
el.x1 = x + switchbox_x1; el.x1 = x + switchbox_x1;
if (y!=h-1 && y!=h-2 && y!=h-3 && y!=h-4) g.push_back(el); if (y != h - 1 && y != h - 2 && y != h - 3 && y != h - 4)
g.push_back(el);
if (y == h - 1) if (y == h - 1)
el.y1 = y + 0.1; el.y1 = y + 0.1;
@ -299,15 +311,16 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
el.y2 = y - 3 + switchbox_y1 + 0.0017f * (96 + (tilewire - TILE_WIRE_V06N0303) + 10 * (y % 9)); el.y2 = y - 3 + switchbox_y1 + 0.0017f * (96 + (tilewire - TILE_WIRE_V06N0303) + 10 * (y % 9));
el.x2 = x + switchbox_x1 - 0.0017f * (96 + (tilewire - TILE_WIRE_V06N0303) + 10 * (y % 9)); el.x2 = x + switchbox_x1 - 0.0017f * (96 + (tilewire - TILE_WIRE_V06N0303) + 10 * (y % 9));
el.x1 = el.x2; el.x1 = el.x2;
if (y!=0) g.push_back(el); if (y != 0)
g.push_back(el);
el.y1 = el.y2; el.y1 = el.y2;
el.x1 = x + switchbox_x1; el.x1 = x + switchbox_x1;
if (y!=0 && y!=1 && y!=2 && y!=3) g.push_back(el); if (y != 0 && y != 1 && y != 2 && y != 3)
g.push_back(el);
} }
if (wire_type == id_WIRE_TYPE_NONE) { if (wire_type == id_WIRE_TYPE_NONE) {
if (tilewire >= TILE_WIRE_NBOUNCE && tilewire <=TILE_WIRE_SBOUNCE) if (tilewire >= TILE_WIRE_NBOUNCE && tilewire <= TILE_WIRE_SBOUNCE) {
{
GraphicElement el; GraphicElement el;
el.type = GraphicElement::TYPE_LINE; el.type = GraphicElement::TYPE_LINE;
el.style = style; el.style = style;
@ -322,8 +335,7 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
} }
g.push_back(el); g.push_back(el);
} }
if (tilewire >= TILE_WIRE_WBOUNCE && tilewire <=TILE_WIRE_EBOUNCE) if (tilewire >= TILE_WIRE_WBOUNCE && tilewire <= TILE_WIRE_EBOUNCE) {
{
GraphicElement el; GraphicElement el;
el.type = GraphicElement::TYPE_LINE; el.type = GraphicElement::TYPE_LINE;
el.style = style; el.style = style;
@ -338,8 +350,7 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
} }
g.push_back(el); g.push_back(el);
} }
if (tilewire >= TILE_WIRE_CLK0 && tilewire <=TILE_WIRE_LSR1) if (tilewire >= TILE_WIRE_CLK0 && tilewire <= TILE_WIRE_LSR1) {
{
GraphicElement el; GraphicElement el;
el.type = GraphicElement::TYPE_LINE; el.type = GraphicElement::TYPE_LINE;
el.style = style; el.style = style;
@ -351,28 +362,30 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
el.x1 = el.x2; el.x1 = el.x2;
el.y2 = y + slice_y2 - 0.0017f * (3 + (tilewire - TILE_WIRE_CLK0)); el.y2 = y + slice_y2 - 0.0017f * (3 + (tilewire - TILE_WIRE_CLK0));
g.push_back(el); g.push_back(el);
for (int i=0;i<4;i++) for (int i = 0; i < 4; i++) {
{
el.x1 = x + slice_x2 + 0.0255f + 0.0017f; el.x1 = x + slice_x2 + 0.0255f + 0.0017f;
el.x2 = x + slice_x2 + 0.0255f + (8 - (tilewire - TILE_WIRE_CLK0)) * 0.0017f; el.x2 = x + slice_x2 + 0.0255f + (8 - (tilewire - TILE_WIRE_CLK0)) * 0.0017f;
el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CLK3_SLICE - TILE_WIRE_DUMMY_D2 + 1 + tilewire - TILE_WIRE_CLK0)+ i*slice_pitch; el.y1 = y + slice_y2 -
0.0017f * (TILE_WIRE_CLK3_SLICE - TILE_WIRE_DUMMY_D2 + 1 + tilewire - TILE_WIRE_CLK0) +
i * slice_pitch;
el.y2 = el.y1; el.y2 = el.y1;
g.push_back(el); g.push_back(el);
} }
if (tilewire == TILE_WIRE_CLK1 || tilewire == TILE_WIRE_LSR1) { if (tilewire == TILE_WIRE_CLK1 || tilewire == TILE_WIRE_LSR1) {
for (int i=0;i<2;i++) for (int i = 0; i < 2; i++) {
{
el.x1 = x + slice_x2 + 0.0051f; el.x1 = x + slice_x2 + 0.0051f;
el.x2 = x + slice_x2 + 0.0255f + (8 - (tilewire - TILE_WIRE_CLK0)) * 0.0017f; el.x2 = x + slice_x2 + 0.0255f + (8 - (tilewire - TILE_WIRE_CLK0)) * 0.0017f;
el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CLK3_SLICE - TILE_WIRE_DUMMY_D2 - 1 + (tilewire - TILE_WIRE_CLK0)/2)+ i*slice_pitch; el.y1 = y + slice_y2 -
0.0017f *
(TILE_WIRE_CLK3_SLICE - TILE_WIRE_DUMMY_D2 - 1 + (tilewire - TILE_WIRE_CLK0) / 2) +
i * slice_pitch;
el.y2 = el.y1; el.y2 = el.y1;
g.push_back(el); g.push_back(el);
} }
} }
} }
if (tilewire >= TILE_WIRE_FCO && tilewire <=TILE_WIRE_FCI) if (tilewire >= TILE_WIRE_FCO && tilewire <= TILE_WIRE_FCI) {
{
int gap = (tilewire - TILE_WIRE_FCO) / 24; int gap = (tilewire - TILE_WIRE_FCO) / 24;
GraphicElement el; GraphicElement el;
el.type = GraphicElement::TYPE_LINE; el.type = GraphicElement::TYPE_LINE;
@ -384,8 +397,7 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
g.push_back(el); g.push_back(el);
} }
if (tilewire >= TILE_WIRE_MUXCLK3 && tilewire <=TILE_WIRE_MUXLSR0) if (tilewire >= TILE_WIRE_MUXCLK3 && tilewire <= TILE_WIRE_MUXLSR0) {
{
int gap = (tilewire - TILE_WIRE_MUXCLK3) / 2; int gap = (tilewire - TILE_WIRE_MUXCLK3) / 2;
int part = (tilewire - TILE_WIRE_MUXCLK3) % 2; int part = (tilewire - TILE_WIRE_MUXCLK3) % 2;
GraphicElement el; GraphicElement el;
@ -393,13 +405,13 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
el.style = style; el.style = style;
el.x1 = x + slice_x2 + 0.0051f; el.x1 = x + slice_x2 + 0.0051f;
el.x2 = x + slice_x2 + 0.0255f; el.x2 = x + slice_x2 + 0.0255f;
el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CLK3_SLICE - TILE_WIRE_DUMMY_D2 + 1 + part + gap*26) + 3*slice_pitch; el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CLK3_SLICE - TILE_WIRE_DUMMY_D2 + 1 + part + gap * 26) +
3 * slice_pitch;
el.y2 = el.y1; el.y2 = el.y1;
g.push_back(el); g.push_back(el);
} }
if (tilewire >= TILE_WIRE_WD3 && tilewire <=TILE_WIRE_WD0) if (tilewire >= TILE_WIRE_WD3 && tilewire <= TILE_WIRE_WD0) {
{
GraphicElement el; GraphicElement el;
int part = (tilewire - TILE_WIRE_WD3) % 4; int part = (tilewire - TILE_WIRE_WD3) % 4;
int group = (tilewire - TILE_WIRE_WD3) / 2; int group = (tilewire - TILE_WIRE_WD3) / 2;
@ -407,32 +419,35 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
el.style = style; el.style = style;
el.x1 = x + slice_x2 + 0.005f; el.x1 = x + slice_x2 + 0.005f;
el.x2 = x + slice_x2 + 0.005f + 0.0017f * (4 - part); el.x2 = x + slice_x2 + 0.005f + 0.0017f * (4 - part);
el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_WDO3C_SLICE - TILE_WIRE_DUMMY_D2 + 1 + part + 14) + 3*slice_pitch; el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_WDO3C_SLICE - TILE_WIRE_DUMMY_D2 + 1 + part + 14) +
3 * slice_pitch;
el.y2 = el.y1; el.y2 = el.y1;
g.push_back(el); g.push_back(el);
el.x1 = el.x2; el.x1 = el.x2;
el.y2 = y + slice_y2 - 0.0017f * (TILE_WIRE_WD1B_SLICE - TILE_WIRE_DUMMY_D2 + 1 + (part & 1) + 14*2) + (3-group)*slice_pitch; el.y2 = y + slice_y2 - 0.0017f * (TILE_WIRE_WD1B_SLICE - TILE_WIRE_DUMMY_D2 + 1 + (part & 1) + 14 * 2) +
(3 - group) * slice_pitch;
g.push_back(el); g.push_back(el);
el.x1 = x + slice_x2 + 0.005f; el.x1 = x + slice_x2 + 0.005f;
el.y1 = el.y2; el.y1 = el.y2;
g.push_back(el); g.push_back(el);
} }
if (tilewire >= TILE_WIRE_WAD3 && tilewire <=TILE_WIRE_WAD0) if (tilewire >= TILE_WIRE_WAD3 && tilewire <= TILE_WIRE_WAD0) {
{
GraphicElement el; GraphicElement el;
int part = (tilewire - TILE_WIRE_WAD3) % 4; int part = (tilewire - TILE_WIRE_WAD3) % 4;
el.type = GraphicElement::TYPE_LINE; el.type = GraphicElement::TYPE_LINE;
el.style = style; el.style = style;
el.x1 = x + slice_x2 + 0.005f; el.x1 = x + slice_x2 + 0.005f;
el.x2 = x + slice_x2 + 0.005f + 0.0017f * (8 - part); el.x2 = x + slice_x2 + 0.005f + 0.0017f * (8 - part);
el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_WADO3C_SLICE - TILE_WIRE_DUMMY_D2 + 1 + part+ 14) + 3*slice_pitch; el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_WADO3C_SLICE - TILE_WIRE_DUMMY_D2 + 1 + part + 14) +
3 * slice_pitch;
el.y2 = el.y1; el.y2 = el.y1;
g.push_back(el); g.push_back(el);
el.x1 = el.x2; el.x1 = el.x2;
el.y2 = y + slice_y2 - 0.0017f * (TILE_WIRE_WAD3B_SLICE - TILE_WIRE_DUMMY_D2 + 1 + part+ 14*2) + 2*slice_pitch; el.y2 = y + slice_y2 - 0.0017f * (TILE_WIRE_WAD3B_SLICE - TILE_WIRE_DUMMY_D2 + 1 + part + 14 * 2) +
2 * slice_pitch;
g.push_back(el); g.push_back(el);
el.x1 = x + slice_x2 + 0.005f; el.x1 = x + slice_x2 + 0.005f;
@ -442,12 +457,12 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdS
// middle line // middle line
el.x1 = x + slice_x2 + 0.005f; el.x1 = x + slice_x2 + 0.005f;
el.x2 = x + slice_x2 + 0.005f + 0.0017f * (8 - part); el.x2 = x + slice_x2 + 0.005f + 0.0017f * (8 - part);
el.y2 = y + slice_y2 - 0.0017f * (TILE_WIRE_WAD3B_SLICE - TILE_WIRE_DUMMY_D2 + 1 + part+ 14*2) + 3*slice_pitch; el.y2 = y + slice_y2 - 0.0017f * (TILE_WIRE_WAD3B_SLICE - TILE_WIRE_DUMMY_D2 + 1 + part + 14 * 2) +
3 * slice_pitch;
el.y1 = el.y2; el.y1 = el.y2;
g.push_back(el); g.push_back(el);
} }
} }
} }
void setSource(GraphicElement &el, int x, int y, WireId src, IdString src_type, GfxTileWireId src_id) void setSource(GraphicElement &el, int x, int y, WireId src, IdString src_type, GfxTileWireId src_id)
@ -556,8 +571,7 @@ void setDestination(GraphicElement &el, int x, int y, WireId dst, IdString dst_t
} }
if (dst_type == id_WIRE_TYPE_NONE) { if (dst_type == id_WIRE_TYPE_NONE) {
if (dst_id >= TILE_WIRE_FCO && dst_id <=TILE_WIRE_FCI) if (dst_id >= TILE_WIRE_FCO && dst_id <= TILE_WIRE_FCI) {
{
int gap = (dst_id - TILE_WIRE_FCO) / 24; int gap = (dst_id - TILE_WIRE_FCO) / 24;
el.x2 = x + switchbox_x2; el.x2 = x + switchbox_x2;
el.y2 = y + slice_y2 - 0.0017f * (dst_id - TILE_WIRE_FCO + 1 + gap * 2) + 3 * slice_pitch; el.y2 = y + slice_y2 - 0.0017f * (dst_id - TILE_WIRE_FCO + 1 + gap * 2) + 3 * slice_pitch;
@ -565,14 +579,17 @@ void setDestination(GraphicElement &el, int x, int y, WireId dst, IdString dst_t
} }
} }
void straightLine(std::vector<GraphicElement> &g, GraphicElement &el,int x, int y, WireId src, IdString src_type, GfxTileWireId src_id,WireId dst, IdString dst_type, GfxTileWireId dst_id) void straightLine(std::vector<GraphicElement> &g, GraphicElement &el, int x, int y, WireId src, IdString src_type,
GfxTileWireId src_id, WireId dst, IdString dst_type, GfxTileWireId dst_id)
{ {
setSource(el, x, y, src, src_type, src_id); setSource(el, x, y, src, src_type, src_id);
setDestination(el, x, y, dst, dst_type, dst_id); setDestination(el, x, y, dst, dst_type, dst_id);
g.push_back(el); g.push_back(el);
} }
void toSameSideHor(std::vector<GraphicElement> &g, GraphicElement &el,int x, int y, WireId src, IdString src_type, GfxTileWireId src_id,WireId dst, IdString dst_type, GfxTileWireId dst_id, GraphicElement::style_t style, int idx) void toSameSideHor(std::vector<GraphicElement> &g, GraphicElement &el, int x, int y, WireId src, IdString src_type,
GfxTileWireId src_id, WireId dst, IdString dst_type, GfxTileWireId dst_id,
GraphicElement::style_t style, int idx)
{ {
int sign = (src_type == dst_type) ? 1 : -1; int sign = (src_type == dst_type) ? 1 : -1;
setSource(el, x, y, src, src_type, src_id); setSource(el, x, y, src, src_type, src_id);
@ -595,7 +612,9 @@ void toSameSideHor(std::vector<GraphicElement> &g, GraphicElement &el,int x, int
g.push_back(el2); g.push_back(el2);
} }
void toSameSideVer(std::vector<GraphicElement> &g, GraphicElement &el,int x, int y, WireId src, IdString src_type, GfxTileWireId src_id,WireId dst, IdString dst_type, GfxTileWireId dst_id, GraphicElement::style_t style, int idx) void toSameSideVer(std::vector<GraphicElement> &g, GraphicElement &el, int x, int y, WireId src, IdString src_type,
GfxTileWireId src_id, WireId dst, IdString dst_type, GfxTileWireId dst_id,
GraphicElement::style_t style, int idx)
{ {
int sign = (src_type == dst_type) ? 1 : -1; int sign = (src_type == dst_type) ? 1 : -1;
setSource(el, x, y, src, src_type, src_id); setSource(el, x, y, src, src_type, src_id);
@ -618,7 +637,9 @@ void toSameSideVer(std::vector<GraphicElement> &g, GraphicElement &el,int x, int
g.push_back(el2); g.push_back(el2);
} }
void toSameSideH1Ver(std::vector<GraphicElement> &g, GraphicElement &el,int x, int y, WireId src, IdString src_type, GfxTileWireId src_id,WireId dst, IdString dst_type, GfxTileWireId dst_id, GraphicElement::style_t style, int idx) void toSameSideH1Ver(std::vector<GraphicElement> &g, GraphicElement &el, int x, int y, WireId src, IdString src_type,
GfxTileWireId src_id, WireId dst, IdString dst_type, GfxTileWireId dst_id,
GraphicElement::style_t style, int idx)
{ {
setSource(el, x, y, src, src_type, src_id); setSource(el, x, y, src, src_type, src_id);
el.x2 = x + switchbox_x1 + (switchbox_x2 - switchbox_x1) / 2 - 0.0017f * idx; el.x2 = x + switchbox_x1 + (switchbox_x2 - switchbox_x1) / 2 - 0.0017f * idx;
@ -640,7 +661,9 @@ void toSameSideH1Ver(std::vector<GraphicElement> &g, GraphicElement &el,int x, i
g.push_back(el2); g.push_back(el2);
} }
void toSameSideH1Hor(std::vector<GraphicElement> &g, GraphicElement &el,int x, int y, WireId src, IdString src_type, GfxTileWireId src_id,WireId dst, IdString dst_type, GfxTileWireId dst_id, GraphicElement::style_t style, int idx) void toSameSideH1Hor(std::vector<GraphicElement> &g, GraphicElement &el, int x, int y, WireId src, IdString src_type,
GfxTileWireId src_id, WireId dst, IdString dst_type, GfxTileWireId dst_id,
GraphicElement::style_t style, int idx)
{ {
setSource(el, x, y, src, src_type, src_id); setSource(el, x, y, src, src_type, src_id);
@ -664,7 +687,9 @@ void toSameSideH1Hor(std::vector<GraphicElement> &g, GraphicElement &el,int x, i
g.push_back(el2); g.push_back(el2);
} }
void toSameSideV1Ver(std::vector<GraphicElement> &g, GraphicElement &el,int x, int y, WireId src, IdString src_type, GfxTileWireId src_id,WireId dst, IdString dst_type, GfxTileWireId dst_id, GraphicElement::style_t style, int idx) void toSameSideV1Ver(std::vector<GraphicElement> &g, GraphicElement &el, int x, int y, WireId src, IdString src_type,
GfxTileWireId src_id, WireId dst, IdString dst_type, GfxTileWireId dst_id,
GraphicElement::style_t style, int idx)
{ {
setSource(el, x, y, src, src_type, src_id); setSource(el, x, y, src, src_type, src_id);
el.x2 = el.x1; el.x2 = el.x1;
@ -685,7 +710,9 @@ void toSameSideV1Ver(std::vector<GraphicElement> &g, GraphicElement &el,int x, i
el2.y1 = el.y1; el2.y1 = el.y1;
g.push_back(el2); g.push_back(el2);
} }
void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, WireId src, IdString src_type, GfxTileWireId src_id, WireId dst, IdString dst_type, GfxTileWireId dst_id, GraphicElement::style_t style) void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, WireId src, IdString src_type,
GfxTileWireId src_id, WireId dst, IdString dst_type, GfxTileWireId dst_id,
GraphicElement::style_t style)
{ {
GraphicElement el; GraphicElement el;
el.type = GraphicElement::TYPE_ARROW; el.type = GraphicElement::TYPE_ARROW;
@ -693,7 +720,8 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, Wire
// To H00 // To H00
if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_H00) { if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_H00) {
toSameSideH1Ver(g,el,x,y,src,src_type,src_id,dst,dst_type,dst_id,style, dst_id - TILE_WIRE_H00L0000 + 30); toSameSideH1Ver(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id, style,
dst_id - TILE_WIRE_H00L0000 + 30);
} }
if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_H00) { if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_H00) {
// toSameSideH1Hor(g,el,x,y,src,src_type,src_id,dst,dst_type,dst_id,style, dst_id - TILE_WIRE_H00L0000); // toSameSideH1Hor(g,el,x,y,src,src_type,src_id,dst,dst_type,dst_id,style, dst_id - TILE_WIRE_H00L0000);
@ -719,7 +747,8 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, Wire
if (y == src.location.y) { if (y == src.location.y) {
straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id); straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id);
} else { } else {
toSameSideV1Ver(g,el,x,y,src,src_type,src_id,dst,dst_type,dst_id,style, dst_id - TILE_WIRE_H02W0701); toSameSideV1Ver(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id, style,
dst_id - TILE_WIRE_H02W0701);
} }
} }
if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_H02) { if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_H02) {
@ -743,7 +772,8 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, Wire
if (y == src.location.y) { if (y == src.location.y) {
straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id); straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id);
} else { } else {
toSameSideV1Ver(g,el,x,y,src,src_type,src_id,dst,dst_type,dst_id,style, dst_id - TILE_WIRE_H06W0303); toSameSideV1Ver(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id, style,
dst_id - TILE_WIRE_H06W0303);
} }
} }
if (src_type == id_WIRE_TYPE_V06 && dst_type == id_WIRE_TYPE_H06) { if (src_type == id_WIRE_TYPE_V06 && dst_type == id_WIRE_TYPE_H06) {
@ -756,7 +786,8 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, Wire
straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id); straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id);
} }
if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_V00) { if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_V00) {
toSameSideV1Ver(g,el,x,y,src,src_type,src_id,dst,dst_type,dst_id,style, src_id - TILE_WIRE_H02W0701 + 20); toSameSideV1Ver(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id, style,
src_id - TILE_WIRE_H02W0701 + 20);
} }
// To V01 // To V01
@ -767,7 +798,8 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, Wire
// To V02 // To V02
if (src_type == id_WIRE_TYPE_H01 && dst_type == id_WIRE_TYPE_V02) { if (src_type == id_WIRE_TYPE_H01 && dst_type == id_WIRE_TYPE_V02) {
if (x == src.location.x) { if (x == src.location.x) {
toSameSideH1Ver(g,el,x,y,src,src_type,src_id,dst,dst_type,dst_id,style, dst_id - TILE_WIRE_V02N0701); toSameSideH1Ver(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id, style,
dst_id - TILE_WIRE_V02N0701);
} else { } else {
straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id); straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id);
} }
@ -791,7 +823,8 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, Wire
// To V06 // To V06
if (src_type == id_WIRE_TYPE_H01 && dst_type == id_WIRE_TYPE_V06) { if (src_type == id_WIRE_TYPE_H01 && dst_type == id_WIRE_TYPE_V06) {
if (x == src.location.x) { if (x == src.location.x) {
toSameSideH1Ver(g,el,x,y,src,src_type,src_id,dst,dst_type,dst_id,style, dst_id - TILE_WIRE_V06N0303); toSameSideH1Ver(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id, style,
dst_id - TILE_WIRE_V06N0303);
} else { } else {
straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id); straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id);
} }
@ -809,26 +842,31 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, Wire
toSameSideVer(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id, style, src_id - TILE_WIRE_V06N0303); toSameSideVer(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id, style, src_id - TILE_WIRE_V06N0303);
} }
if (src_type == id_WIRE_TYPE_H00 && dst_type == id_WIRE_TYPE_NONE && (dst_id >= TILE_WIRE_FCO && dst_id <=TILE_WIRE_FCI)) { if (src_type == id_WIRE_TYPE_H00 && dst_type == id_WIRE_TYPE_NONE &&
(dst_id >= TILE_WIRE_FCO && dst_id <= TILE_WIRE_FCI)) {
toSameSideH1Ver(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id, style, dst_id - TILE_WIRE_FCO); toSameSideH1Ver(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id, style, dst_id - TILE_WIRE_FCO);
} }
if (src_type == id_WIRE_TYPE_H01 && dst_type == id_WIRE_TYPE_NONE && (dst_id >= TILE_WIRE_FCO && dst_id <=TILE_WIRE_FCI)) { if (src_type == id_WIRE_TYPE_H01 && dst_type == id_WIRE_TYPE_NONE &&
(dst_id >= TILE_WIRE_FCO && dst_id <= TILE_WIRE_FCI)) {
toSameSideH1Ver(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id, style, dst_id - TILE_WIRE_FCO); toSameSideH1Ver(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id, style, dst_id - TILE_WIRE_FCO);
} }
if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_NONE && (dst_id >= TILE_WIRE_FCO && dst_id <=TILE_WIRE_FCI)) { if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_NONE &&
(dst_id >= TILE_WIRE_FCO && dst_id <= TILE_WIRE_FCI)) {
straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id); straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id);
} }
if (src_type == id_WIRE_TYPE_V00 && dst_type == id_WIRE_TYPE_NONE && (dst_id >= TILE_WIRE_FCO && dst_id <=TILE_WIRE_FCI)) { if (src_type == id_WIRE_TYPE_V00 && dst_type == id_WIRE_TYPE_NONE &&
(dst_id >= TILE_WIRE_FCO && dst_id <= TILE_WIRE_FCI)) {
straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id); straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id);
} }
if (src_type == id_WIRE_TYPE_V01 && dst_type == id_WIRE_TYPE_NONE && (dst_id >= TILE_WIRE_FCO && dst_id <=TILE_WIRE_FCI)) { if (src_type == id_WIRE_TYPE_V01 && dst_type == id_WIRE_TYPE_NONE &&
(dst_id >= TILE_WIRE_FCO && dst_id <= TILE_WIRE_FCI)) {
straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id); straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id);
} }
if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_NONE && (dst_id >= TILE_WIRE_FCO && dst_id <=TILE_WIRE_FCI)) { if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_NONE &&
(dst_id >= TILE_WIRE_FCO && dst_id <= TILE_WIRE_FCI)) {
straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id); straightLine(g, el, x, y, src, src_type, src_id, dst, dst_type, dst_id);
} }
} }
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END

16
ecp5/gfx.h
View File

@ -76,7 +76,6 @@ enum GfxTileWireId
TILE_WIRE_CE3_SLICE, TILE_WIRE_CE3_SLICE,
TILE_WIRE_FCID_SLICE, TILE_WIRE_FCID_SLICE,
TILE_WIRE_FCOC_SLICE, TILE_WIRE_FCOC_SLICE,
TILE_WIRE_D5_SLICE, TILE_WIRE_D5_SLICE,
TILE_WIRE_C5_SLICE, TILE_WIRE_C5_SLICE,
@ -152,7 +151,6 @@ enum GfxTileWireId
TILE_WIRE_CE0_SLICE, TILE_WIRE_CE0_SLICE,
TILE_WIRE_FCI_SLICE, TILE_WIRE_FCI_SLICE,
TILE_WIRE_CLK0, TILE_WIRE_CLK0,
TILE_WIRE_CLK1, TILE_WIRE_CLK1,
TILE_WIRE_LSR0, TILE_WIRE_LSR0,
@ -208,7 +206,6 @@ enum GfxTileWireId
TILE_WIRE_CE2, TILE_WIRE_CE2,
TILE_WIRE_DUMMY_SWB9, TILE_WIRE_DUMMY_SWB9,
TILE_WIRE_DUMMY_SWB10, TILE_WIRE_DUMMY_SWB10,
TILE_WIRE_D3, TILE_WIRE_D3,
TILE_WIRE_C3, TILE_WIRE_C3,
@ -234,7 +231,6 @@ enum GfxTileWireId
TILE_WIRE_CE1, TILE_WIRE_CE1,
TILE_WIRE_DUMMY_SWB14, TILE_WIRE_DUMMY_SWB14,
TILE_WIRE_DUMMY_SWB15, TILE_WIRE_DUMMY_SWB15,
TILE_WIRE_D1, TILE_WIRE_D1,
TILE_WIRE_C1, TILE_WIRE_C1,
@ -260,7 +256,6 @@ enum GfxTileWireId
TILE_WIRE_CE0, TILE_WIRE_CE0,
TILE_WIRE_FCI, TILE_WIRE_FCI,
TILE_WIRE_MUXCLK3, TILE_WIRE_MUXCLK3,
TILE_WIRE_MUXLSR3, TILE_WIRE_MUXLSR3,
TILE_WIRE_MUXCLK2, TILE_WIRE_MUXCLK2,
@ -293,7 +288,6 @@ enum GfxTileWireId
TILE_WIRE_DUMMY_D10, TILE_WIRE_DUMMY_D10,
TILE_WIRE_DUMMY_D11, TILE_WIRE_DUMMY_D11,
TILE_WIRE_DUMMY_C2, TILE_WIRE_DUMMY_C2,
TILE_WIRE_DUMMY_C3, TILE_WIRE_DUMMY_C3,
TILE_WIRE_CLK2_SLICE, TILE_WIRE_CLK2_SLICE,
@ -307,7 +301,6 @@ enum GfxTileWireId
TILE_WIRE_WADO1C_SLICE, TILE_WIRE_WADO1C_SLICE,
TILE_WIRE_WADO0C_SLICE, TILE_WIRE_WADO0C_SLICE,
TILE_WIRE_WCK1_SLICE, TILE_WIRE_WCK1_SLICE,
TILE_WIRE_WRE1_SLICE, TILE_WIRE_WRE1_SLICE,
TILE_WIRE_CLK1_SLICE, TILE_WIRE_CLK1_SLICE,
@ -321,7 +314,6 @@ enum GfxTileWireId
TILE_WIRE_WAD1B_SLICE, TILE_WIRE_WAD1B_SLICE,
TILE_WIRE_WAD0B_SLICE, TILE_WIRE_WAD0B_SLICE,
TILE_WIRE_WCK0_SLICE, TILE_WIRE_WCK0_SLICE,
TILE_WIRE_WRE0_SLICE, TILE_WIRE_WRE0_SLICE,
TILE_WIRE_CLK0_SLICE, TILE_WIRE_CLK0_SLICE,
@ -335,7 +327,6 @@ enum GfxTileWireId
TILE_WIRE_WAD1A_SLICE, TILE_WIRE_WAD1A_SLICE,
TILE_WIRE_WAD0A_SLICE, TILE_WIRE_WAD0A_SLICE,
TILE_WIRE_V01N0001, TILE_WIRE_V01N0001,
TILE_WIRE_V01N0101, TILE_WIRE_V01N0101,
TILE_WIRE_V01S0000, TILE_WIRE_V01S0000,
@ -435,8 +426,11 @@ enum GfxTileWireId
TILE_WIRE_G_HPBX1500, TILE_WIRE_G_HPBX1500,
}; };
void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdString wire_type, GfxTileWireId tilewire, GraphicElement::style_t style); void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, int w, int h, IdString wire_type, GfxTileWireId tilewire,
void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, WireId src, IdString src_type, GfxTileWireId src_id, WireId dst, IdString dst_type, GfxTileWireId dst_id, GraphicElement::style_t style); GraphicElement::style_t style);
void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, WireId src, IdString src_type,
GfxTileWireId src_id, WireId dst, IdString dst_type, GfxTileWireId dst_id,
GraphicElement::style_t style);
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END