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

Run make format. 

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2019-02-02 07:39:52 -08:00
parent 1d42f21e3d
commit fcc21c9989
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
prjxray/fasm_disassembler.py
View File

@ -38,7 +38,13 @@ class FasmDisassembler(object):
self.decode_warnings = set() self.decode_warnings = set()
def find_features_in_tile( def find_features_in_tile(
self, tile_name, block_type, bits, solved_bitdata, bitdata, verbose=False): self,
tile_name,
block_type,
bits,
solved_bitdata,
bitdata,
verbose=False):
gridinfo = self.grid.gridinfo_at_tilename(tile_name) gridinfo = self.grid.gridinfo_at_tilename(tile_name)
try: try:
@ -69,7 +75,8 @@ class FasmDisassembler(object):
self.decode_warnings.add(gridinfo.tile_type) self.decode_warnings.add(gridinfo.tile_type)
return return
for ones_matched, feature in tile_segbits.match_bitdata(block_type, bits, bitdata): for ones_matched, feature in tile_segbits.match_bitdata(block_type,
bits, bitdata):
for frame, bit in ones_matched: for frame, bit in ones_matched:
if frame not in solved_bitdata: if frame not in solved_bitdata:
solved_bitdata[frame] = set() solved_bitdata[frame] = set()
@ -110,9 +117,8 @@ class FasmDisassembler(object):
tiles_checked.add((bits_info.tile, bits_info.block_type)) tiles_checked.add((bits_info.tile, bits_info.block_type))
for fasm_line in self.find_features_in_tile( for fasm_line in self.find_features_in_tile(
bits_info.tile, bits_info.block_type, bits_info.tile, bits_info.block_type, bits_info.bits,
bits_info.bits, solved_bitdata, solved_bitdata, bitdata, verbose=verbose):
bitdata, verbose=verbose):
if fasm_line not in emitted_features: if fasm_line not in emitted_features:
emitted_features.add(fasm_line) emitted_features.add(fasm_line)
yield fasm_line yield fasm_line

3
prjxray/tile.py
View File

@ -2,7 +2,8 @@ from collections import namedtuple
import json import json
from prjxray import lib from prjxray import lib
""" Database files available for a tile """ """ Database files available for a tile """
TileDbs = namedtuple('TileDbs', 'segbits block_ram_segbits ppips mask tile_type') TileDbs = namedtuple(
'TileDbs', 'segbits block_ram_segbits ppips mask tile_type')
Pip = namedtuple( Pip = namedtuple(
'Pip', 'name net_to net_from can_invert is_directional is_pseudo') 'Pip', 'name net_to net_from can_invert is_directional is_pseudo')