arch-x86: Add Python 3 workarounds for long
authorGiacomo Travaglini <giacomo.travaglini@arm.com>
Tue, 3 Mar 2020 13:31:47 +0000 (13:31 +0000)
committerGiacomo Travaglini <giacomo.travaglini@arm.com>
Fri, 13 Mar 2020 14:24:07 +0000 (14:24 +0000)
Python 3 doesn't have a separate long type. Make long an alias for int
where needed to maintain compatibility.

This is aligning with https://gem5-review.googlesource.com/c/15988

Change-Id: I20e52d7f796d143534fa7dabeb6ff0ae8b62fd2b
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/26257
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
src/arch/x86/isa/microops/limmop.isa

index 6beaf0c6e2e3dfe80866aaa1767135476497f75f..44ec8499a91f161a803f09ea36f9d139b2095264 100644 (file)
@@ -101,6 +101,10 @@ def template MicroLimmOpConstructor {{
 }};
 
 let {{
+    import six
+    if six.PY3:
+        long = int
+
     class LimmOp(X86Microop):
         def __init__(self, dest, imm, dataSize="env.dataSize"):
             self.className = "Limm"