From 0e7de2c6ceec38a11156e0ba23b14dc777d2230e Mon Sep 17 00:00:00 2001 From: Tauwasser Date: Sun, 17 Jun 2018 11:05:09 +0200 Subject: tools/disasm_coverage: add mode that reads the baserom and marks fillers at ends of banks as included in coverage Signed-off-by: Tauwasser --- tools/disasm_coverage.py | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/tools/disasm_coverage.py b/tools/disasm_coverage.py index 39d1960..b5c8d40 100644 --- a/tools/disasm_coverage.py +++ b/tools/disasm_coverage.py @@ -10,13 +10,14 @@ import png from mapreader import MapReader from colorsys import hls_to_rgb -if __name__ == "__main__": +if __name__ == '__main__': # argument parser ap = argparse.ArgumentParser() - ap.add_argument("-o", dest="filename", default="coverage.png") - ap.add_argument("-s", dest="statsname", default="coverage.log") - ap.add_argument("-m", dest="mapfile", required=True) - ap.add_argument("-b", dest="num_banks", required=True, type=lambda x: int(x, 0)) + ap.add_argument('-r', dest='romname') + ap.add_argument('-o', dest='filename', default='coverage.png') + ap.add_argument('-s', dest='statsname', default='coverage.log') + ap.add_argument('-m', dest='mapfile', required=True) + ap.add_argument('-b', dest='num_banks', required=True, type=lambda x: int(x, 0)) args = ap.parse_args() bank_mask = 0x3FFF @@ -24,6 +25,7 @@ if __name__ == "__main__": width = 256 # pixels per row bpp = 8 # bytes per pixel + romname = args.romname rom_size = args.num_banks * bank_size # bytes height = (args.num_banks * bank_size + (width * bpp - 1)) // (width * bpp) # pixels rows_per_bank = bank_size // (width * bpp) @@ -34,12 +36,29 @@ if __name__ == "__main__": l = f.readlines() except UnicodeDecodeError: # Python 3 seems to choke on the file's encoding, but the `encoding` keyword only works on Py3 - with open(args.mapfile, 'r', encoding= "utf-8") as f: + with open(args.mapfile, 'r', encoding= 'utf-8') as f: l = f.readlines() r.read_map_data(l) - hit_data = [[0] * width for _ in range(height)] default_bank_data = {'sections': [], 'used': 0, 'slack': bank_size} + filler = [0x00, 0xFF] + + if (romname is not None): + with open(romname, 'rb') as f: + for rb in range(0, args.num_banks): + data = r.bank_data['ROM Bank'].get(rb, default_bank_data) + bank = f.read(bank_size) + if (bank[bank_size - 1] in filler): + fill = bank[bank_size - 1] + for i in reversed(range(-1, bank_size - 1)): + if (i < 0 or bank[i] != fill): + break + # i is now pointing to first different byte + beg = i + 1 + (0 if rb == 0 else bank_size) + end = bank_size + (0 if rb == 0 else bank_size) + data['sections'].append({'beg': beg, 'end': end, 'name': 'Section_Trailing_Fill', 'symbols': []}) + + hit_data = [[0] * width for _ in range(height)] for bank in range(args.num_banks): data = r.bank_data['ROM Bank'].get(bank, default_bank_data) for s in data['sections']: -- cgit v1.2.3 From 5957f7c2c72e97e615e6299d1bfc6e3374135869 Mon Sep 17 00:00:00 2001 From: Tauwasser Date: Sun, 17 Jun 2018 11:05:48 +0200 Subject: tools/disasm_coverage.py: remove useless logging option Signed-off-by: Tauwasser --- tools/disasm_coverage.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/disasm_coverage.py b/tools/disasm_coverage.py index b5c8d40..7585370 100644 --- a/tools/disasm_coverage.py +++ b/tools/disasm_coverage.py @@ -15,7 +15,6 @@ if __name__ == '__main__': ap = argparse.ArgumentParser() ap.add_argument('-r', dest='romname') ap.add_argument('-o', dest='filename', default='coverage.png') - ap.add_argument('-s', dest='statsname', default='coverage.log') ap.add_argument('-m', dest='mapfile', required=True) ap.add_argument('-b', dest='num_banks', required=True, type=lambda x: int(x, 0)) args = ap.parse_args() @@ -82,10 +81,6 @@ if __name__ == '__main__': for x in range(x_line_beg, x_line_end + 1): hit_data[y][x] += bpp - with open(args.statsname, 'w') as stats: - # TODO: write stats - pass - png_data = [] for i, row in enumerate(hit_data): bank = i // rows_per_bank -- cgit v1.2.3 From 9ce9e9269789bb25bd286c9ac0f9bb17bfd31a35 Mon Sep 17 00:00:00 2001 From: Tauwasser Date: Sun, 17 Jun 2018 10:56:21 +0200 Subject: tools/disasm_coverage: fix off-by-one error and skip zero-sized sections Signed-off-by: Tauwasser --- tools/disasm_coverage.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/disasm_coverage.py b/tools/disasm_coverage.py index 7585370..00bee62 100644 --- a/tools/disasm_coverage.py +++ b/tools/disasm_coverage.py @@ -63,6 +63,10 @@ if __name__ == '__main__': for s in data['sections']: beg = (s['beg'] & bank_mask) + bank * bank_size end = (s['end'] & bank_mask) + bank * bank_size + # skip zero-sized entries + if (beg == end): + continue + end -= 1 # end is exclusive y_beg = beg // (width * bpp) x_beg = (beg % (width * bpp)) // bpp y_end = end // (width * bpp) -- cgit v1.2.3 From c0b094e17a77eb54d6111b6f90ad559e3ffe919f Mon Sep 17 00:00:00 2001 From: Tauwasser Date: Sun, 17 Jun 2018 11:33:42 +0200 Subject: tools/disasm_coverage.py: fix off-by-one error smarter to fix edge case in RB 0x00 Signed-off-by: Tauwasser --- tools/disasm_coverage.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/disasm_coverage.py b/tools/disasm_coverage.py index 00bee62..9fcd61e 100644 --- a/tools/disasm_coverage.py +++ b/tools/disasm_coverage.py @@ -62,11 +62,10 @@ if __name__ == '__main__': data = r.bank_data['ROM Bank'].get(bank, default_bank_data) for s in data['sections']: beg = (s['beg'] & bank_mask) + bank * bank_size - end = (s['end'] & bank_mask) + bank * bank_size + end = ((s['end'] -1) & bank_mask) + bank * bank_size # end is exclusive # skip zero-sized entries - if (beg == end): + if (s['beg'] == s['end']): continue - end -= 1 # end is exclusive y_beg = beg // (width * bpp) x_beg = (beg % (width * bpp)) // bpp y_end = end // (width * bpp) -- cgit v1.2.3