diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2018-08-03 23:44:55 -0700 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2018-08-03 23:44:55 -0700 |
| commit | 0a14e20f7332344d4c2f73c7ede54ef0258997f7 (patch) | |
| tree | 37250740746ae2a6f19fff60891ba42846569f85 /ice40/gfx.cc | |
| parent | 45304d049f1c939ca3ac9782a1108f17e784a1cd (diff) | |
| parent | 65d73eb9838e0bb8e6d089ecde3d4ffaf34e9e29 (diff) | |
| download | nextpnr-0a14e20f7332344d4c2f73c7ede54ef0258997f7.tar.gz nextpnr-0a14e20f7332344d4c2f73c7ede54ef0258997f7.tar.bz2 nextpnr-0a14e20f7332344d4c2f73c7ede54ef0258997f7.zip | |
Merge branch 'master' into slack_histogram
Conflicts:
common/placer1.cc
Diffstat (limited to 'ice40/gfx.cc')
| -rw-r--r-- | ice40/gfx.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ice40/gfx.cc b/ice40/gfx.cc index 924fe964..d5c6e77f 100644 --- a/ice40/gfx.cc +++ b/ice40/gfx.cc @@ -706,7 +706,8 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId src, return; } - if (TILE_WIRE_LUTFF_0_IN_0 <= src && src <= TILE_WIRE_LUTFF_7_IN_3 && TILE_WIRE_LUTFF_0_OUT <= dst && dst <= TILE_WIRE_LUTFF_7_OUT) { + if (TILE_WIRE_LUTFF_0_IN_0 <= src && src <= TILE_WIRE_LUTFF_7_IN_3 && TILE_WIRE_LUTFF_0_OUT <= dst && + dst <= TILE_WIRE_LUTFF_7_OUT) { int lut_idx = (src - TILE_WIRE_LUTFF_0_IN_0) / 4; int in_idx = (src - TILE_WIRE_LUTFF_0_IN_0) % 4; |