diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2019-11-10 15:24:06 +0100 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2019-11-10 15:24:06 +0100 |
| commit | 74f2c4a73b56910b5b42013a89484e1060a1f736 (patch) | |
| tree | 66e40ad707051b1cebdb430d22285852c8ab32f4 /ecp5/gfx.cc | |
| parent | 43c7b4fa2113c2eaca0053fe9395dc4fd0635be3 (diff) | |
| download | nextpnr-74f2c4a73b56910b5b42013a89484e1060a1f736.tar.gz nextpnr-74f2c4a73b56910b5b42013a89484e1060a1f736.tar.bz2 nextpnr-74f2c4a73b56910b5b42013a89484e1060a1f736.zip | |
more pips, and valid mapping
Diffstat (limited to 'ecp5/gfx.cc')
| -rw-r--r-- | ecp5/gfx.cc | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/ecp5/gfx.cc b/ecp5/gfx.cc index 373112a7..6b07861b 100644 --- a/ecp5/gfx.cc +++ b/ecp5/gfx.cc @@ -455,8 +455,7 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, Wire el.y2 = y + switchbox_y1 + 0.0017f*(96 + (dst_id - TILE_WIRE_V06N0303)+ 20 *(y%3)); el.x2 = x + switchbox_x1; g.push_back(el); - } - + } if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_V02) { el.x1 = x + switchbox_x1 + 0.0017f*(16 + (src_id - TILE_WIRE_H02W0701)+ 20 *(src.location.x%3)); el.y1 = y + switchbox_y1; @@ -466,6 +465,15 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, Wire g.push_back(el); } + if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_H02) { + el.x1 = x + switchbox_x1 + 0.0017f*(16 + (dst_id - TILE_WIRE_H02W0701)+ 20 *(dst.location.x%3)); + el.y1 = y + switchbox_y1; + + el.x2 = x + switchbox_x1; + el.y2 = y + switchbox_y1 + 0.0017f*(20 + (src_id - TILE_WIRE_V02N0701)+ 20 *(src.location.y%3)); + + g.push_back(el); + } if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_V02) { el.x1 = x + switchbox_x1; @@ -485,10 +493,15 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, Wire el.x1 = x + switchbox_x1; g.push_back(el); - - } - - + } + if (src_type == id_WIRE_TYPE_V06 && dst_type == id_WIRE_TYPE_H02) { + el.x1 = x + switchbox_x1 + 0.0017f*(16 + (dst_id - TILE_WIRE_H02W0701)+ 20 *(dst.location.x%3)); + el.y1 = y + switchbox_y1; + + el.x2 = x + switchbox_x1; + el.y2 = y + switchbox_y1 + 0.0017f*(96 + (src_id - TILE_WIRE_V06N0303)+ 20 *(y%3)); + g.push_back(el); + } } NEXTPNR_NAMESPACE_END |