mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/make_size_windows' into 'master' 

make size: Fix map file parsing error on Windows

See merge request !932
pull/585/merge
Angus Gratton 2017-07-12 17:31:49 +08:00
rodzic 8cd03c84d0 a8f08dc5da
commit c46e2edcae
1 zmienionych plików z 3 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
tools/idf_size.py
Wyświetl plik

@ -57,12 +57,12 @@ def load_memory_config(map_file):
""" Memory Configuration section is the total size of each output section """ """ Memory Configuration section is the total size of each output section """
result = {} result = {}
scan_to_header(map_file, "Memory Configuration") scan_to_header(map_file, "Memory Configuration")
RE_MEMORY_SECTION = r"(?P<name>[^ ]+) +0x(?P<origin>[\da-f]+) 0x(?P<length>[\da-f]+)" RE_MEMORY_SECTION = r"(?P<name>[^ ]+) +0x(?P<origin>[\da-f]+) +0x(?P<length>[\da-f]+)"
for line in map_file: for line in map_file:
m = re.match(RE_MEMORY_SECTION, line) m = re.match(RE_MEMORY_SECTION, line)
if m is None: if m is None:
if len(result) == 0: if len(result) == 0:
continue # whitespace or a header continue # whitespace or a header, before the content we want
else: else:
return result # we're at the end of the Memory Configuration return result # we're at the end of the Memory Configuration
section = { section = {
@ -72,6 +72,7 @@ def load_memory_config(map_file):
} }
if section["name"] != "*default*": if section["name"] != "*default*":
result[section["name"]] = section result[section["name"]] = section
raise RuntimeError("End of file while scanning memory configuration?")
def load_sections(map_file): def load_sections(map_file):
""" Load section size information from the MAP file. """ Load section size information from the MAP file.