From 30303805a808d3dfc0a792623943daaa2be4d7a8 Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Mon, 2 Mar 2020 15:53:50 +0000 Subject: [PATCH] arch: Convert exec keyword to exec() function The function syntax was also accepted in 2.x Change-Id: I3d9bef3ddcd5e98ff589796d21dbfeb9796bff1d Signed-off-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/26252 Tested-by: kokoro Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power --- src/arch/isa_parser.py | 6 +++--- src/arch/x86/isa/insts/__init__.py | 2 +- src/arch/x86/isa/insts/general_purpose/__init__.py | 2 +- .../x86/isa/insts/general_purpose/arithmetic/__init__.py | 2 +- .../isa/insts/general_purpose/compare_and_test/__init__.py | 2 +- .../isa/insts/general_purpose/control_transfer/__init__.py | 2 +- .../isa/insts/general_purpose/data_conversion/__init__.py | 2 +- .../x86/isa/insts/general_purpose/data_transfer/__init__.py | 2 +- src/arch/x86/isa/insts/general_purpose/flags/__init__.py | 2 +- .../x86/isa/insts/general_purpose/input_output/__init__.py | 2 +- .../isa/insts/general_purpose/rotate_and_shift/__init__.py | 2 +- src/arch/x86/isa/insts/general_purpose/string/__init__.py | 2 +- src/arch/x86/isa/insts/simd128/__init__.py | 2 +- src/arch/x86/isa/insts/simd128/floating_point/__init__.py | 2 +- .../isa/insts/simd128/floating_point/arithmetic/__init__.py | 2 +- .../isa/insts/simd128/floating_point/compare/__init__.py | 2 +- .../simd128/floating_point/data_conversion/__init__.py | 2 +- .../simd128/floating_point/data_reordering/__init__.py | 2 +- .../insts/simd128/floating_point/data_transfer/__init__.py | 2 +- .../isa/insts/simd128/floating_point/logical/__init__.py | 2 +- src/arch/x86/isa/insts/simd128/integer/__init__.py | 2 +- .../x86/isa/insts/simd128/integer/arithmetic/__init__.py | 2 +- src/arch/x86/isa/insts/simd128/integer/compare/__init__.py | 2 +- .../isa/insts/simd128/integer/data_conversion/__init__.py | 2 +- .../isa/insts/simd128/integer/data_reordering/__init__.py | 2 +- .../x86/isa/insts/simd128/integer/data_transfer/__init__.py | 2 +- src/arch/x86/isa/insts/simd128/integer/logical/__init__.py | 2 +- .../simd128/integer/save_and_restore_state/__init__.py | 2 +- src/arch/x86/isa/insts/simd128/integer/shift/__init__.py | 2 +- src/arch/x86/isa/insts/simd64/__init__.py | 2 +- src/arch/x86/isa/insts/simd64/floating_point/__init__.py | 2 +- .../isa/insts/simd64/floating_point/arithmetic/__init__.py | 2 +- .../x86/isa/insts/simd64/floating_point/compare/__init__.py | 2 +- src/arch/x86/isa/insts/simd64/integer/__init__.py | 2 +- .../x86/isa/insts/simd64/integer/arithmetic/__init__.py | 2 +- src/arch/x86/isa/insts/simd64/integer/compare/__init__.py | 2 +- .../isa/insts/simd64/integer/data_reordering/__init__.py | 2 +- .../x86/isa/insts/simd64/integer/data_transfer/__init__.py | 2 +- src/arch/x86/isa/insts/simd64/integer/logical/__init__.py | 2 +- src/arch/x86/isa/insts/simd64/integer/shift/__init__.py | 2 +- src/arch/x86/isa/insts/system/__init__.py | 2 +- src/arch/x86/isa/insts/x87/__init__.py | 2 +- src/arch/x86/isa/insts/x87/arithmetic/__init__.py | 2 +- src/arch/x86/isa/insts/x87/compare_and_test/__init__.py | 2 +- src/arch/x86/isa/insts/x87/control/__init__.py | 2 +- .../isa/insts/x87/data_transfer_and_conversion/__init__.py | 2 +- src/arch/x86/isa/insts/x87/load_constants/__init__.py | 2 +- src/arch/x86/isa/insts/x87/stack_management/__init__.py | 2 +- .../x86/isa/insts/x87/transcendental_functions/__init__.py | 2 +- 49 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/arch/isa_parser.py b/src/arch/isa_parser.py index f35083f71..757c72c76 100755 --- 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 69d8ca3cf..4840e2366 100644 --- 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 7865a7aef..9542dcac0 100644 --- 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 9c731eaff..cc016651d 100644 --- 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 a4f7a99f5..385db5cb9 100644 --- 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 2aed3eeec..470f72dfa 100644 --- 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 9014c98c5..5495a62e4 100644 --- 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 09fe19cd4..5c32f1997 100644 --- 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 8fe4a79f6..68d922d66 100644 --- 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 a3ae17427..1f1c87822 100644 --- 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 df9ad3b1b..e0f10e14c 100644 --- 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 44bfa04f5..a30f362ae 100644 --- 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 27893ec08..465305dd9 100644 --- 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 b017223e0..cc2928e0a 100644 --- 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 269825a0b..13e72a96b 100644 --- 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 33ab32a76..125053a3a 100644 --- 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 60d7e92c1..211e2d85a 100644 --- 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 22054b5d8..84c682ffb 100644 --- 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 30b5eaaf5..8821996b5 100644 --- 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 951bf58b6..409546776 100644 --- 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 074d3cb54..cc463539f 100644 --- 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 656dbc168..fdc3fac57 100644 --- 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 46dce6d56..e6744e0b9 100644 --- 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 573aa8ce7..c1d60fe02 100644 --- 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 2d10da086..cc74cd466 100644 --- 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 4ae56e447..bdc9865d5 100644 --- 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 69ac9c5c5..941da2310 100644 --- 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 0b3e2367c..f19105bcf 100644 --- 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 1f9feb4c0..3d7a166ef 100644 --- 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 56b788c39..587426211 100644 --- 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 7d0c47b8c..182fccd16 100644 --- 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 2ea5d29ec..9ee34f68a 100644 --- 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 96c1cb5f2..f67a43ba7 100644 --- 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 539254c00..785802807 100644 --- 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 bfcc24959..80aa11ed9 100644 --- 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 96c1cb5f2..f67a43ba7 100644 --- 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 2523985ff..455433a5d 100644 --- 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 b7ee13741..b3cfc203b 100644 --- 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 4c2511651..1a7f20325 100644 --- 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 c2de47b40..2aaca3989 100644 --- 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 eb7c036c3..ec55081bd 100644 --- 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 6236610a6..e745bd9f1 100644 --- 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 7879b2875..74000a708 100644 --- 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 91d8e9c18..f640eaf7c 100644 --- 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 9adc69a8f..ad45ecd91 100644 --- 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 a0d2b7dc1..467b2d500 100644 --- 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 d57c9016f..5c14524a1 100644 --- 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 25025353e..3cf935a76 100644 --- 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 7ccced17a..86d0d9913 100644 --- 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 -- 2.30.2