aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2015-08-03 12:56:52 +0200
committerClifford Wolf <clifford@clifford.at>2015-08-03 12:56:52 +0200
commitad4083a575e65f16abfe70e0b00c9d7e64f0780c (patch)
treee925cd95e14f2fce73bfb2240cada267dafc68f0
parentaeb8d6b64585a91f41bf0aa0090486c624f364cc (diff)
downloadicestorm-ad4083a575e65f16abfe70e0b00c9d7e64f0780c.tar.gz
icestorm-ad4083a575e65f16abfe70e0b00c9d7e64f0780c.tar.bz2
icestorm-ad4083a575e65f16abfe70e0b00c9d7e64f0780c.zip
Bugfix in icebox_colbuf
-rwxr-xr-xicebox/icebox_colbuf.py3
-rw-r--r--icefuzz/.gitignore8
2 files changed, 10 insertions, 1 deletions
diff --git a/icebox/icebox_colbuf.py b/icebox/icebox_colbuf.py
index 2e3e4b0..6267bc6 100755
--- a/icebox/icebox_colbuf.py
+++ b/icebox/icebox_colbuf.py
@@ -107,7 +107,8 @@ for tiles in [ic.io_tiles, ic.logic_tiles, ic.ramb_tiles, ic.ramt_tiles]:
glbs = analyze_tile(ic, cache, tile)
if len(glbs):
assert tile in colbuf_map
- used_glbs_map[colbuf_map[tile]] = glbs
+ s = used_glbs_map.setdefault(colbuf_map[tile], set())
+ used_glbs_map[colbuf_map[tile]] = s.union(glbs)
cache = None
for tile in tiles:
diff --git a/icefuzz/.gitignore b/icefuzz/.gitignore
new file mode 100644
index 0000000..950fd82
--- /dev/null
+++ b/icefuzz/.gitignore
@@ -0,0 +1,8 @@
+*.bin
+*.glb
+*.psb
+*.tmp/
+*.txt
+*.vsb
+*.pyc
+/work_*/