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

Update FASM to version that includes output sorting. 

Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
Keith Rothman 2019-02-06 17:12:01 -08:00
parent 310d197b8e
commit f372849bc0
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
third_party/fasm vendored

@ -1 +1 @@
Subproject commit b7a578552669954050f3700ced243b9d9e12d649
Subproject commit ece57149c96cea82ab155af3bba04e76eee4ab6a

14
utils/bit2fasm.py
View File

@ -50,16 +50,12 @@ def bits_to_fasm(db_root, bits_file, verbose, canonical):
return not any_bits
model = fasm.output.merge_and_sort(
disassembler.find_features_in_bitstream(bitdata, verbose=verbose),
zero_function=is_zero_feature,
sort_key=grid.tile_key,
)
disassembler.find_features_in_bitstream(bitdata, verbose=verbose),
zero_function=is_zero_feature,
sort_key=grid.tile_key,
)
print(
fasm.fasm_tuple_to_string(
model,
canonical=canonical),
end='')
print(fasm.fasm_tuple_to_string(model, canonical=canonical), end='')
def main():