alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

cmake: Fix idf_size.py merge errors

Browse Source
This commit is contained in:
Angus Gratton 2018-05-01 17:01:36 +10:00 committed by Angus Gratton
parent 68282cf80b
commit 9ec14decce
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/idf_size.py
View File

@ -102,12 +102,13 @@ def load_sections(map_file):
# source file line, ie
# 0x0000000040080400 0xa4 /home/gus/esp/32/idf/examples/get-started/hello_world/build/esp32/libesp32.a(cpu_start.o)
RE_SOURCE_LINE = r"\s*(?P<sym_name>\S*).* +0x(?P<address>[\da-f]+) +0x(?P<size>[\da-f]+) (?P<archive>.+\.a)\((?P<object_file>.+\.ob?j?)\)"
m = re.match(RE_SOURCE_LINE, line)
m = re.match(RE_SOURCE_LINE, line, re.M)
if not m:
# cmake build system links some object files directly, not part of any archive
RE_SOURCE_LINE = r".*? +0x(?P<address>[\da-f]+) +0x(?P<size>[\da-f]+) (?P<object_file>.+\.ob?j?)"
RE_SOURCE_LINE = r"\s*(?P<sym_name>\S*).* +0x(?P<address>[\da-f]+) +0x(?P<size>[\da-f]+) (?P<object_file>.+\.ob?j?)"
m = re.match(RE_SOURCE_LINE, line)
if section is not None and m is not None: # input source file details
if section is not None and m is not None: # input source file details=ma,e
sym_name = m.group("sym_name") if len(m.group("sym_name")) > 0 else sym_backup
try:
archive = m.group("archive")
@ -117,7 +118,7 @@ def load_sections(map_file):
source = {
"size" : int(m.group("size"), 16),
"address" : int(m.group("address"), 16),
"archive" : os.path.basename(archive)),
"archive" : os.path.basename(archive),
"object_file" : os.path.basename(m.group("object_file")),
"sym_name" : sym_name,
}