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

Merge pull request #9994 from theotherjimmy/fix-iar-dfpu 

Correct FPU settings traceback found by IAR
pull/9914/head
Martin Kojtal 2019-03-14 09:10:13 +01:00 committed by GitHub
parent 79c7fc8b54 35479e8111
commit 4c7fc650db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/export/cmsis/__init__.py
View File

@ -31,6 +31,9 @@ class DeviceCMSIS():
Encapsulates target information retrieved by arm-pack-manager""" Encapsulates target information retrieved by arm-pack-manager"""
# TODO: This class uses the TARGET_MAP. Usage of the target map may
# not work in the online compiler or may work but give the incorrect
# information.
CACHE = Cache(True, False) CACHE = Cache(True, False)
def __init__(self, target): def __init__(self, target):
target_info = self.check_supported(target) target_info = self.check_supported(target)
@ -44,10 +47,14 @@ class DeviceCMSIS():
) )
self.dname = target_info["name"] self.dname = target_info["name"]
self.core = target_info["_core"] self.core = target_info["_core"]
self.dfpu = None
try: try:
self.dfpu = target_info['processor']['Symmetric']['fpu'] self.dfpu = target_info['processor']['Symmetric']['fpu']
except KeyError: except KeyError:
self.dfpu = target_info['processor']['Asymmetric']['fpu'] cmsis_core = self.core.replace("F", "").replace("-", "")
for proc in target_info['processor']['Asymmetric'].values():
if proc['core'] == cmsis_core:
self.dfpu = proc['fpu']
self.debug, self.dvendor = self.vendor_debug( self.debug, self.dvendor = self.vendor_debug(
target_info.get('vendor') or target_info['from_pack']['vendor'] target_info.get('vendor') or target_info['from_pack']['vendor']
) )