diff options
| author | Clifford Wolf <clifford@clifford.at> | 2017-11-21 18:19:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 18:19:47 +0100 |
| commit | 6e9a2da5c46edf00f1dc87c86053b5edbc17d5d7 (patch) | |
| tree | b94fdbf6f316b9758e8afd848d8c900343469f07 /icebox/icebox_explain.py | |
| parent | 9a2a325acb846936431c4aa5843184034be25d5c (diff) | |
| parent | 9184fbdf404c0e94326919c92a27d3292994cdf1 (diff) | |
| download | icestorm-6e9a2da5c46edf00f1dc87c86053b5edbc17d5d7.tar.gz icestorm-6e9a2da5c46edf00f1dc87c86053b5edbc17d5d7.tar.bz2 icestorm-6e9a2da5c46edf00f1dc87c86053b5edbc17d5d7.zip | |
Merge pull request #109 from daveshah1/up5k
Support for new UltraPlus features
Diffstat (limited to 'icebox/icebox_explain.py')
| -rwxr-xr-x | icebox/icebox_explain.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/icebox/icebox_explain.py b/icebox/icebox_explain.py index 50cce09..4e678ff 100755 --- a/icebox/icebox_explain.py +++ b/icebox/icebox_explain.py @@ -117,7 +117,7 @@ def print_tile(stmt, ic, x, y, tile, db): bitinfo.append("") extra_text = "" for i in range(len(line)): - if 36 <= i <= 45 and re.search(r"logic_tile", stmt): + if 36 <= i <= 45 and re.search(r"(logic_tile|dsp\d_tile|ipcon_tile)", stmt): lutff_idx = k // 2 lutff_bitnum = (i-36) + 10*(k%2) if line[i] == "1": @@ -166,6 +166,13 @@ for idx in ic.ramb_tiles: for idx in ic.ramt_tiles: print_tile(".ramt_tile %d %d" % idx, ic, idx[0], idx[1], ic.ramt_tiles[idx], ic.tile_db(idx[0], idx[1])) +for i in range(4): + for idx in ic.dsp_tiles[i]: + print_tile(".dsp%d_tile %d %d" % (i, idx[0], idx[1]), ic, idx[0], idx[1], ic.dsp_tiles[i][idx], ic.tile_db(idx[0], idx[1])) + +for idx in ic.ipcon_tiles: + print_tile(".ipcon_tile %d %d" % idx, ic, idx[0], idx[1], ic.ipcon_tiles[idx], ic.tile_db(idx[0], idx[1])) + for bit in ic.extra_bits: print() print(".extra_bit %d %d %d" % bit) |