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

Broaden acceptable toolchain spec; improved incorrect toolchain error

pull/1976/head
Jimmy Brisson 2016-06-20 11:21:24 -05:00
parent f864b8439f
commit f442fd9394
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/memap.py
View File

@ -477,6 +477,15 @@ class MemapParser(object):
return True return True
toolchains = ["ARM", "ARM_STD", "ARM_MICRO", "GCC_ARM", "IAR"]
@staticmethod
def parse_toolchain(string) :
newstring = string.upper().replace("-","_")
if newstring not in MemapParser.toolchains:
raise (argparse.ArgumentTypeError("{} is not a supported toolchain. Supported toolchains are {}".format(string, ", ".join(MemapParser.toolchains))))
else:
return newstring
def main(): def main():
version = '0.3.10' version = '0.3.10'
@ -486,8 +495,8 @@ def main():
parser.add_argument('file', help='memory map file') parser.add_argument('file', help='memory map file')
parser.add_argument('-t', '--toolchain', dest='toolchain', help='select a toolchain used to build the memory map file (ARM, GCC_ARM, IAR)',\ parser.add_argument('-t', '--toolchain', dest='toolchain', help='select a toolchain used to build the memory map file (%s)' % ", ".join(MemapParser.toolchains),\
required=True) required=True, type=MemapParser.parse_toolchain)
parser.add_argument('-o', '--output', help='output file name', required=False) parser.add_argument('-o', '--output', help='output file name', required=False)
@ -510,7 +519,6 @@ def main():
# Parse and decode a map file # Parse and decode a map file
if args.file and args.toolchain: if args.file and args.toolchain:
if memap.parse(args.file, args.toolchain) is False: if memap.parse(args.file, args.toolchain) is False:
print "Unknown toolchain for memory statistics %s" % args.toolchain
sys.exit(0) sys.exit(0)
# default export format is table # default export format is table