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>

diff --git a/src/arch/isa_parser.py b/src/arch/isa_parser.py
index f35083f7194e4e899808d6f40ebd88d0b535678f..757c72c761f243396e51b7e5ba54f135e1825200 100755 (executable)
--- a/src/arch/isa_parser.py
+++ b/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:

diff --git a/src/arch/x86/isa/insts/__init__.py b/src/arch/x86/isa/insts/__init__.py
index 69d8ca3cfb1ff29e254572a916a198d2a2ef1cfb..4840e2366240fcba7b7155281b96fc29cbd231c9 100644 (file)
--- a/src/arch/x86/isa/insts/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/general_purpose/__init__.py b/src/arch/x86/isa/insts/general_purpose/__init__.py
index 7865a7aefb9f7ce7a9f7c027d34153da4717ddb5..9542dcac0b630d9a698a9ed97ec558b2235b89b6 100644 (file)
--- a/src/arch/x86/isa/insts/general_purpose/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/general_purpose/arithmetic/__init__.py b/src/arch/x86/isa/insts/general_purpose/arithmetic/__init__.py
index 9c731eaff7618a4792a7efcc432455a43750622a..cc016651da42c30234411f3e4781b0b242c30c6e 100644 (file)
--- a/src/arch/x86/isa/insts/general_purpose/arithmetic/__init__.py
+++ b/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
 

diff --git a/src/arch/x86/isa/insts/general_purpose/compare_and_test/__init__.py b/src/arch/x86/isa/insts/general_purpose/compare_and_test/__init__.py
index a4f7a99f5fb1f966bb31ea6c93e3b40856958fb6..385db5cb96aa6f7aebfe9557ebe9f179da21b94d 100644 (file)
--- a/src/arch/x86/isa/insts/general_purpose/compare_and_test/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/general_purpose/control_transfer/__init__.py b/src/arch/x86/isa/insts/general_purpose/control_transfer/__init__.py
index 2aed3eeec9cb0661d190b3f3a56c5ae8993e419c..470f72dfa097458915b75a1426a218f31a019e5e 100644 (file)
--- a/src/arch/x86/isa/insts/general_purpose/control_transfer/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/general_purpose/data_conversion/__init__.py b/src/arch/x86/isa/insts/general_purpose/data_conversion/__init__.py
index 9014c98c57838139d57b9b334b5f87ee7f413621..5495a62e481caea42ace8bb39cf664bf84240111 100644 (file)
--- a/src/arch/x86/isa/insts/general_purpose/data_conversion/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/general_purpose/data_transfer/__init__.py b/src/arch/x86/isa/insts/general_purpose/data_transfer/__init__.py
index 09fe19cd4a4fba7ab95f8719988ad1589ec112bf..5c32f19973db13718dee2d5500d090d5b62cca29 100644 (file)
--- a/src/arch/x86/isa/insts/general_purpose/data_transfer/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/general_purpose/flags/__init__.py b/src/arch/x86/isa/insts/general_purpose/flags/__init__.py
index 8fe4a79f64f3b35c52d668bd1cdab6953a1d1071..68d922d666858f8e23ad1429b7cbc51bebcfe9f7 100644 (file)
--- a/src/arch/x86/isa/insts/general_purpose/flags/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/general_purpose/input_output/__init__.py b/src/arch/x86/isa/insts/general_purpose/input_output/__init__.py
index a3ae174278e6ff2a87fb5970e6bd14aa0ec9c2c3..1f1c87822cbbf053e32953c66438aff4b833f027 100644 (file)
--- a/src/arch/x86/isa/insts/general_purpose/input_output/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/general_purpose/rotate_and_shift/__init__.py b/src/arch/x86/isa/insts/general_purpose/rotate_and_shift/__init__.py
index df9ad3b1bb6db853b3e023b6d02479452614a296..e0f10e14cf2c709a3a74254a5b944f2507b50414 100644 (file)
--- a/src/arch/x86/isa/insts/general_purpose/rotate_and_shift/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/general_purpose/string/__init__.py b/src/arch/x86/isa/insts/general_purpose/string/__init__.py
index 44bfa04f549d9c2a80f81fb57b4b5139d0dafea1..a30f362ae3a80b6d594fd3c745b3619fc8d5a285 100644 (file)
--- a/src/arch/x86/isa/insts/general_purpose/string/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/__init__.py b/src/arch/x86/isa/insts/simd128/__init__.py
index 27893ec08d0153204cc93af6f4dba419f9460b85..465305dd9c9e2a77f302276a92c5bb5f464cd603 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/floating_point/__init__.py b/src/arch/x86/isa/insts/simd128/floating_point/__init__.py
index b017223e07b2567d6b128b463916f59a6652d7d9..cc2928e0a3891908e549b5f59bda930378a2bb65 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/floating_point/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/floating_point/arithmetic/__init__.py b/src/arch/x86/isa/insts/simd128/floating_point/arithmetic/__init__.py
index 269825a0b393cd243b80960bf11af48145485d0b..13e72a96be90affb5915ac8b61f722cc20a2676a 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/floating_point/arithmetic/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/floating_point/compare/__init__.py b/src/arch/x86/isa/insts/simd128/floating_point/compare/__init__.py
index 33ab32a769999b1d2ffd02bc33f26487f8897b3b..125053a3a33168d125ea8159774d601bd0695b35 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/floating_point/compare/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/floating_point/data_conversion/__init__.py b/src/arch/x86/isa/insts/simd128/floating_point/data_conversion/__init__.py
index 60d7e92c1dc1fc43511305757e6cdc2ae9c7c754..211e2d85a26170d8f37cb3cd1459c4b952103595 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/floating_point/data_conversion/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/floating_point/data_reordering/__init__.py b/src/arch/x86/isa/insts/simd128/floating_point/data_reordering/__init__.py
index 22054b5d8c1cf0ebccec48a0cebf329c1d8b1944..84c682ffb22731252df3f391120b7717c25806e5 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/floating_point/data_reordering/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/floating_point/data_transfer/__init__.py b/src/arch/x86/isa/insts/simd128/floating_point/data_transfer/__init__.py
index 30b5eaaf57da176d5bc4b7bf07cf7f771d0ba41c..8821996b528307fcd71e446390758bd3f3b0b562 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/floating_point/data_transfer/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/floating_point/logical/__init__.py b/src/arch/x86/isa/insts/simd128/floating_point/logical/__init__.py
index 951bf58b6ff352f90285b2adc1e313aeb04fe0d5..4095467765a4d4995f306503cd47efa0849f2324 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/floating_point/logical/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/integer/__init__.py b/src/arch/x86/isa/insts/simd128/integer/__init__.py
index 074d3cb548d96874ac426003b48de7a24d51142e..cc463539ff50073e06c718e1e0c800a3d2ddd01f 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/integer/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/integer/arithmetic/__init__.py b/src/arch/x86/isa/insts/simd128/integer/arithmetic/__init__.py
index 656dbc16871ff615a19084943452b0da5bb6d46e..fdc3fac572b3c996202898cb23dbf34f31d62fef 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/integer/arithmetic/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/integer/compare/__init__.py b/src/arch/x86/isa/insts/simd128/integer/compare/__init__.py
index 46dce6d563e6ebf08b06ca1a80961a50638cd743..e6744e0b993af647bd574679e7253b07b7bfd64f 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/integer/compare/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/integer/data_conversion/__init__.py b/src/arch/x86/isa/insts/simd128/integer/data_conversion/__init__.py
index 573aa8ce76882ad44edb06283a1d0fb2526d3d1b..c1d60fe02a9a4dd7874de77beddba8a515180c17 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/integer/data_conversion/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/integer/data_reordering/__init__.py b/src/arch/x86/isa/insts/simd128/integer/data_reordering/__init__.py
index 2d10da0868864788d9771565b66879745697f94e..cc74cd466d97f7698d166f4518b6f9dcf79e4836 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/integer/data_reordering/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/integer/data_transfer/__init__.py b/src/arch/x86/isa/insts/simd128/integer/data_transfer/__init__.py
index 4ae56e4472c8af9aff2ab43b076e034eff168feb..bdc9865d555ca5c3f0be0f3e96b5e88df27aa126 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/integer/data_transfer/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/integer/logical/__init__.py b/src/arch/x86/isa/insts/simd128/integer/logical/__init__.py
index 69ac9c5c5b7ce2c08c6b1a5de0e1d9dff3a51c28..941da2310ad68262c373acea4742329e2f870575 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/integer/logical/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/integer/save_and_restore_state/__init__.py b/src/arch/x86/isa/insts/simd128/integer/save_and_restore_state/__init__.py
index 0b3e2367cc17c5424cb2562f1c1743b18a5670a1..f19105bcfde856542ac1c4bba2fabaf3d69fa979 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/integer/save_and_restore_state/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd128/integer/shift/__init__.py b/src/arch/x86/isa/insts/simd128/integer/shift/__init__.py
index 1f9feb4c0b49fc11497e2dc849bd964e1c8f7c40..3d7a166efff60718982f3016580c79d802c8d3c2 100644 (file)
--- a/src/arch/x86/isa/insts/simd128/integer/shift/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd64/__init__.py b/src/arch/x86/isa/insts/simd64/__init__.py
index 56b788c393cccec6ddc0a03ba9bde77816583330..5874262110ee9d10e4c46ebf2359a28b526c1e3a 100644 (file)
--- a/src/arch/x86/isa/insts/simd64/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd64/floating_point/__init__.py b/src/arch/x86/isa/insts/simd64/floating_point/__init__.py
index 7d0c47b8cfc08ab862376daf542d02ae67d19a69..182fccd16e562967ccd6c6c8e047cc0e65fdf430 100644 (file)
--- a/src/arch/x86/isa/insts/simd64/floating_point/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd64/floating_point/arithmetic/__init__.py b/src/arch/x86/isa/insts/simd64/floating_point/arithmetic/__init__.py
index 2ea5d29ec2be4c9b957ed358387eb1634743de16..9ee34f68af13353cc730fcaaf7a268a687587ab1 100644 (file)
--- a/src/arch/x86/isa/insts/simd64/floating_point/arithmetic/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd64/floating_point/compare/__init__.py b/src/arch/x86/isa/insts/simd64/floating_point/compare/__init__.py
index 96c1cb5f242e2c356e157501fc278690a7af1959..f67a43ba7092e49f76f871cecf1ff5ee6b7041f9 100644 (file)
--- a/src/arch/x86/isa/insts/simd64/floating_point/compare/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd64/integer/__init__.py b/src/arch/x86/isa/insts/simd64/integer/__init__.py
index 539254c00b4f3b3f85731c8b6c4fbf654c6f788e..785802807825c267a7b6e2f725ab2daf5c828cea 100644 (file)
--- a/src/arch/x86/isa/insts/simd64/integer/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd64/integer/arithmetic/__init__.py b/src/arch/x86/isa/insts/simd64/integer/arithmetic/__init__.py
index bfcc249595988c24352dbc5db889a38bb1bdb617..80aa11ed9cb5b213561a300ded866d02f27117db 100644 (file)
--- a/src/arch/x86/isa/insts/simd64/integer/arithmetic/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd64/integer/compare/__init__.py b/src/arch/x86/isa/insts/simd64/integer/compare/__init__.py
index 96c1cb5f242e2c356e157501fc278690a7af1959..f67a43ba7092e49f76f871cecf1ff5ee6b7041f9 100644 (file)
--- a/src/arch/x86/isa/insts/simd64/integer/compare/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd64/integer/data_reordering/__init__.py b/src/arch/x86/isa/insts/simd64/integer/data_reordering/__init__.py
index 2523985ff58056168f7e0cecc31659831ada33d1..455433a5d6ddbee6f709ec7d152e61452641b7ca 100644 (file)
--- a/src/arch/x86/isa/insts/simd64/integer/data_reordering/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd64/integer/data_transfer/__init__.py b/src/arch/x86/isa/insts/simd64/integer/data_transfer/__init__.py
index b7ee13741c9318fec76e6444f9b84597c379904a..b3cfc203b561c015d3c62804f56f709b8de4a06c 100644 (file)
--- a/src/arch/x86/isa/insts/simd64/integer/data_transfer/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd64/integer/logical/__init__.py b/src/arch/x86/isa/insts/simd64/integer/logical/__init__.py
index 4c251165175941b6df2ce9b8ca6fc29c3234a124..1a7f2032576e90d1efbe0eab6daf929e595a1a12 100644 (file)
--- a/src/arch/x86/isa/insts/simd64/integer/logical/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/simd64/integer/shift/__init__.py b/src/arch/x86/isa/insts/simd64/integer/shift/__init__.py
index c2de47b40ef9c3030c3654e97d77d6c269387ccd..2aaca3989e0769450a714031fc6a44607d67f0df 100644 (file)
--- a/src/arch/x86/isa/insts/simd64/integer/shift/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/system/__init__.py b/src/arch/x86/isa/insts/system/__init__.py
index eb7c036c31b0c3b50308c9bd9663b184dd9f27d5..ec55081bdfa0746594535bc44348c90804404054 100644 (file)
--- a/src/arch/x86/isa/insts/system/__init__.py
+++ b/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
 

diff --git a/src/arch/x86/isa/insts/x87/__init__.py b/src/arch/x86/isa/insts/x87/__init__.py
index 6236610a64ee41efdc2518c6e0c3703527ad0eaf..e745bd9f16e85822373bf9977f2ecd98d7c87ca0 100644 (file)
--- a/src/arch/x86/isa/insts/x87/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/x87/arithmetic/__init__.py b/src/arch/x86/isa/insts/x87/arithmetic/__init__.py
index 7879b2875c3a6e35e2c767e9e4c6892c78a0918c..74000a7082184b9f626affe8d30938a24c580d1e 100644 (file)
--- a/src/arch/x86/isa/insts/x87/arithmetic/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/x87/compare_and_test/__init__.py b/src/arch/x86/isa/insts/x87/compare_and_test/__init__.py
index 91d8e9c184360edba5466d467ab5bbfa22ea1b11..f640eaf7c05ec6c5e73cecb3d9eed51ae132b211 100644 (file)
--- a/src/arch/x86/isa/insts/x87/compare_and_test/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/x87/control/__init__.py b/src/arch/x86/isa/insts/x87/control/__init__.py
index 9adc69a8f5928850f794a6d5a70dad8f94eda7ff..ad45ecd9149de60aeb42dc8a8434c20e0c178aae 100644 (file)
--- a/src/arch/x86/isa/insts/x87/control/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/x87/data_transfer_and_conversion/__init__.py b/src/arch/x86/isa/insts/x87/data_transfer_and_conversion/__init__.py
index a0d2b7dc11b9a7e3bc6db86989646d4d250988f2..467b2d5007e7462ee872ec56c9ca6a56daaa414e 100644 (file)
--- a/src/arch/x86/isa/insts/x87/data_transfer_and_conversion/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/x87/load_constants/__init__.py b/src/arch/x86/isa/insts/x87/load_constants/__init__.py
index d57c9016f33e8b05d61e05833260f601ecb135f1..5c14524a1937c2faed45e0e7e7b95f6aeacdec06 100644 (file)
--- a/src/arch/x86/isa/insts/x87/load_constants/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/x87/stack_management/__init__.py b/src/arch/x86/isa/insts/x87/stack_management/__init__.py
index 25025353ec70f9059f172ffed26a6a41bc070872..3cf935a76781cb6dfd80ca4d0afd7a2832b14c71 100644 (file)
--- a/src/arch/x86/isa/insts/x87/stack_management/__init__.py
+++ b/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

diff --git a/src/arch/x86/isa/insts/x87/transcendental_functions/__init__.py b/src/arch/x86/isa/insts/x87/transcendental_functions/__init__.py
index 7ccced17a917fe3b8de33efdf522ee273805d3d8..86d0d9913c161f415aa286bcc82cd5c7a3cef8e0 100644 (file)
--- a/src/arch/x86/isa/insts/x87/transcendental_functions/__init__.py
+++ b/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