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

Merge pull request #598 from litghost/fix_handling_of_ppip_in_tiles_without_segbits 

Fix handling of ppip in tiles without segbits
This commit is contained in:
litghost 2019-02-01 15:22:22 -08:00 committed by GitHub
parent 055ed637ed ef79ef2460
commit e6070347d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
prjxray/fasm_assembler.py
View File

@ -99,14 +99,15 @@ class FasmAssembler(object):
def enable_feature(self, tile, feature, address, line): def enable_feature(self, tile, feature, address, line):
gridinfo = self.grid.gridinfo_at_tilename(tile) gridinfo = self.grid.gridinfo_at_tilename(tile)
def update_segbit(bit):
'''Set or clear a single bit in a segment at the given word column and word bit position'''
# TODO: How to determine if the feature targets BLOCK_RAM segment type? # TODO: How to determine if the feature targets BLOCK_RAM segment type?
bits = gridinfo.bits[grid.BlockType.CLB_IO_CLK] bits = gridinfo.bits[grid.BlockType.CLB_IO_CLK]
seg_baseaddr = bits.base_address seg_baseaddr = bits.base_address
seg_word_base = bits.offset seg_word_base = bits.offset
def update_segbit(bit):
'''Set or clear a single bit in a segment at the given word column and word bit position'''
# Now we have the word column and word bit index # Now we have the word column and word bit index
# Combine with the segments relative frame position to fully get the position # Combine with the segments relative frame position to fully get the position
frame_addr = seg_baseaddr + bit.word_column frame_addr = seg_baseaddr + bit.word_column
@ -120,23 +121,28 @@ class FasmAssembler(object):
segbits = self.db.get_tile_segbits(gridinfo.tile_type) segbits = self.db.get_tile_segbits(gridinfo.tile_type)
# Mark all frames used by this tile as in use.
if tile not in self.seen_tile:
for frame in segbits.frames(bits):
self.frames_in_use.add(frame)
self.seen_tile.add(tile) self.seen_tile.add(tile)
db_k = '%s.%s' % (gridinfo.tile_type, feature) db_k = '%s.%s' % (gridinfo.tile_type, feature)
any_bits = False
try: try:
for bit in segbits.feature_to_bits(db_k, address): for bit in segbits.feature_to_bits(db_k, address):
any_bits = True
update_segbit(bit) update_segbit(bit)
except KeyError: except KeyError:
raise FasmLookupError( raise FasmLookupError(
"Segment DB %s, key %s not found from line '%s'" % "Segment DB %s, key %s not found from line '%s'" %
(gridinfo.tile_type, db_k, line)) (gridinfo.tile_type, db_k, line))
if any_bits:
# Mark all frames used by this tile as in use.
bits = gridinfo.bits[grid.BlockType.CLB_IO_CLK]
if tile not in self.seen_tile:
for frame in segbits.frames(bits):
self.frames_in_use.add(frame)
def parse_fasm_filename(self, filename): def parse_fasm_filename(self, filename):
missing_features = [] missing_features = []
for line in fasm.parse_fasm_filename(filename): for line in fasm.parse_fasm_filename(filename):