@@ -369,6 +369,9 @@ def generate_output(self, export_format, file_output=None):
369
369
table = PrettyTable (columns )
370
370
table .align ["Module" ] = "l"
371
371
372
+ for i in list (self .print_sections ):
373
+ table .align [i ] = 'r'
374
+
372
375
subtotal = dict ()
373
376
for k in self .sections :
374
377
subtotal [k ] = 0
@@ -399,10 +402,7 @@ def generate_output(self, export_format, file_output=None):
399
402
if export_format == 'json' :
400
403
json_obj .append ({\
401
404
'summary' :{\
402
- 'static_ram' :(subtotal ['.data' ]+ subtotal ['.bss' ]),\
403
- 'heap' :(subtotal ['.heap' ]),\
404
- 'stack' :(subtotal ['.stack' ]),\
405
- 'total_ram' :(subtotal ['.data' ]+ subtotal ['.bss' ]+ subtotal ['.heap' ]+ subtotal ['.stack' ]),\
405
+ 'total_static_ram' :(subtotal ['.data' ]+ subtotal ['.bss' ]),\
406
406
'total_flash' :(subtotal ['.text' ]+ subtotal ['.data' ]+ misc_flash_mem ),}})
407
407
408
408
file_desc .write (json .dumps (json_obj , indent = 4 ))
@@ -419,18 +419,9 @@ def generate_output(self, export_format, file_output=None):
419
419
csv_module_section += [i + k ]
420
420
csv_sizes += [self .modules [i ][k ]]
421
421
422
- csv_module_section += ['static_ram ' ]
422
+ csv_module_section += ['total_static_ram ' ]
423
423
csv_sizes += [subtotal ['.data' ]+ subtotal ['.bss' ]]
424
424
425
- csv_module_section += ['heap' ]
426
- csv_sizes += [subtotal ['.heap' ]]
427
-
428
- csv_module_section += ['stack' ]
429
- csv_sizes += [subtotal ['.stack' ]]
430
-
431
- csv_module_section += ['total_ram' ]
432
- csv_sizes += [subtotal ['.data' ]+ subtotal ['.bss' ]+ subtotal ['.heap' ]+ subtotal ['.stack' ]]
433
-
434
425
csv_module_section += ['total_flash' ]
435
426
csv_sizes += [subtotal ['.text' ]+ subtotal ['.data' ]+ misc_flash_mem ]
436
427
@@ -440,11 +431,8 @@ def generate_output(self, export_format, file_output=None):
440
431
else : # default format is 'table'
441
432
file_desc .write (table .get_string ())
442
433
file_desc .write ('\n ' )
443
- file_desc .write ("Static RAM memory (data + bss): %s\n " % (str (subtotal ['.data' ]+ subtotal ['.bss' ])))
444
- file_desc .write ("Heap: %s\n " % str (subtotal ['.heap' ]))
445
- file_desc .write ("Stack: %s\n " % str (subtotal ['.stack' ]))
446
- file_desc .write ("Total RAM memory (data + bss + heap + stack): %s\n " % (str (subtotal ['.data' ]+ subtotal ['.bss' ]+ subtotal ['.heap' ]+ subtotal ['.stack' ])))
447
- file_desc .write ("Total Flash memory (text + data + misc): %s\n " % (str (subtotal ['.text' ]+ subtotal ['.data' ]+ misc_flash_mem )))
434
+ file_desc .write ("Total Static RAM memory (data + bss): %s bytes\n " % (str (subtotal ['.data' ]+ subtotal ['.bss' ])))
435
+ file_desc .write ("Total Flash memory (text + data + misc): %s bytes\n " % (str (subtotal ['.text' ]+ subtotal ['.data' ]+ misc_flash_mem )))
448
436
449
437
if file_desc is not sys .stdout :
450
438
file_desc .close ()
@@ -479,7 +467,7 @@ def parse(self, mapfile, toolchain):
479
467
480
468
def main ():
481
469
482
- version = '0.3.10 '
470
+ version = '0.3.11 '
483
471
484
472
# Parser handling
485
473
parser = argparse .ArgumentParser (description = "Memory Map File Analyser for ARM mbed OS\n version %s" % version )
0 commit comments