Run formatter on everything else

Author: multiplemonomials

tools/cmake/upload_methods/python_packagecheck.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-#file which is invoked by the cmake build system to check if all necessary python packages are installed.
+# file which is invoked by the cmake build system to check if all necessary python packages are installed.
 
 import sys
 
@@ -10,4 +10,4 @@
 except ImportError:
     exit(1)
 
-exit(0)
+exit(0)

tools/debug_tools/crash_log_parser/crash_log_parser.py

@@ -25,68 +25,72 @@
 from subprocess import check_output
 import sys
 
-#arm-none-eabi-nm -nl <elf file>
+# arm-none-eabi-nm -nl <elf file>
 _NM_EXEC = "arm-none-eabi-nm"
 _OPT = "-nlC"
 _PTN = re.compile("([0-9a-f]*) ([Tt]) ([^\t\n]*)(?:\t(.*):([0-9]*))?")
 
+
 class ElfHelper(object):
     def __init__(self, elf_file, map_file):
-
-        op = check_output([_NM_EXEC, _OPT, elf_file.name]).decode('utf-8')
+        op = check_output([_NM_EXEC, _OPT, elf_file.name]).decode("utf-8")
         self.maplines = map_file.readlines()
         self.matches = _PTN.findall(op)
         self.addrs = [int(x[0], 16) for x in self.matches]
-                
+
     def function_addrs(self):
         return self.addrs
-    
+
     def function_name_for_addr(self, addr):
         i = bisect.bisect_right(self.addrs, addr)
-        funcname = self.matches[i-1][2]
+        funcname = self.matches[i - 1][2]
         return funcname
 
+
 def print_HFSR_info(hfsr):
     if int(hfsr, 16) & 0x80000000:
         print("\t\tDebug Event Occurred")
     if int(hfsr, 16) & 0x40000000:
-        print("\t\tForced exception, a fault with configurable priority has been escalated to HardFault")    
+        print("\t\tForced exception, a fault with configurable priority has been escalated to HardFault")
     if int(hfsr, 16) & 0x2:
-        print("\t\tVector table read fault has occurred")        
+        print("\t\tVector table read fault has occurred")
 
-def print_MMFSR_info(mmfsr, mmfar):            
+
+def print_MMFSR_info(mmfsr, mmfar):
     if int(mmfsr, 16) & 0x20:
         print("\t\tA MemManage fault occurred during FP lazy state preservation")
     if int(mmfsr, 16) & 0x10:
-        print("\t\tA derived MemManage fault occurred on exception entry")            
+        print("\t\tA derived MemManage fault occurred on exception entry")
     if int(mmfsr, 16) & 0x8:
-        print("\t\tA derived MemManage fault occurred on exception return")                
+        print("\t\tA derived MemManage fault occurred on exception return")
     if int(mmfsr, 16) & 0x2:
         if int(mmfsr, 16) & 0x80:
-            print("\t\tData access violation. Faulting address: %s"%(str(mmfar)))                    
-        else:     
-            print("\t\tData access violation. WARNING: Fault address in MMFAR is NOT valid")                    
+            print("\t\tData access violation. Faulting address: %s" % (str(mmfar)))
+        else:
+            print("\t\tData access violation. WARNING: Fault address in MMFAR is NOT valid")
     if int(mmfsr, 16) & 0x1:
-        print("\t\tMPU or Execute Never (XN) default memory map access violation on an instruction fetch has occurred")                        
-    
+        print("\t\tMPU or Execute Never (XN) default memory map access violation on an instruction fetch has occurred")
+
+
 def print_BFSR_info(bfsr, bfar):
     if int(bfsr, 16) & 0x20:
         print("\t\tA bus fault occurred during FP lazy state preservation")
     if int(bfsr, 16) & 0x10:
-        print("\t\tA derived bus fault has occurred on exception entry")  
+        print("\t\tA derived bus fault has occurred on exception entry")
     if int(bfsr, 16) & 0x8:
-        print("\t\tA derived bus fault has occurred on exception return") 
+        print("\t\tA derived bus fault has occurred on exception return")
     if int(bfsr, 16) & 0x4:
-        print("\t\tImprecise data access error has occurred")               
+        print("\t\tImprecise data access error has occurred")
     if int(bfsr, 16) & 0x2:
-        if int(bfsr,16) & 0x80:
-            print("\t\tA precise data access error has occurred. Faulting address: %s"%(str(bfar)))                    
-        else:     
-            print("\t\tA precise data access error has occurred. WARNING: Fault address in BFAR is NOT valid")             
+        if int(bfsr, 16) & 0x80:
+            print("\t\tA precise data access error has occurred. Faulting address: %s" % (str(bfar)))
+        else:
+            print("\t\tA precise data access error has occurred. WARNING: Fault address in BFAR is NOT valid")
     if int(bfsr, 16) & 0x1:
-        print("\t\tA bus fault on an instruction prefetch has occurred")                           
+        print("\t\tA bus fault on an instruction prefetch has occurred")
+
 
-def print_UFSR_info(ufsr):            
+def print_UFSR_info(ufsr):
     if int(ufsr, 16) & 0x200:
         print("\t\tDivide by zero error has occurred")
     if int(ufsr, 16) & 0x100:
@@ -96,100 +100,120 @@ def print_UFSR_info(ufsr):
     if int(ufsr, 16) & 0x4:
         print("\t\tAn integrity check error has occurred on EXC_RETURN")
     if int(ufsr, 16) & 0x2:
-        print("\t\tInstruction executed with invalid EPSR.T or EPSR.IT field( This may be caused by Thumb bit not being set in branching instruction )")    
+        print(
+            "\t\tInstruction executed with invalid EPSR.T or EPSR.IT field( This may be caused by Thumb bit not being set in branching instruction )"
+        )
     if int(ufsr, 16) & 0x1:
-        print("\t\tThe processor has attempted to execute an undefined instruction")        
-    
-def print_CPUID_info(cpuid):            
+        print("\t\tThe processor has attempted to execute an undefined instruction")
+
+
+def print_CPUID_info(cpuid):
     if (int(cpuid, 16) & 0xF0000) == 0xC0000:
         print("\t\tProcessor Arch: ARM-V6M")
-    else:        
+    else:
         print("\t\tProcessor Arch: ARM-V7M or above")
-    
-    print("\t\tProcessor Variant: %X" % ((int(cpuid,16) & 0xFFF0 ) >> 4))    
+
+    print("\t\tProcessor Variant: %X" % ((int(cpuid, 16) & 0xFFF0) >> 4))
+
 
 def parse_line_for_register(line):
     _, register_val = line.split(":")
-    return register_val.strip()    
+    return register_val.strip()
+
 
 def main(crash_log, elfhelper):
     mmfar_val = 0
     bfar_val = 0
-    lines = iter(crash_log.read().decode('utf-8').splitlines())
+    lines = iter(crash_log.read().decode("utf-8").splitlines())
 
     for eachline in lines:
         if "++ MbedOS Fault Handler ++" in eachline:
             break
     else:
-        print("ERROR: Unable to find \"MbedOS Fault Handler\" header")
+        print('ERROR: Unable to find "MbedOS Fault Handler" header')
         return
-    
+
     for eachline in lines:
         if "-- MbedOS Fault Handler --" in eachline:
             break
-        
+
         elif eachline.startswith("PC"):
             pc_val = parse_line_for_register(eachline)
             if elfhelper:
                 pc_name = elfhelper.function_name_for_addr(int(pc_val, 16))
             else:
                 pc_name = "<unknown-symbol>"
-                        
+
         elif eachline.startswith("LR"):
             lr_val = parse_line_for_register(eachline)
             if elfhelper:
                 lr_name = elfhelper.function_name_for_addr(int(lr_val, 16))
             else:
                 lr_name = "<unknown-symbol>"
-            
+
         elif eachline.startswith("SP"):
             sp_val = parse_line_for_register(eachline)
-                        
+
         elif eachline.startswith("HFSR"):
             hfsr_val = parse_line_for_register(eachline)
-            
+
         elif eachline.startswith("MMFSR"):
             mmfsr_val = parse_line_for_register(eachline)
-            
+
         elif eachline.startswith("BFSR"):
             bfsr_val = parse_line_for_register(eachline)
-            
+
         elif eachline.startswith("UFSR"):
             ufsr_val = parse_line_for_register(eachline)
-            
+
         elif eachline.startswith("CPUID"):
             cpuid_val = parse_line_for_register(eachline)
-            
+
         elif eachline.startswith("MMFAR"):
             mmfar_val = parse_line_for_register(eachline)
-            
+
         elif eachline.startswith("BFAR"):
-            bfar_val = parse_line_for_register(eachline)    
-    
-    print("\nCrash Info:")        
+            bfar_val = parse_line_for_register(eachline)
+
+    print("\nCrash Info:")
     print("\tCrash location = %s [0x%s] (based on PC value)" % (pc_name.strip(), str(pc_val)))
-    print("\tCaller location = %s [0x%s] (based on LR value)" % (lr_name.strip(), str(lr_val)))        
+    print("\tCaller location = %s [0x%s] (based on LR value)" % (lr_name.strip(), str(lr_val)))
     print("\tStack Pointer at the time of crash = [%s]" % (str(sp_val)))
-    
+
     print("\tTarget and Fault Info:")
     print_CPUID_info(cpuid_val)
     print_HFSR_info(hfsr_val)
     print_MMFSR_info(mmfsr_val, mmfar_val)
     print_BFSR_info(bfsr_val, bfar_val)
     print_UFSR_info(ufsr_val)
-        
-                            
-if __name__ == '__main__':
+
+
+if __name__ == "__main__":
     import argparse
-    
-    parser = argparse.ArgumentParser(description='Analyse mbed-os crash log. This tool requires arm-gcc binary utilities to be available in current path as it uses \'nm\' command')
+
+    parser = argparse.ArgumentParser(
+        description="Analyse mbed-os crash log. This tool requires arm-gcc binary utilities to be available in current path as it uses 'nm' command"
+    )
     # specify arguments
-    parser.add_argument(metavar='CRASH LOG', type=argparse.FileType('rb', 0),
-                        dest='crashlog',help='path to crash log file')      
-    parser.add_argument(metavar='ELF FILE', type=argparse.FileType('rb', 0),
-                        nargs='?',const=None,dest='elffile',help='path to elf file')             
-    parser.add_argument(metavar='MAP FILE', type=argparse.FileType('rb', 0),
-                        nargs='?',const=None,dest='mapfile',help='path to map file')                                    
+    parser.add_argument(
+        metavar="CRASH LOG", type=argparse.FileType("rb", 0), dest="crashlog", help="path to crash log file"
+    )
+    parser.add_argument(
+        metavar="ELF FILE",
+        type=argparse.FileType("rb", 0),
+        nargs="?",
+        const=None,
+        dest="elffile",
+        help="path to elf file",
+    )
+    parser.add_argument(
+        metavar="MAP FILE",
+        type=argparse.FileType("rb", 0),
+        nargs="?",
+        const=None,
+        dest="mapfile",
+        help="path to map file",
+    )
 
     # get and validate arguments
     args = parser.parse_args()
@@ -200,14 +224,13 @@ def main(crash_log, elfhelper):
     else:
         print("ELF or MAP file missing, logging raw values.")
         elfhelper = None
-    
+
     # parse input and write to output
     main(args.crashlog, elfhelper)
-    
-    #close all files
+
+    # close all files
     if args.elffile:
         args.elffile.close()
     if args.mapfile:
         args.mapfile.close()
     args.crashlog.close()
-

tools/psa/tfm/bin_utils/__init__.py

@@ -16,6 +16,4 @@
 
 from .assemble import Assembly
 
-__all__ = [
-    'Assembly'
-]
+__all__ = ["Assembly"]

tools/psa/tfm/bin_utils/assemble.py

@@ -32,7 +32,8 @@
 offset_re = re.compile(r"^\s*RE_([0-9A-Z_]+)_IMAGE_OFFSET\s*=\s*(.*)")
 size_re = re.compile(r"^\s*RE_([0-9A-Z_]+)_IMAGE_MAX_SIZE\s*=\s*(.*)")
 
-class Assembly():
+
+class Assembly:
     def __init__(self, layout_path, output):
         self.output = output
         self.layout_path = layout_path
@@ -50,46 +51,44 @@ def find_slots(self):
         offsets = macro_parser.evaluate_macro(self.layout_path, offset_re, 1, 2)
         sizes = macro_parser.evaluate_macro(self.layout_path, size_re, 1, 2)
 
-        if 'SECURE' not in offsets:
+        if "SECURE" not in offsets:
             raise Exception("Image config does not have secure partition")
 
-        if 'NON_SECURE' not in offsets:
+        if "NON_SECURE" not in offsets:
             raise Exception("Image config does not have non-secure partition")
 
         self.offsets = offsets
         self.sizes = sizes
 
     def add_image(self, source, partition):
-        with open(self.output, 'ab') as ofd:
+        with open(self.output, "ab") as ofd:
             ofd.seek(0, os.SEEK_END)
             pos = ofd.tell()
             if pos > self.offsets[partition]:
                 raise Exception("Partitions not in order, unsupported")
             if pos < self.offsets[partition]:
-                ofd.write(b'\xFF' * (self.offsets[partition] - pos))
+                ofd.write(b"\xff" * (self.offsets[partition] - pos))
             statinfo = os.stat(source)
             if statinfo.st_size > self.sizes[partition]:
                 raise Exception("Image {} is too large for partition".format(source))
-            with open(source, 'rb') as rfd:
+            with open(source, "rb") as rfd:
                 shutil.copyfileobj(rfd, ofd, 0x10000)
 
+
 def main():
     parser = argparse.ArgumentParser()
 
-    parser.add_argument('-l', '--layout', required=True,
-            help='Location of the file that contains preprocessed macros')
-    parser.add_argument('-s', '--secure', required=True,
-            help='Unsigned secure image')
-    parser.add_argument('-n', '--non_secure',
-            help='Unsigned non-secure image')
-    parser.add_argument('-o', '--output', required=True,
-            help='Filename to write full image to')
+    parser.add_argument("-l", "--layout", required=True, help="Location of the file that contains preprocessed macros")
+    parser.add_argument("-s", "--secure", required=True, help="Unsigned secure image")
+    parser.add_argument("-n", "--non_secure", help="Unsigned non-secure image")
+    parser.add_argument("-o", "--output", required=True, help="Filename to write full image to")
 
     args = parser.parse_args()
     output = Assembly(args.layout, args.output)
 
     output.add_image(args.secure, "SECURE")
     output.add_image(args.non_secure, "NON_SECURE")
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     main()

tools/psa/tfm/bin_utils/imgtool.py

@@ -18,5 +18,5 @@
 
 from imgtool import main
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main.imgtool()

tools/psa/tfm/bin_utils/imgtool/boot_record.py

@@ -24,16 +24,15 @@ class SwComponent(int, Enum):
     Software component property IDs specified by
     Arm's PSA Attestation API 1.0 document.
     """
+
     TYPE = 1
     MEASUREMENT_VALUE = 2
     VERSION = 4
     SIGNER_ID = 5
     MEASUREMENT_DESCRIPTION = 6
 
 
-def create_sw_component_data(sw_type, sw_version, sw_measurement_description,
-                             sw_measurement_value, sw_signer_id):
-
+def create_sw_component_data(sw_type, sw_version, sw_measurement_description, sw_measurement_value, sw_signer_id):
     # List of software component properties (Key ID + value)
     properties = {
         SwComponent.TYPE: sw_type,