Merge pull request #164 from mithro/global-fix
Fix spelling and io_X/GLOBAL_OUTPUT_NETWORK
diff --git a/icebox/icebox_hlc2asc.py b/icebox/icebox_hlc2asc.py
index c26b173..c9b2a04 100755
--- a/icebox/icebox_hlc2asc.py
+++ b/icebox/icebox_hlc2asc.py
@@ -293,7 +293,7 @@
for i, xy in enumerate(GLB_NETWK_INTERNAL_TILES):
if net == 'glb_netwk_%d' % i and (x, y) == xy:
return 'fabout'
- raise ParseError("{} is a global netowrk, but not at an expectd location {} {}".format(net, x, y))
+ raise ParseError("{} is a global network, but not at an expected location {} {}".format(net, x, y))
return net
@@ -956,7 +956,7 @@
if fields == ['io_1'] and self.blocks[1] is None:
self.blocks[1] = IOBlock(self, 1)
return self.blocks[1]
- raise ParseError("Unepxected new block in {}".format(type(self).__name__))
+ raise ParseError("Unexpected new block in {}".format(type(self).__name__))
class IOBlock:
def __init__(self, tile, index):
@@ -1006,7 +1006,9 @@
self.enable_input = True
elif fields == ['disable_pull_up'] and not self.disable_pull_up:
self.disable_pull_up = True
- elif fields[0] == 'GLOBAL_BUFFER_OUTPUT' and fields[1] == '->' \
+ elif fields[0] in ('GLOBAL_BUFFER_OUTPUT',
+ 'io_%d/GLOBAL_BUFFER_OUTPUT' % self.index) \
+ and fields[1] == '->' \
and fields[2].startswith('glb_netwk_'):
if GLB_NETWK_EXTERNAL_BLOCKS[int(fields[2][10:])] \
!= (self.tile.x, self.tile.y, self.index):
