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 f35083f719..757c72c761 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 69d8ca3cfb..4840e23662 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 7865a7aefb..9542dcac0b 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 9c731eaff7..cc016651da 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 a4f7a99f5f..385db5cb96 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 2aed3eeec9..470f72dfa0 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 9014c98c57..5495a62e48 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 09fe19cd4a..5c32f19973 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 8fe4a79f64..68d922d666 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 a3ae174278..1f1c87822c 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 df9ad3b1bb..e0f10e14cf 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 44bfa04f54..a30f362ae3 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 27893ec08d..465305dd9c 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 b017223e07..cc2928e0a3 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 269825a0b3..13e72a96be 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 33ab32a769..125053a3a3 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 60d7e92c1d..211e2d85a2 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 22054b5d8c..84c682ffb2 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 30b5eaaf57..8821996b52 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 951bf58b6f..4095467765 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 074d3cb548..cc463539ff 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 656dbc1687..fdc3fac572 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 46dce6d563..e6744e0b99 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 573aa8ce76..c1d60fe02a 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 2d10da0868..cc74cd466d 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 4ae56e4472..bdc9865d55 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 69ac9c5c5b..941da2310a 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 0b3e2367cc..f19105bcfd 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 1f9feb4c0b..3d7a166eff 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 56b788c393..5874262110 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 7d0c47b8cf..182fccd16e 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 2ea5d29ec2..9ee34f68af 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 96c1cb5f24..f67a43ba70 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 539254c00b..7858028078 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 bfcc249595..80aa11ed9c 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 96c1cb5f24..f67a43ba70 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 2523985ff5..455433a5d6 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 b7ee13741c..b3cfc203b5 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 4c25116517..1a7f203257 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 c2de47b40e..2aaca3989e 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 eb7c036c31..ec55081bdf 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 6236610a64..e745bd9f16 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 7879b2875c..74000a7082 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 91d8e9c184..f640eaf7c0 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 9adc69a8f5..ad45ecd914 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 a0d2b7dc11..467b2d5007 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 d57c9016f3..5c14524a19 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 25025353ec..3cf935a767 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 7ccced17a9..86d0d9913c 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