From c07ffc7633fca8ccdb55856d67f5265638dcbe9a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 3 Jan 2018 14:52:32 -0500 Subject: [PATCH] Handle unused banks (notably OAM and HRAM) --- tools/sort_map.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/sort_map.py b/tools/sort_map.py index f842ca878..9f7f0f4b3 100644 --- a/tools/sort_map.py +++ b/tools/sort_map.py @@ -23,6 +23,7 @@ def total_bank_size(type): return sizes[type] def sorted_mapfile(input): + unused_rx = re.compile(r'^([A-Z]+):$') bank_rx = re.compile(r'^([A-Z]+) Bank #([0-9]+)') section_rx = re.compile(r' +SECTION: \$([0-9A-F]+)(?:-\$([0-9A-F]+))? \(\$([0-9A-F]+) bytes\) \["(.+)"\]') label_rx = re.compile(r' +\$([0-9A-F]+) = (.+)') @@ -40,6 +41,16 @@ def sorted_mapfile(input): # empty banks have their entire capacity as slack line = ' SLACK: $%04X bytes\n' % total_bank_size(bank_type) + x = re.match(unused_rx, line) + if x: + # start an unused bank + bank_type = x.group(1) + bank_number = '00' + bank_size = 0 + bank_queue.clear() + section_queue.clear() + continue + x = re.match(bank_rx, line) if x: # start a new bank