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

Merge pull request #116 from mithro/master 

python: Run latest yapf.
This commit is contained in:
Tim Ansell 2018-06-22 15:25:10 -07:00 committed by GitHub
parent faa872ee1b e5346c308e
commit 4cda523b80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
experiments/example/segdata.py
View File

@ -78,8 +78,8 @@ for tilename, tiledata in grid["tiles"].items():
continue continue
segname = "%s_%02x" % ( segname = "%s_%02x" % (
tiledata["cfgcol"]["BASE_FRAMEID"][2:], tiledata["cfgcol"]["BASE_FRAMEID"][2:], min(
min(tiledata["cfgcol"]["WORDS"])) tiledata["cfgcol"]["WORDS"]))
if not segname in segments: if not segname in segments:
segments[segname] = {"bits": list(), "tags": dict()} segments[segname] = {"bits": list(), "tags": dict()}
@ -122,9 +122,8 @@ for tilename, tiledata in grid["tiles"].items():
for bit_frame, bit_wordidx, bit_bitidx in bits[base_frame][wordidx]: for bit_frame, bit_wordidx, bit_bitidx in bits[base_frame][wordidx]:
segments[segname]["bits"].append( segments[segname]["bits"].append(
"%02x_%02x_%02x" % ( "%02x_%02x_%02x" % (
bit_frame - base_frame, bit_frame - base_frame, bit_wordidx - min(
bit_wordidx - min(tiledata["cfgcol"]["WORDS"]), tiledata["cfgcol"]["WORDS"]), bit_bitidx))
bit_bitidx))
segments[segname]["bits"].sort() segments[segname]["bits"].sort()

6
htmlgen/htmlgen.py
View File

@ -709,9 +709,9 @@ function oml() {
" unused: %d, unknown: %d, known: %d, total: %d, percentage: %.2f%% (%.2f%%)" " unused: %d, unknown: %d, known: %d, total: %d, percentage: %.2f%% (%.2f%%)"
% ( % (
unused_bits, unknown_bits, known_bits, unused_bits, unknown_bits, known_bits,
unused_bits + unknown_bits + known_bits, unused_bits + unknown_bits + known_bits, 100 * known_bits /
100 * known_bits / (unknown_bits + unused_bits + known_bits), (unknown_bits + unused_bits + known_bits), 100 *
100 * (known_bits + unused_bits) / (known_bits + unused_bits) /
(unknown_bits + unused_bits + known_bits))) (unknown_bits + unused_bits + known_bits)))

4
tools/fasm2frame.py
View File

@ -95,8 +95,8 @@ def dump_frames_verbose(frames):
for addr in sorted(frames.keys()): for addr in sorted(frames.keys()):
words = frames[addr] words = frames[addr]
print( print(
'0x%08X ' % addr + ', '.join(['0x%08X' % w '0x%08X ' % addr + ', '.join(['0x%08X' % w for w in words]) +
for w in words]) + '...') '...')
def dump_frames_sparse(frames): def dump_frames_sparse(frames):

8
tools/simpleroute.py
View File

@ -84,8 +84,8 @@ def db_gen():
node_node_pip[src_node] = dict() node_node_pip[src_node] = dict()
if dst_node not in reverse_node_node: if dst_node not in reverse_node_node:
reverse_node_node[dst_node] = set() reverse_node_node[dst_node] = set()
node_node_pip[src_node][dst_node] = "%s.%s.%s" % ( node_node_pip[src_node][
tile, dst, src) dst_node] = "%s.%s.%s" % (tile, dst, src)
reverse_node_node[dst_node].add(src_node) reverse_node_node[dst_node].add(src_node)
return type_to_tiles, grid_to_tile, nodes, node_node_pip, reverse_node_node return type_to_tiles, grid_to_tile, nodes, node_node_pip, reverse_node_node
@ -141,8 +141,8 @@ def route(args):
try: try:
write_scores(set([dst_node]), 1) write_scores(set([dst_node]), 1)
except RecursionError as e: except RecursionError as e:
raise Exception("Could not find route for node %s" % raise Exception(
(dst_node, )) from None "Could not find route for node %s" % (dst_node, )) from None
print(" route length: %d" % node_scores[src_node]) print(" route length: %d" % node_scores[src_node])
count = 0 count = 0