Skip to content

Commit 5c82db8

Browse files
authored
Merge pull request #2494 from theotherjimmy/fix-memap-table
Print module information in 'table' output format
2 parents b233da0 + 74dd5ef commit 5c82db8

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

tools/memap.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -419,13 +419,6 @@ def generate_output(self, export_format, file_output=None):
419419
for i in sorted(self.modules):
420420

421421
row = []
422-
row.append(i)
423-
424-
for k in self.sections:
425-
subtotal[k] += self.modules[i][k]
426-
427-
for k in self.print_sections:
428-
row.append(self.modules[i][k])
429422

430423
json_obj.append({
431424
"module":i,
@@ -530,6 +523,16 @@ def generate_table(self, subtotal, misc_flash_mem, file_desc):
530523
for i in list(self.print_sections):
531524
table.align[i] = 'r'
532525

526+
for i in sorted(self.modules):
527+
row = [i]
528+
529+
for k in self.sections:
530+
subtotal[k] += self.modules[i][k]
531+
532+
for k in self.print_sections:
533+
row.append(self.modules[i][k])
534+
535+
table.add_row(row)
533536

534537
subtotal_row = ['Subtotals']
535538
for k in self.print_sections:

0 commit comments

Comments
 (0)