From 26c1c2f22615ce3e15df25e1eeb839fdb9390f62 Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Thu, 10 Jan 2019 17:02:45 -0800 Subject: [PATCH 1/3] Add utility to convert from bit to FASM in one program. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- utils/bit2fasm.py | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 utils/bit2fasm.py diff --git a/utils/bit2fasm.py b/utils/bit2fasm.py new file mode 100644 index 00000000..f6d1adc3 --- /dev/null +++ b/utils/bit2fasm.py @@ -0,0 +1,91 @@ +#!/usr/bin/env python3 +''' +Take bitstream .bit files and decode them to FASM. +''' + +import os +import fasm +from prjxray import db +from prjxray import fasm_disassembler +from prjxray import bitstream +import subprocess +import tempfile + +def bit_to_bits(bitread, part_yaml, bit_file, bits_file, frame_range=None): + """ Calls bitread to create bits (ASCII) from bit file (binary) """ + if frame_range: + frame_range_arg = '-F {}'.format(frame_range) + else: + frame_range_arg = '' + + subprocess.check_output('{} --part_file {} {} -o {} -z -y {}'.format( + bitread, part_yaml, frame_range_arg, bits_file, bit_file), shell=True) + + +def bits_to_fasm(db_root, bits_file, verbose, canonical): + disassembler = fasm_disassembler.FasmDisassembler(db.Database(db_root)) + + with open(bits_file) as f: + bitdata = bitstream.load_bitdata(f) + + print( + fasm.fasm_tuple_to_string( + disassembler.find_features_in_bitstream(bitdata, verbose=verbose), + canonical=canonical)) + + +def main(): + import argparse + + parser = argparse.ArgumentParser( + description='Convert 7-series bit file to FASM.') + + database_dir = os.getenv("XRAY_DATABASE_DIR") + database = os.getenv("XRAY_DATABASE") + db_root_kwargs = {} + if database_dir is None or database is None: + db_root_kwargs['required'] = True + else: + db_root_kwargs['required'] = False + db_root_kwargs['default'] = os.path.join(database_dir, database) + + default_part = os.getenv("XRAY_PART") + part_kwargs = {} + if default_part is None: + part_kwargs['required'] = True + else: + part_kwargs['required'] = False + part_kwargs['default'] = default_part + + if os.getenv("XRAY_TOOLS_DIR") is None: + default_bitread = 'bitread' + else: + default_bitread = os.path.join(os.getenv("XRAY_TOOLS_DIR"), 'bitread') + + parser.add_argument('--db-root', help="Database root.", **db_root_kwargs) + parser.add_argument('--part', help="Name of part being targetted.", **part_kwargs) + parser.add_argument('--bitread', help="Name of part being targetted.", default=default_bitread) + parser.add_argument('--frame_range', help="Frame range to use with bitread.") + parser.add_argument('bit_file', help='') + parser.add_argument( + '--verbose', + help='Print lines for unknown tiles and bits', + action='store_true') + parser.add_argument( + '--canonical', help='Output canonical bitstream.', action='store_true') + args = parser.parse_args() + + with tempfile.NamedTemporaryFile() as bits_file: + bit_to_bits( + bitread=args.bitread, + part_yaml=os.path.join(args.db_root, '{}.yaml'.format(args.part)), + bit_file=args.bit_file, + bits_file=bits_file.name, + frame_range=args.frame_range, + ) + + bits_to_fasm(args.db_root, bits_file.name, args.verbose, args.canonical) + + +if __name__ == '__main__': + main() From 85ff7fe55c0f2fd18b820cc9783911cfd819fedf Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Thu, 10 Jan 2019 17:04:05 -0800 Subject: [PATCH 2/3] Run make format. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- utils/bit2fasm.py | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/utils/bit2fasm.py b/utils/bit2fasm.py index f6d1adc3..05a87c38 100644 --- a/utils/bit2fasm.py +++ b/utils/bit2fasm.py @@ -11,6 +11,7 @@ from prjxray import bitstream import subprocess import tempfile + def bit_to_bits(bitread, part_yaml, bit_file, bits_file, frame_range=None): """ Calls bitread to create bits (ASCII) from bit file (binary) """ if frame_range: @@ -18,8 +19,10 @@ def bit_to_bits(bitread, part_yaml, bit_file, bits_file, frame_range=None): else: frame_range_arg = '' - subprocess.check_output('{} --part_file {} {} -o {} -z -y {}'.format( - bitread, part_yaml, frame_range_arg, bits_file, bit_file), shell=True) + subprocess.check_output( + '{} --part_file {} {} -o {} -z -y {}'.format( + bitread, part_yaml, frame_range_arg, bits_file, bit_file), + shell=True) def bits_to_fasm(db_root, bits_file, verbose, canonical): @@ -63,9 +66,14 @@ def main(): default_bitread = os.path.join(os.getenv("XRAY_TOOLS_DIR"), 'bitread') parser.add_argument('--db-root', help="Database root.", **db_root_kwargs) - parser.add_argument('--part', help="Name of part being targetted.", **part_kwargs) - parser.add_argument('--bitread', help="Name of part being targetted.", default=default_bitread) - parser.add_argument('--frame_range', help="Frame range to use with bitread.") + parser.add_argument( + '--part', help="Name of part being targetted.", **part_kwargs) + parser.add_argument( + '--bitread', + help="Name of part being targetted.", + default=default_bitread) + parser.add_argument( + '--frame_range', help="Frame range to use with bitread.") parser.add_argument('bit_file', help='') parser.add_argument( '--verbose', @@ -77,14 +85,15 @@ def main(): with tempfile.NamedTemporaryFile() as bits_file: bit_to_bits( - bitread=args.bitread, - part_yaml=os.path.join(args.db_root, '{}.yaml'.format(args.part)), - bit_file=args.bit_file, - bits_file=bits_file.name, - frame_range=args.frame_range, - ) + bitread=args.bitread, + part_yaml=os.path.join(args.db_root, '{}.yaml'.format(args.part)), + bit_file=args.bit_file, + bits_file=bits_file.name, + frame_range=args.frame_range, + ) - bits_to_fasm(args.db_root, bits_file.name, args.verbose, args.canonical) + bits_to_fasm( + args.db_root, bits_file.name, args.verbose, args.canonical) if __name__ == '__main__': From 2ba905130ab9f27c37ccfc5afcbe66be6a0479e0 Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Fri, 11 Jan 2019 13:13:05 -0800 Subject: [PATCH 3/3] Remove old bit2fasm files. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- minitests/roi_harness/bit2fasm.sh | 7 ---- utils/bits2fasm.py | 54 ------------------------------- 2 files changed, 61 deletions(-) delete mode 100755 minitests/roi_harness/bit2fasm.sh delete mode 100755 utils/bits2fasm.py diff --git a/minitests/roi_harness/bit2fasm.sh b/minitests/roi_harness/bit2fasm.sh deleted file mode 100755 index 41946c06..00000000 --- a/minitests/roi_harness/bit2fasm.sh +++ /dev/null @@ -1,7 +0,0 @@ -set -ex - -BIT_IN=$1 -BITS=$(tempfile --suffix .bits) - -${XRAY_BITREAD} -F $XRAY_ROI_FRAMES -o ${BITS} -z -y ${BIT_IN} > /dev/null -${XRAY_BITS2FASM} ${BITS} diff --git a/utils/bits2fasm.py b/utils/bits2fasm.py deleted file mode 100755 index 97c4f324..00000000 --- a/utils/bits2fasm.py +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env python3 -''' -Take raw .bits files and decode them to FASM. -''' - -import os -import fasm -from prjxray import db -from prjxray import fasm_disassembler -from prjxray import bitstream - - -def run(db_root, bits_file, verbose, canonical): - disassembler = fasm_disassembler.FasmDisassembler(db.Database(db_root)) - - with open(bits_file) as f: - bitdata = bitstream.load_bitdata(f) - - print( - fasm.fasm_tuple_to_string( - disassembler.find_features_in_bitstream(bitdata, verbose=verbose), - canonical=canonical)) - - -def main(): - import argparse - - parser = argparse.ArgumentParser( - description='Convert 7-series bits file to FASM.') - - database_dir = os.getenv("XRAY_DATABASE_DIR") - database = os.getenv("XRAY_DATABASE") - db_root_kwargs = {} - if database_dir is None or database is None: - db_root_kwargs['required'] = True - else: - db_root_kwargs['required'] = False - db_root_kwargs['default'] = os.path.join(database_dir, database) - - parser.add_argument('--db-root', help="Database root.", **db_root_kwargs) - parser.add_argument('bits_file', help='') - parser.add_argument( - '--verbose', - help='Print lines for unknown tiles and bits', - action='store_true') - parser.add_argument( - '--canonical', help='Output canonical bitstream.', action='store_true') - args = parser.parse_args() - - run(args.db_root, args.bits_file, args.verbose, args.canonical) - - -if __name__ == '__main__': - main()