arch-x86: Fix imports for Python 3 compatibility

Change-Id: I7e486a6f3d38af54ac1eff431ca40a5af29e3ca7
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/26256
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/x86/isa/insts/__init__.py b/src/arch/x86/isa/insts/__init__.py
index 4840e2366240fcba7b7155281b96fc29cbd231c9..918951c95e014443f3d4157998a9b5e5e244b6b6 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("from . 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 9542dcac0b630d9a698a9ed97ec558b2235b89b6..95d55a782a6f77d472d65165dcf86bd5df826eba 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("from . 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 cc016651da42c30234411f3e4781b0b242c30c6e..27d3807a27b7b7b63eca0dfbf77690f6fcece633 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("from . 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 385db5cb96aa6f7aebfe9557ebe9f179da21b94d..48cc1c2fb293e7b6d5dcd2c4692cecd5aa0c0683 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("from . 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 470f72dfa097458915b75a1426a218f31a019e5e..38ca3362887331abd2072019f225fdaaf5f07455 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("from . 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 5495a62e481caea42ace8bb39cf664bf84240111..d90e3024284e6a400992f4eae6f0ebbca40b6ce6 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("from . 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 5c32f19973db13718dee2d5500d090d5b62cca29..1cdccec48eecb1171956fc4f5c8acd903c0a19df 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("from . 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 68d922d666858f8e23ad1429b7cbc51bebcfe9f7..673f167bd6d7437b0e9e62ea2b8f070cab8392b5 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("from . 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 1f1c87822cbbf053e32953c66438aff4b833f027..a5c5a57df6faa4f66fda37ec30caabf7d557f569 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("from . 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 e0f10e14cf2c709a3a74254a5b944f2507b50414..b72512184b3d50c0bb120ce3baab1d0e77074174 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("from . 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 a30f362ae3a80b6d594fd3c745b3619fc8d5a285..2bf155270cb1dbb96a473f5492b1226cf1ade98d 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("from . 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 465305dd9c9e2a77f302276a92c5bb5f464cd603..8a3fbafe7ce5efbe96d27ce897117394ef596e4e 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("from . 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 cc2928e0a3891908e549b5f59bda930378a2bb65..bffb9b9affcc5f99f8bac66d60adecd9bef7a125 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("from . 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 13e72a96be90affb5915ac8b61f722cc20a2676a..f3119f38564810dcd024e0197865c3520a27d744 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("from . 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 125053a3a33168d125ea8159774d601bd0695b35..85b1c9fae15cf0942596c23235015a3b973e5b50 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("from . 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 211e2d85a26170d8f37cb3cd1459c4b952103595..42afc9a7f9eb309b478c16228968055e597279a9 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("from . 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 84c682ffb22731252df3f391120b7717c25806e5..78c6e941bf7fd02572e4e18e8901f62538540fc5 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("from . 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 8821996b528307fcd71e446390758bd3f3b0b562..b9845a9f70e9c70f5b05f409ed28df027042a4c1 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("from . 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 4095467765a4d4995f306503cd47efa0849f2324..6fc94c28674bf1a44a0d44d5e2cce706fa9f6a45 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("from . 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 cc463539ff50073e06c718e1e0c800a3d2ddd01f..ecf20086cd0654435dac3a4ab127a28be58840b7 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("from . 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 fdc3fac572b3c996202898cb23dbf34f31d62fef..8b4681180f0a5c490fc76df543434f2191c9c6a3 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("from . 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 e6744e0b993af647bd574679e7253b07b7bfd64f..08c0e8632b8f919d47cc70e2a77c02f8e254b6da 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("from . 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 c1d60fe02a9a4dd7874de77beddba8a515180c17..8beaf881c6140341ae155957b29502369e0081db 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("from . 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 cc74cd466d97f7698d166f4518b6f9dcf79e4836..ceb6e45ba4b7cbb6c173481900baec92f8dcb18d 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("from . 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 bdc9865d555ca5c3f0be0f3e96b5e88df27aa126..1231aa178d668c5a4c09a5ead46bb5502c6c4f37 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("from . 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 941da2310ad68262c373acea4742329e2f870575..b1da9719a733d491258f023d333cdc6ac6c1978e 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("from . 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 f19105bcfde856542ac1c4bba2fabaf3d69fa979..53d48190701f64a35978c9cecbd45cdcd7cd48b2 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("from . 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 3d7a166efff60718982f3016580c79d802c8d3c2..a4a6d44f53150ea612311bbcd214c2e221042aac 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("from . 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 5874262110ee9d10e4c46ebf2359a28b526c1e3a..461a2ff9012a1e8037cfafe2b0e60ba5e3c55ec1 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("from . 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 182fccd16e562967ccd6c6c8e047cc0e65fdf430..dcdb8690da3e344f6d20022eccf8d8a25b6c9475 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("from . 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 9ee34f68af13353cc730fcaaf7a268a687587ab1..553946778d03a1d83ca9220d22f64a8a59a2d058 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("from . 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 f67a43ba7092e49f76f871cecf1ff5ee6b7041f9..2f7365b34e6332d10afeb02e29e3c6ea32e30c94 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("from . 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 785802807825c267a7b6e2f725ab2daf5c828cea..4c71d0dc6afdde55a4d18016fe1dde61464bc4e5 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("from . 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 80aa11ed9cb5b213561a300ded866d02f27117db..0e60ebad5ad8371767fca51d764266ea5efe49b4 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("from . 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 f67a43ba7092e49f76f871cecf1ff5ee6b7041f9..2f7365b34e6332d10afeb02e29e3c6ea32e30c94 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("from . 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 455433a5d6ddbee6f709ec7d152e61452641b7ca..ce2a85918f0bf82e4e9d4c9cce64b71c83070600 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("from . 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 b3cfc203b561c015d3c62804f56f709b8de4a06c..5c12feb8293c9ed8700db67b2ccc39405366ba73 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("from . 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 1a7f2032576e90d1efbe0eab6daf929e595a1a12..a77545ddb24557e7122eb39ce6a21549fe84a78e 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("from . 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 2aaca3989e0769450a714031fc6a44607d67f0df..bad162960c3caf5f35aefda897b390f8ea564997 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("from . 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 ec55081bdfa0746594535bc44348c90804404054..af1f1992b4d89f4fbfc50ada1bf57bad9daeedc9 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("from . 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 e745bd9f16e85822373bf9977f2ecd98d7c87ca0..95fd3be19a8b7283a8e94129cdc8aefe388e7868 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("from . 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 74000a7082184b9f626affe8d30938a24c580d1e..62fca5e07d54329dfa73ce996e8c1470df3a5490 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("from . 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 f640eaf7c05ec6c5e73cecb3d9eed51ae132b211..cdef0380b7e226f18e2a5cb25faa557296338425 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("from . 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 ad45ecd9149de60aeb42dc8a8434c20e0c178aae..01a1e68baf2dbd685876e00b5d56637618e0e383 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("from . 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 467b2d5007e7462ee872ec56c9ca6a56daaa414e..5f1d4cce4419f428871bf2cd61196c094268b891 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("from . 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 5c14524a1937c2faed45e0e7e7b95f6aeacdec06..bf57ce6b7008317d0c9211d952cc3afb0833f102 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("from . 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 3cf935a76781cb6dfd80ca4d0afd7a2832b14c71..8135a9230ff619fff22ea48f6a2dbd56d1053075 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("from . 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 86d0d9913c161f415aa286bcc82cd5c7a3cef8e0..ac8dae2566d2b7f0e0b8f64dc14aa2d2ee940802 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("from . import %s as cat" % category)
     microcode += cat.microcode