arch: Convert exec keyword to exec() function

The function syntax was also accepted in 2.x

Change-Id: I3d9bef3ddcd5e98ff589796d21dbfeb9796bff1d
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/26252
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>

src/arch/isa_parser.py

@@ -233,10 +233,10 @@ class Format(object):
         param_list = ", ".join(params)
         f = '''def defInst(_code, _context, %s):
                 my_locals = vars().copy()
-                exec _code in _context, my_locals
+                exec(_code, _context, my_locals)
                 return my_locals\n''' % param_list
         c = compile(f, label + ' wrapper', 'exec')
-        exec c
+        exec(c, globals())
         self.func = defInst
 
     def defineInst(self, parser, name, args, lineno):
@@ -2039,7 +2039,7 @@ del wrap
         # next split's #define from the parser and add it to the current
         # emission-in-progress.
         try:
-            exec split_setup+fixPythonIndentation(t[2]) in self.exportContext
+            exec(split_setup+fixPythonIndentation(t[2]), self.exportContext)
         except Exception as exc:
             traceback.print_exc(file=sys.stdout)
             if debug:

src/arch/x86/isa/insts/__init__.py

@@ -44,5 +44,5 @@ microcode = '''
 # X86 microcode
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/general_purpose/__init__.py

@@ -54,5 +54,5 @@ microcode = '''
 # Microcode for general purpose instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/general_purpose/arithmetic/__init__.py

@@ -39,6 +39,6 @@ categories = ["add_and_subtract",
 
 microcode = ""
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode
 

src/arch/x86/isa/insts/general_purpose/compare_and_test/__init__.py

@@ -42,5 +42,5 @@ categories = ["bit_scan",
 
 microcode = ""
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/general_purpose/control_transfer/__init__.py

@@ -42,5 +42,5 @@ categories = ["call",
 
 microcode = ""
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/general_purpose/data_conversion/__init__.py

@@ -42,5 +42,5 @@ categories = ["ascii_adjust",
 
 microcode = ""
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/general_purpose/data_transfer/__init__.py

@@ -40,5 +40,5 @@ categories = ["conditional_move",
 
 microcode = ""
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/general_purpose/flags/__init__.py

@@ -39,5 +39,5 @@ categories = ["load_and_store",
 
 microcode = ""
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/general_purpose/input_output/__init__.py

@@ -38,5 +38,5 @@ categories = ["general_io",
 
 microcode = ""
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/general_purpose/rotate_and_shift/__init__.py

@@ -38,5 +38,5 @@ categories = ["rotate",
 
 microcode = ""
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/general_purpose/string/__init__.py

@@ -41,5 +41,5 @@ categories = ["compare_strings",
 
 microcode = ""
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/__init__.py

@@ -40,5 +40,5 @@ microcode = '''
 # SSE instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/floating_point/__init__.py

@@ -44,5 +44,5 @@ microcode = '''
 # SSE instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/floating_point/arithmetic/__init__.py

@@ -48,5 +48,5 @@ microcode = '''
 # SSE instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/floating_point/compare/__init__.py

@@ -41,5 +41,5 @@ microcode = '''
 # SSE instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/floating_point/data_conversion/__init__.py

@@ -42,5 +42,5 @@ microcode = '''
 # SSE instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/floating_point/data_reordering/__init__.py

@@ -40,5 +40,5 @@ microcode = '''
 # SSE instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/floating_point/data_transfer/__init__.py

@@ -42,5 +42,5 @@ microcode = '''
 # SSE instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/floating_point/logical/__init__.py

@@ -41,5 +41,5 @@ microcode = '''
 # SSE instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/integer/__init__.py

@@ -46,5 +46,5 @@ microcode = '''
 # 128 bit multimedia and scientific instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/integer/arithmetic/__init__.py

@@ -44,5 +44,5 @@ microcode = '''
 # 128 bit multimedia and scientific instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/integer/compare/__init__.py

@@ -40,5 +40,5 @@ microcode = '''
 # 128 bit multimedia and scientific instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/integer/data_conversion/__init__.py

@@ -41,5 +41,5 @@ microcode = '''
 # 128 bit multimedia and scientific conversion instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/integer/data_reordering/__init__.py

@@ -42,5 +42,5 @@ microcode = '''
 # 128 bit multimedia and scientific instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/integer/data_transfer/__init__.py

@@ -41,5 +41,5 @@ microcode = '''
 # 128 bit multimedia and scientific data transfer instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/integer/logical/__init__.py

@@ -41,5 +41,5 @@ microcode = '''
 # 128 bit multimedia and scientific instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/integer/save_and_restore_state/__init__.py

@@ -40,5 +40,5 @@ microcode = '''
 # 128 bit multimedia and scientific instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd128/integer/shift/__init__.py

@@ -41,5 +41,5 @@ microcode = '''
 # 128 bit multimedia and scientific instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd64/__init__.py

@@ -40,5 +40,5 @@ microcode = '''
 # 64 bit multimedia instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd64/floating_point/__init__.py

@@ -41,5 +41,5 @@ microcode = '''
 # 64 bit multimedia instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd64/floating_point/arithmetic/__init__.py

@@ -44,5 +44,5 @@ microcode = '''
 # 64 bit multimedia instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd64/floating_point/compare/__init__.py

@@ -40,5 +40,5 @@ microcode = '''
 # 64 bit multimedia instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd64/integer/__init__.py

@@ -47,5 +47,5 @@ microcode = '''
 # 64 bit multimedia instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd64/integer/arithmetic/__init__.py

@@ -44,5 +44,5 @@ microcode = '''
 # 64 bit multimedia instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd64/integer/compare/__init__.py

@@ -40,5 +40,5 @@ microcode = '''
 # 64 bit multimedia instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd64/integer/data_reordering/__init__.py

@@ -42,5 +42,5 @@ microcode = '''
 # 64 bit multimedia instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd64/integer/data_transfer/__init__.py

@@ -41,5 +41,5 @@ microcode = '''
 # 64 bit multimedia instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd64/integer/logical/__init__.py

@@ -41,5 +41,5 @@ microcode = '''
 # 64 bit multimedia instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/simd64/integer/shift/__init__.py

@@ -41,5 +41,5 @@ microcode = '''
 # 64 bit multimedia instructions
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/system/__init__.py

@@ -45,6 +45,6 @@ categories = ["control_registers",
 
 microcode = ""
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode
 

src/arch/x86/isa/insts/x87/__init__.py

@@ -46,5 +46,5 @@ microcode = '''
 # X86 microcode
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/x87/arithmetic/__init__.py

@@ -46,5 +46,5 @@ microcode = '''
 # X86 microcode
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/x87/compare_and_test/__init__.py

@@ -43,5 +43,5 @@ microcode = '''
 # X86 microcode
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/x87/control/__init__.py

@@ -44,5 +44,5 @@ microcode = '''
 # X86 microcode
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/x87/data_transfer_and_conversion/__init__.py

@@ -44,5 +44,5 @@ microcode = '''
 # X86 microcode
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/x87/load_constants/__init__.py

@@ -40,5 +40,5 @@ microcode = '''
 # X86 microcode
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/x87/stack_management/__init__.py

@@ -40,5 +40,5 @@ microcode = '''
 # X86 microcode
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode

src/arch/x86/isa/insts/x87/transcendental_functions/__init__.py

@@ -40,5 +40,5 @@ microcode = '''
 # X86 microcode
 '''
 for category in categories:
-    exec "import %s as cat" % category
+    exec("import %s as cat" % category)
     microcode += cat.microcode