luke
/
icestorm
mirror of https://github.com/YosysHQ/icestorm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow prefixes in multiple chained statements. 

IE
```
    lutff_1 {
        lutff_1/out -> local_g2_1 -> lutff_1/in_0
        local_g2_2 -> lutff_1/in_3
        local_g2_7 -> lutff_1/in_2
    }
```
This commit is contained in:
Tim 'mithro' Ansell 2018-05-30 13:05:20 -07:00
parent 353a338505
commit f7e9fec63a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
icebox/icebox_hlc2asc.py
View File

@ -803,7 +803,11 @@ class LogicCell:
self.seq_bits[2] = '1' self.seq_bits[2] = '1'
elif fields == ['async_setreset']: elif fields == ['async_setreset']:
self.seq_bits[3] = '1' self.seq_bits[3] = '1'
elif len(fields) >= 3 and (fields[1] == '->' or fields[1] == '<->'): elif len(fields) > 3 and (fields[1] == '->' or fields[1] == '<->'):
self.read(fields[:3])
self.read(fields[2:])
return
elif len(fields) == 3 and (fields[1] == '->' or fields[1] == '<->'):
prefix = 'lutff_%d/' % self.index prefix = 'lutff_%d/' % self.index
# Strip prefix if it is given # Strip prefix if it is given
@ -960,7 +964,10 @@ class IOBlock:
== ("padin_glb_netwk", fields[2][10:])] == ("padin_glb_netwk", fields[2][10:])]
assert len(bit) == 1 assert len(bit) == 1
self.tile.ic.extra_bits.add(bit[0]) self.tile.ic.extra_bits.add(bit[0])
elif len(fields) >= 3 and (fields[1] == '->' or fields[1] == '<->'): elif len(fields) > 3 and (fields[1] == '->' or fields[1] == '<->'):
self.read(fields[:3])
self.read(fields[2:])
elif len(fields) == 3 and (fields[1] == '->' or fields[1] == '<->'):
prefix = 'io_%d/' % self.index prefix = 'io_%d/' % self.index
# Strip prefix if it is given # Strip prefix if it is given