Skip to content

[memap] Improve wording on stack/heap and minor improvements #2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 28, 2016
Merged

[memap] Improve wording on stack/heap and minor improvements #2015

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0f53cc
[memap] Removing stack/heap and minor improvements
Jun 27, 2016
fbd8a41
Reverted changes and improved wording
Jun 27, 2016
d50139c
Minor tweaks
Jun 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 35 additions & 17 deletions tools/memap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=invalid-name, missing-docstring

# Memory Map File Analyser for ARM mbed OS
# Memory Map File Analyser for ARM mbed

import sys
import os
Expand Down Expand Up @@ -317,7 +317,7 @@ def search_objects(self, path, toolchain):
if test_rex:
search_path = test_rex.group(1) + toolchain + '/mbed-os/'
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
print "Warning: specified toolchain doesn't match with path to the memory map file."
return
Expand Down Expand Up @@ -369,6 +369,9 @@ def generate_output(self, export_format, file_output=None):
table = PrettyTable(columns)
table.align["Module"] = "l"

for i in list(self.print_sections):
table.align[i] = 'r'

subtotal = dict()
for k in self.sections:
subtotal[k] = 0
Expand Down Expand Up @@ -399,9 +402,9 @@ def generate_output(self, export_format, file_output=None):
if export_format == 'json':
json_obj.append({\
'summary':{\
'static_ram':(subtotal['.data']+subtotal['.bss']),\
'heap':(subtotal['.heap']),\
'stack':(subtotal['.stack']),\
'total_static_ram':(subtotal['.data']+subtotal['.bss']),\
'allocated_heap':(subtotal['.heap']),\
'allocated_stack':(subtotal['.stack']),\
'total_ram':(subtotal['.data']+subtotal['.bss']+subtotal['.heap']+subtotal['.stack']),\
'total_flash':(subtotal['.text']+subtotal['.data']+misc_flash_mem),}})

Expand All @@ -419,14 +422,20 @@ def generate_output(self, export_format, file_output=None):
csv_module_section += [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_module_section += ['heap']
csv_sizes += [subtotal['.heap']]
csv_module_section += ['allocated_heap']
if subtotal['.heap'] == 0:
csv_sizes += ['unknown']
else:
csv_sizes += [subtotal['.heap']]

csv_module_section += ['stack']
csv_sizes += [subtotal['.stack']]
csv_module_section += ['allocated_stack']
if subtotal['.stack'] == 0:
csv_sizes += ['unknown']
else:
csv_sizes += [subtotal['.stack']]

csv_module_section += ['total_ram']
csv_sizes += [subtotal['.data']+subtotal['.bss']+subtotal['.heap']+subtotal['.stack']]
Expand All @@ -440,11 +449,20 @@ def generate_output(self, export_format, file_output=None):
else: # default format is 'table'
file_desc.write(table.get_string())
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']))
file_desc.write("Stack: %s\n" % str(subtotal['.stack']))
file_desc.write("Total RAM memory (data + bss + heap + stack): %s\n" % (str(subtotal['.data']+subtotal['.bss']+subtotal['.heap']+subtotal['.stack'])))
file_desc.write("Total Flash memory (text + data + misc): %s\n" % (str(subtotal['.text']+subtotal['.data']+misc_flash_mem)))

if subtotal['.heap'] == 0:
file_desc.write("Allocated Heap: unknown\n")
else:
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:
file_desc.close()
Expand Down Expand Up @@ -479,10 +497,10 @@ def parse(self, mapfile, toolchain):

def main():

version = '0.3.10'
version = '0.3.11'

# 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')

Expand Down