mirror of https://github.com/openXC7/prjxray.git
Output required_features as a list rather than a string with newlines.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
This commit is contained in:
parent
a2d371864a
commit
2a114a9726
|
|
@ -65,7 +65,8 @@ def bus_tags(segmk, ps, site):
|
|||
# Magic bit positions from experimentation
|
||||
# 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):
|
||||
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):
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ def main():
|
|||
required_features.append(fasm_line)
|
||||
|
||||
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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
||||
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)
|
||||
frames = assembler.get_frames(sparse=sparse)
|
||||
|
|
|
|||
Loading…
Reference in New Issue