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

Vertical wires and span-12 wires

Browse Source 
Signed-off-by: Clifford Wolf <clifford@clifford.at>
This commit is contained in:
Clifford Wolf 2018-07-09 16:12:41 +02:00
parent 5b6fa934d8
commit 4576fc7c20
2 changed files with 158 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
ice40/gfx.cc
View File

@ -23,6 +23,8 @@ NEXTPNR_NAMESPACE_BEGIN
void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id) void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id)
{ {
// Horizontal Span-4 Wires
if (id >= TILE_WIRE_SP4_H_L_36 && id <= TILE_WIRE_SP4_H_L_47) { if (id >= TILE_WIRE_SP4_H_L_36 && id <= TILE_WIRE_SP4_H_L_47) {
int idx = (id - TILE_WIRE_SP4_H_L_36) + 48; int idx = (id - TILE_WIRE_SP4_H_L_36) + 48;
GraphicElement el; GraphicElement el;
@ -72,6 +74,162 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id)
el.y2 = y3; el.y2 = y3;
g.push_back(el); g.push_back(el);
} }
// Vertical Span-4 Wires
if (id >= TILE_WIRE_SP4_V_T_36 && id <= TILE_WIRE_SP4_V_T_47) {
int idx = (id - TILE_WIRE_SP4_V_T_36) + 48;
GraphicElement el;
el.type = GraphicElement::G_LINE;
float x1 = x + 0.03 + 0.0025 * (60 - idx);
el.y1 = y + 0.0;
el.y2 = y + 0.9;
el.x1 = x1;
el.x2 = x1;
g.push_back(el);
}
if (id >= TILE_WIRE_SP4_V_B_0 && id <= TILE_WIRE_SP4_V_B_47) {
int idx = id - TILE_WIRE_SP4_V_B_0;
GraphicElement el;
el.type = GraphicElement::G_LINE;
float x1 = x + 0.03 + 0.0025 * (60 - idx);
float x2 = x + 0.03 + 0.0025 * (60 - (idx ^ 1));
float x3 = x + 0.03 + 0.0025 * (60 - (idx ^ 1) - 12);
if (idx >= 12) {
el.y1 = y;
el.y2 = y + 0.01;
el.x1 = x1;
el.x2 = x1;
g.push_back(el);
el.y1 = y + 0.01;
el.y2 = y + 0.02;
el.x1 = x1;
el.x2 = x2;
g.push_back(el);
}
el.y1 = y + 0.02;
el.y2 = y + 0.9;
el.x1 = x2;
el.x2 = x2;
g.push_back(el);
el.y1 = y + 0.9;
el.y2 = y + 1.0;
el.x1 = x2;
el.x2 = x3;
g.push_back(el);
}
// Horizontal Span-12 Wires
if (id >= TILE_WIRE_SP12_H_L_22 && id <= TILE_WIRE_SP12_H_L_23) {
int idx = (id - TILE_WIRE_SP12_H_L_22) + 24;
GraphicElement el;
el.type = GraphicElement::G_LINE;
float y1 = y + 0.03 + 0.0025 * (90 - idx);
el.x1 = x + 0.0;
el.x2 = x + 0.98333;
el.y1 = y1;
el.y2 = y1;
g.push_back(el);
}
if (id >= TILE_WIRE_SP12_H_R_0 && id <= TILE_WIRE_SP12_H_R_23) {
int idx = id - TILE_WIRE_SP12_H_R_0;
GraphicElement el;
el.type = GraphicElement::G_LINE;
float y1 = y + 0.03 + 0.0025 * (90 - idx);
float y2 = y + 0.03 + 0.0025 * (90 - (idx ^ 1));
float y3 = y + 0.03 + 0.0025 * (90 - (idx ^ 1) - 2);
if (idx >= 2) {
el.x1 = x;
el.x2 = x + 0.01;
el.y1 = y1;
el.y2 = y1;
g.push_back(el);
el.x1 = x + 0.01;
el.x2 = x + 0.02;
el.y1 = y1;
el.y2 = y2;
g.push_back(el);
}
el.x1 = x + 0.02;
el.x2 = x + 0.98333;
el.y1 = y2;
el.y2 = y2;
g.push_back(el);
el.x1 = x + 0.98333;
el.x2 = x + 1.0;
el.y1 = y2;
el.y2 = y3;
g.push_back(el);
}
// Vertical Span-12 Wires
if (id >= TILE_WIRE_SP12_V_T_22 && id <= TILE_WIRE_SP12_V_T_23) {
int idx = (id - TILE_WIRE_SP12_V_T_22) + 24;
GraphicElement el;
el.type = GraphicElement::G_LINE;
float x1 = x + 0.03 + 0.0025 * (90 - idx);
el.y1 = y + 0.0;
el.y2 = y + 0.98333;
el.x1 = x1;
el.x2 = x1;
g.push_back(el);
}
if (id >= TILE_WIRE_SP12_V_B_0 && id <= TILE_WIRE_SP12_V_B_23) {
int idx = id - TILE_WIRE_SP12_V_B_0;
GraphicElement el;
el.type = GraphicElement::G_LINE;
float x1 = x + 0.03 + 0.0025 * (90 - idx);
float x2 = x + 0.03 + 0.0025 * (90 - (idx ^ 1));
float x3 = x + 0.03 + 0.0025 * (90 - (idx ^ 1) - 2);
if (idx >= 2) {
el.y1 = y;
el.y2 = y + 0.01;
el.x1 = x1;
el.x2 = x1;
g.push_back(el);
el.y1 = y + 0.01;
el.y2 = y + 0.02;
el.x1 = x1;
el.x2 = x2;
g.push_back(el);
}
el.y1 = y + 0.02;
el.y2 = y + 0.98333;
el.x1 = x2;
el.x2 = x2;
g.push_back(el);
el.y1 = y + 0.98333;
el.y2 = y + 1.0;
el.x1 = x2;
el.x2 = x3;
g.push_back(el);
}
} }
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END

2
ice40/gfx.h
View File

@ -428,7 +428,6 @@ enum GfxTileWireId {
TILE_WIRE_SP12_H_R_7, TILE_WIRE_SP12_H_R_7,
TILE_WIRE_SP12_H_R_8, TILE_WIRE_SP12_H_R_8,
TILE_WIRE_SP12_H_R_9, TILE_WIRE_SP12_H_R_9,
TILE_WIRE_SP12_H_R_10, TILE_WIRE_SP12_H_R_10,
TILE_WIRE_SP12_H_R_11, TILE_WIRE_SP12_H_R_11,
TILE_WIRE_SP12_H_R_12, TILE_WIRE_SP12_H_R_12,
@ -439,7 +438,6 @@ enum GfxTileWireId {
TILE_WIRE_SP12_H_R_17, TILE_WIRE_SP12_H_R_17,
TILE_WIRE_SP12_H_R_18, TILE_WIRE_SP12_H_R_18,
TILE_WIRE_SP12_H_R_19, TILE_WIRE_SP12_H_R_19,
TILE_WIRE_SP12_H_R_20, TILE_WIRE_SP12_H_R_20,
TILE_WIRE_SP12_H_R_21, TILE_WIRE_SP12_H_R_21,
TILE_WIRE_SP12_H_R_22, TILE_WIRE_SP12_H_R_22,