Skip to content

Fixed bug on memap (non-default output path) #2612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 16, 2016
Merged

Fixed bug on memap (non-default output path) #2612

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions tools/memap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,28 +342,23 @@ def parse_map_file_iar(self, file_desc):
else:
self.module_add(name, size, section)

def search_objects(self, path, toolchain):
""" Check whether the specified map file matches with the toolchain.
Searches for object files and creates mapping: object --> module
def search_objects(self, path):
""" Searches for object files and creates mapping: object --> module

Positional arguments:
path - the path to an object file
toolchain - the toolchain used to build the object file
"""

path = path.replace('\\', '/')

# check location of map file
rex = r'^(.+\/)' + re.escape(toolchain) + r'\/(.+\.map)$'
rex = r'^(.+)' + r'\/(.+\.map)$'
test_rex = re.match(rex, path)

if test_rex:
search_path = test_rex.group(1) + toolchain + '/mbed-os/'
search_path = test_rex.group(1) + '/mbed-os/'
else:
# It looks this is not an mbed project
# object-to-module mapping cannot be generated
print "Warning: specified toolchain doesn't match with"\
" path to the memory map file."
print "Warning: this doesn't look like an mbed project"
return

for root, _, obj_files in os.walk(search_path):
Expand Down Expand Up @@ -580,12 +575,12 @@ def parse(self, mapfile, toolchain):
with open(mapfile, 'r') as file_input:
if toolchain == "ARM" or toolchain == "ARM_STD" or\
toolchain == "ARM_MICRO":
self.search_objects(os.path.abspath(mapfile), "ARM")
self.search_objects(os.path.abspath(mapfile))
self.parse_map_file_armcc(file_input)
elif toolchain == "GCC_ARM":
self.parse_map_file_gcc(file_input)
elif toolchain == "IAR":
self.search_objects(os.path.abspath(mapfile), toolchain)
self.search_objects(os.path.abspath(mapfile))
self.parse_map_file_iar(file_input)
else:
result = False
Expand All @@ -597,7 +592,7 @@ def parse(self, mapfile, toolchain):
def main():
"""Entry Point"""

version = '0.3.11'
version = '0.3.12'

# Parser handling
parser = argparse.ArgumentParser(
Expand Down