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

Merge pull request #673 from litghost/newline_in_required_features 

Output required_features as a list rather than a string with newlines.
This commit is contained in:
litghost 2019-02-21 15:48:44 -08:00 committed by GitHub
parent a2d371864a 2a114a9726
commit 8fde4e2b4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuzzers/025-bram-config/generate.py
View File

@ -65,7 +65,8 @@ def bus_tags(segmk, ps, site):
# Magic bit positions from experimentation # Magic bit positions from experimentation
# we could just only solve when parity, but this check documents the fine points a bit better # we could just only solve when parity, but this check documents the fine points a bit better
if hasparity or i not in (1, 9): if hasparity or i not in (1, 9):
segmk.add_site_tag(site, '%s[%u]' % (tagname, i), 1 ^ bitstr[i]) segmk.add_site_tag(
site, '%s[%u]' % (tagname, i), 1 ^ bitstr[i])
def rw_width_tags(segmk, ps, site): def rw_width_tags(segmk, ps, site):

2
minitests/roi_harness/create_design_json.py
View File

@ -110,7 +110,7 @@ def main():
required_features.append(fasm_line) required_features.append(fasm_line)
design_json['required_features'] = fasm.fasm_tuple_to_string( design_json['required_features'] = fasm.fasm_tuple_to_string(
required_features, canonical=True) required_features, canonical=True).split('\n')
xjson.pprint(sys.stdout, design_json) xjson.pprint(sys.stdout, design_json)

3
utils/fasm2frames.py
View File

@ -70,7 +70,8 @@ def run(db_root, filename_in, f_out, sparse=False, roi=None, debug=False):
assembler.mark_roi_frames(Roi(db=db, x1=x1, x2=x2, y1=y1, y2=y2)) assembler.mark_roi_frames(Roi(db=db, x1=x1, x2=x2, y1=y1, y2=y2))
if 'required_features' in roi_j: if 'required_features' in roi_j:
extra_features = fasm.parse_fasm_string(roi_j['required_features']) extra_features = fasm.parse_fasm_string(
'\n'.join(roi_j['required_features']))
assembler.parse_fasm_filename(filename_in, extra_features=extra_features) assembler.parse_fasm_filename(filename_in, extra_features=extra_features)
frames = assembler.get_frames(sparse=sparse) frames = assembler.get_frames(sparse=sparse)