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 2018-10-05 09:36:33 -07:00
parent f77755ea5d
commit 4fe294df19
5 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuzzers/074-dump_all/generate_grid.py
View File

@ -540,8 +540,7 @@ def generate_tileconn(pool, node_tree, nodes, wire_map, grid):
bar.update(idx) bar.update(idx)
raw_node_data.append(node) raw_node_data.append(node)
process_node( process_node(
tileconn, key_history, node, wire_map, node_tree, tileconn, key_history, node, wire_map, node_tree, grid)
grid)
bar.update(idx + 1) bar.update(idx + 1)
tileconn = flatten_tile_conn(tileconn) tileconn = flatten_tile_conn(tileconn)

8
tools/fasm2frame.py
View File

@ -160,17 +160,15 @@ def run(f_in, f_out, sparse=False, debug=False):
new_grid = json.load(f) new_grid = json.load(f)
# TODO: Migrate to new tilegrid format via library. # TODO: Migrate to new tilegrid format via library.
grid = { grid = {'tiles': new_grid, 'segments': {}}
'tiles': new_grid,
'segments': {}
}
for tile in grid['tiles'].values(): for tile in grid['tiles'].values():
if 'segment' in tile: if 'segment' in tile:
segment = tile['segment'] segment = tile['segment']
grid['segments'][segment] = { grid['segments'][segment] = {
'baseaddr': [ 'baseaddr': [
tile['baseaddr'], tile['offset'], tile['baseaddr'],
tile['offset'],
], ],
'type': tile['segment_type'], 'type': tile['segment_type'],
'frames': tile['frames'], 'frames': tile['frames'],

14
tools/segprint2fasm.py
View File

@ -76,10 +76,7 @@ def run(f_in, f_out, sparse=False):
new_grid = json.load(f) new_grid = json.load(f)
# TODO: Migrate to new tilegrid format via library. # TODO: Migrate to new tilegrid format via library.
grid = { grid = {'tiles': new_grid, 'segments': {}}
'tiles': new_grid,
'segments': {}
}
for tilename, tile in grid['tiles'].items(): for tilename, tile in grid['tiles'].items():
if 'segment' in tile: if 'segment' in tile:
@ -88,7 +85,8 @@ def run(f_in, f_out, sparse=False):
if segment not in grid['segments']: if segment not in grid['segments']:
grid['segments'][segment] = { grid['segments'][segment] = {
'baseaddr': ( 'baseaddr': (
tile['baseaddr'], tile['offset'], tile['baseaddr'],
tile['offset'],
), ),
'type': tile['segment_type'], 'type': tile['segment_type'],
'frames': tile['frames'], 'frames': tile['frames'],
@ -97,9 +95,11 @@ def run(f_in, f_out, sparse=False):
} }
else: else:
assert grid['segments'][segment]['baseaddr'] == ( assert grid['segments'][segment]['baseaddr'] == (
tile['baseaddr'], tile['offset'], tile['baseaddr'],
tile['offset'],
) )
assert grid['segments'][segment]['type'] == tile['segment_type'] assert grid['segments'][segment]['type'] == tile[
'segment_type']
assert grid['segments'][segment]['frames'] == tile['frames'] assert grid['segments'][segment]['frames'] == tile['frames']
assert grid['segments'][segment]['words'] == tile['words'] assert grid['segments'][segment]['words'] == tile['words']

5
utils/merge_tilegrid.py
View File

@ -1,6 +1,7 @@
import json import json
import argparse import argparse
def main(): def main():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
@ -24,7 +25,8 @@ def main():
if tile in base_grid: if tile in base_grid:
for k in overlay_grid[tile]: for k in overlay_grid[tile]:
if k in base_grid[tile]: if k in base_grid[tile]:
assert base_grid[tile][k] == overlay_grid[tile][k], (k, base_grid[tile][k], overlay_grid[tile][k]) assert base_grid[tile][k] == overlay_grid[tile][k], (
k, base_grid[tile][k], overlay_grid[tile][k])
else: else:
base_grid[tile][k] = overlay_grid[tile][k] base_grid[tile][k] = overlay_grid[tile][k]
else: else:
@ -33,5 +35,6 @@ def main():
with open(args.output_grid, 'w') as f: with open(args.output_grid, 'w') as f:
json.dump(base_grid, f, indent=2) json.dump(base_grid, f, indent=2)
if __name__ == '__main__': if __name__ == '__main__':
main() main()

8
utils/segprint.py
View File

@ -51,17 +51,15 @@ with open("%s/%s/tilegrid.json" % (os.getenv("XRAY_DATABASE_DIR"),
new_grid = json.load(f) new_grid = json.load(f)
# TODO: Migrate to new tilegrid format via library. # TODO: Migrate to new tilegrid format via library.
grid = { grid = {'tiles': new_grid, 'segments': {}}
'tiles': new_grid,
'segments': {}
}
for tile in grid['tiles'].values(): for tile in grid['tiles'].values():
if 'segment' in tile: if 'segment' in tile:
segment = tile['segment'] segment = tile['segment']
grid['segments'][segment] = { grid['segments'][segment] = {
'baseaddr': [ 'baseaddr': [
tile['baseaddr'], tile['offset'], tile['baseaddr'],
tile['offset'],
], ],
'type': tile['segment_type'], 'type': tile['segment_type'],
'frames': tile['frames'], 'frames': tile['frames'],