ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove prefix stuff from GCC memap parser 

It's just not used anymore
pull/5125/head
Jimmy Brisson 2017-09-20 10:59:30 -05:00
parent 3d5bea337f
commit 727256a05d
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/memap.py
View File

@ -20,8 +20,6 @@ RE_IAR = re.compile(
r'^\s+(.+)\s+(zero|const|ro code|inited|uninit)\s' r'^\s+(.+)\s+(zero|const|ro code|inited|uninit)\s'
r'+0x(\w{8})\s+0x(\w+)\s+(.+)\s.+$') r'+0x(\w{8})\s+0x(\w+)\s+(.+)\s.+$')
RE_IS_TEST = re.compile(r'^(.+)\/.*TESTS\/.+\.map$')
RE_CMDLINE_FILE_IAR = re.compile(r'^#\s+(.+\.o)') RE_CMDLINE_FILE_IAR = re.compile(r'^#\s+(.+\.o)')
RE_LIBRARY_IAR = re.compile(r'^(.+\.a)\:.+$') RE_LIBRARY_IAR = re.compile(r'^(.+\.a)\:.+$')
RE_OBJECT_LIBRARY_IAR = re.compile(r'^\s+(.+\.o)\s.*') RE_OBJECT_LIBRARY_IAR = re.compile(r'^\s+(.+\.o)\s.*')
@ -131,7 +129,7 @@ class MemapParser(object):
return False # everything else, means no change in section return False # everything else, means no change in section
def parse_object_name_gcc(self, line, prefixes): def parse_object_name_gcc(self, line):
""" Parse a path to object file """ Parse a path to object file
Positional arguments: Positional arguments:
@ -148,11 +146,6 @@ class MemapParser(object):
# corner case: certain objects are provided by the GCC toolchain # corner case: certain objects are provided by the GCC toolchain
if 'arm-none-eabi' in line: if 'arm-none-eabi' in line:
return '[lib]/misc/' + object_name return '[lib]/misc/' + object_name
for prefix in prefixes:
if object_name.startswith(prefix):
return os.path.relpath(object_name, prefix)
return object_name return object_name
else: else:
@ -169,7 +162,7 @@ class MemapParser(object):
print "Unknown object name found in GCC map file: %s" % line print "Unknown object name found in GCC map file: %s" % line
return '[misc]' return '[misc]'
def parse_section_gcc(self, line, prefixes): def parse_section_gcc(self, line):
""" Parse data from a section of gcc map file """ Parse data from a section of gcc map file
examples: examples:
@ -190,7 +183,7 @@ class MemapParser(object):
if is_section: if is_section:
o_size = int(is_section.group(2), 16) o_size = int(is_section.group(2), 16)
if o_size: if o_size:
o_name = self.parse_object_name_gcc(is_section.group(3), prefixes) o_name = self.parse_object_name_gcc(is_section.group(3))
return [o_name, o_size] return [o_name, o_size]
return ["", 0] return ["", 0]
@ -204,11 +197,6 @@ class MemapParser(object):
current_section = 'unknown' current_section = 'unknown'
prefixes = [os.path.abspath(os.path.dirname(file_desc.name))]
is_test = re.match(RE_IS_TEST, file_desc.name)
if is_test:
prefixes.append(os.path.abspath(is_test.group(1)))
with file_desc as infile: with file_desc as infile:
for line in infile: for line in infile:
if line.startswith('Linker script and memory map'): if line.startswith('Linker script and memory map'):
@ -223,7 +211,7 @@ class MemapParser(object):
elif next_section: elif next_section:
current_section = next_section current_section = next_section
object_name, object_size = self.parse_section_gcc(line, prefixes) object_name, object_size = self.parse_section_gcc(line)
self.module_add(object_name, object_size, current_section) self.module_add(object_name, object_size, current_section)