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

Rename SegmentType to BlockType. 

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2018-10-22 11:51:07 -07:00
parent 204c6246ad
commit db5c8d0063
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prjxray/fasm_assembler.py
View File

@ -92,7 +92,7 @@ class FasmAssembler(object):
gridinfo = self.grid.gridinfo_at_tilename(tile) gridinfo = self.grid.gridinfo_at_tilename(tile)
# 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.SegmentType.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

8
prjxray/grid.py
View File

@ -3,11 +3,11 @@ import enum
from prjxray import segment_map from prjxray import segment_map
class SegmentType(enum.Enum): class BlockType(enum.Enum):
# Segments describing CLB features, interconnect, clocks and IOs. # Frames describing CLB features, interconnect, clocks and IOs.
CLB_IO_CLK = 'CLB_IO_CLK' CLB_IO_CLK = 'CLB_IO_CLK'
# Segments describing block RAM initialization. # Frames describing block RAM initialization.
BLOCK_RAM = 'BLOCK_RAM' BLOCK_RAM = 'BLOCK_RAM'
@ -58,7 +58,7 @@ class Grid(object):
if 'bits' in tileinfo: if 'bits' in tileinfo:
for k in tileinfo['bits']: for k in tileinfo['bits']:
segment_type = SegmentType(k) segment_type = BlockType(k)
base_address = int(tileinfo['bits'][k]['baseaddr'], 0) base_address = int(tileinfo['bits'][k]['baseaddr'], 0)
bits[segment_type] = Bits( bits[segment_type] = Bits(
base_address=base_address, base_address=base_address,