ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2015 from mlnx/memap_improvements 

[memap] Improve wording on stack/heap and minor improvements
pull/2049/head
Sam Grove 2016-06-28 11:00:10 -05:00 committed by GitHub
parent 5ea1953755 d50139c8e3
commit ec1ec7c3e2
1 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
tools/memap.py
View File

@ -2,7 +2,7 @@
# pylint: disable=too-many-arguments, too-many-locals, too-many-branches, too-many-lines, line-too-long, too-many-nested-blocks, too-many-public-methods, too-many-instance-attributes # pylint: disable=too-many-arguments, too-many-locals, too-many-branches, too-many-lines, line-too-long, too-many-nested-blocks, too-many-public-methods, too-many-instance-attributes
# pylint: disable=invalid-name, missing-docstring # pylint: disable=invalid-name, missing-docstring
# Memory Map File Analyser for ARM mbed OS # Memory Map File Analyser for ARM mbed
import sys import sys
import os import os
@ -317,7 +317,7 @@ class MemapParser(object):
if test_rex: if test_rex:
search_path = test_rex.group(1) + toolchain + '/mbed-os/' search_path = test_rex.group(1) + toolchain + '/mbed-os/'
else: else:
# It looks this is not an mbed OS project # It looks this is not an mbed project
# object-to-module mapping cannot be generated # object-to-module mapping cannot be generated
print "Warning: specified toolchain doesn't match with path to the memory map file." print "Warning: specified toolchain doesn't match with path to the memory map file."
return return
@ -369,6 +369,9 @@ class MemapParser(object):
table = PrettyTable(columns) table = PrettyTable(columns)
table.align["Module"] = "l" table.align["Module"] = "l"
for i in list(self.print_sections):
table.align[i] = 'r'
subtotal = dict() subtotal = dict()
for k in self.sections: for k in self.sections:
subtotal[k] = 0 subtotal[k] = 0
@ -399,9 +402,9 @@ class MemapParser(object):
if export_format == 'json': if export_format == 'json':
json_obj.append({\ json_obj.append({\
'summary':{\ 'summary':{\
'static_ram':(subtotal['.data']+subtotal['.bss']),\ 'total_static_ram':(subtotal['.data']+subtotal['.bss']),\
'heap':(subtotal['.heap']),\ 'allocated_heap':(subtotal['.heap']),\
'stack':(subtotal['.stack']),\ 'allocated_stack':(subtotal['.stack']),\
'total_ram':(subtotal['.data']+subtotal['.bss']+subtotal['.heap']+subtotal['.stack']),\ 'total_ram':(subtotal['.data']+subtotal['.bss']+subtotal['.heap']+subtotal['.stack']),\
'total_flash':(subtotal['.text']+subtotal['.data']+misc_flash_mem),}}) 'total_flash':(subtotal['.text']+subtotal['.data']+misc_flash_mem),}})
@ -419,14 +422,20 @@ class MemapParser(object):
csv_module_section += [i+k] csv_module_section += [i+k]
csv_sizes += [self.modules[i][k]] csv_sizes += [self.modules[i][k]]
csv_module_section += ['static_ram'] csv_module_section += ['total_static_ram']
csv_sizes += [subtotal['.data']+subtotal['.bss']] csv_sizes += [subtotal['.data']+subtotal['.bss']]
csv_module_section += ['heap'] csv_module_section += ['allocated_heap']
csv_sizes += [subtotal['.heap']] if subtotal['.heap'] == 0:
csv_sizes += ['unknown']
else:
csv_sizes += [subtotal['.heap']]
csv_module_section += ['stack'] csv_module_section += ['allocated_stack']
csv_sizes += [subtotal['.stack']] if subtotal['.stack'] == 0:
csv_sizes += ['unknown']
else:
csv_sizes += [subtotal['.stack']]
csv_module_section += ['total_ram'] csv_module_section += ['total_ram']
csv_sizes += [subtotal['.data']+subtotal['.bss']+subtotal['.heap']+subtotal['.stack']] csv_sizes += [subtotal['.data']+subtotal['.bss']+subtotal['.heap']+subtotal['.stack']]
@ -440,11 +449,20 @@ class MemapParser(object):
else: # default format is 'table' else: # default format is 'table'
file_desc.write(table.get_string()) file_desc.write(table.get_string())
file_desc.write('\n') file_desc.write('\n')
file_desc.write("Static RAM memory (data + bss): %s\n" % (str(subtotal['.data']+subtotal['.bss'])))
file_desc.write("Heap: %s\n" % str(subtotal['.heap'])) if subtotal['.heap'] == 0:
file_desc.write("Stack: %s\n" % str(subtotal['.stack'])) file_desc.write("Allocated Heap: unknown\n")
file_desc.write("Total RAM memory (data + bss + heap + stack): %s\n" % (str(subtotal['.data']+subtotal['.bss']+subtotal['.heap']+subtotal['.stack']))) else:
file_desc.write("Total Flash memory (text + data + misc): %s\n" % (str(subtotal['.text']+subtotal['.data']+misc_flash_mem))) file_desc.write("Allocated Heap: %s bytes\n" % str(subtotal['.heap']))
if subtotal['.stack'] == 0:
file_desc.write("Allocated Stack: unknown\n")
else:
file_desc.write("Allocated Stack: %s bytes\n" % str(subtotal['.stack']))
file_desc.write("Total Static RAM memory (data + bss): %s bytes\n" % (str(subtotal['.data']+subtotal['.bss'])))
file_desc.write("Total RAM memory (data + bss + heap + stack): %s bytes\n" % (str(subtotal['.data']+subtotal['.bss']+subtotal['.heap']+subtotal['.stack'])))
file_desc.write("Total Flash memory (text + data + misc): %s bytes\n" % (str(subtotal['.text']+subtotal['.data']+misc_flash_mem)))
if file_desc is not sys.stdout: if file_desc is not sys.stdout:
file_desc.close() file_desc.close()
@ -479,10 +497,10 @@ class MemapParser(object):
def main(): def main():
version = '0.3.10' version = '0.3.11'
# Parser handling # Parser handling
parser = argparse.ArgumentParser(description="Memory Map File Analyser for ARM mbed OS\nversion %s" % version) parser = argparse.ArgumentParser(description="Memory Map File Analyser for ARM mbed\nversion %s" % version)
parser.add_argument('file', help='memory map file') parser.add_argument('file', help='memory map file')