Replace ExprInt[num](x) -> ExprInt(x, num)

3 files changed, 61 insertions, 62 deletions

diff --git a/test/analysis/data_flow.py b/test/analysis/data_flow.py
index a40d000a..1784f87f 100644
--- a/test/analysis/data_flow.py
+++ b/test/analysis/data_flow.py
@@ -1,5 +1,5 @@
 """ Test cases for dead code elimination"""
-from miasm2.expression.expression import ExprId, ExprInt32, ExprAff, ExprMem
+from miasm2.expression.expression import ExprId, ExprInt, ExprAff, ExprMem
 from miasm2.core.asmblock import AsmLabel
 from miasm2.analysis.data_flow import *
 from miasm2.ir.analysis import ira
@@ -20,9 +20,9 @@ r_init = ExprId("r_init") # Return register
 pc = ExprId("pc")
 sp = ExprId("sp")
 
-CST1 = ExprInt32(0x11)
-CST2 = ExprInt32(0x12)
-CST3 = ExprInt32(0x13)
+CST1 = ExprInt(0x11, 32)
+CST2 = ExprInt(0x12, 32)
+CST3 = ExprInt(0x13, 32)
 
 LBL0 = AsmLabel("lbl0")
 LBL1 = AsmLabel("lbl1")
diff --git a/test/analysis/depgraph.py b/test/analysis/depgraph.py
index 24095c7b..005ab32c 100644
--- a/test/analysis/depgraph.py
+++ b/test/analysis/depgraph.py
@@ -1,6 +1,5 @@
 """Regression test module for DependencyGraph"""
-from miasm2.expression.expression import ExprId, ExprInt32, ExprAff, ExprCond, \
-    ExprInt
+from miasm2.expression.expression import ExprId, ExprInt, ExprAff, ExprCond
 from miasm2.core.asmblock import AsmLabel
 from miasm2.ir.analysis import ira
 from miasm2.ir.ir import IRBlock, AssignBlock
@@ -31,16 +30,16 @@ D_INIT = ExprId("d_init")
 PC = ExprId("pc")
 SP = ExprId("sp")
 
-CST0 = ExprInt32(0x0)
-CST1 = ExprInt32(0x1)
-CST2 = ExprInt32(0x2)
-CST3 = ExprInt32(0x3)
-CST22 = ExprInt32(0x22)
-CST23 = ExprInt32(0x23)
-CST24 = ExprInt32(0x24)
-CST33 = ExprInt32(0x33)
-CST35 = ExprInt32(0x35)
-CST37 = ExprInt32(0x37)
+CST0 = ExprInt(0x0, 32)
+CST1 = ExprInt(0x1, 32)
+CST2 = ExprInt(0x2, 32)
+CST3 = ExprInt(0x3, 32)
+CST22 = ExprInt(0x22, 32)
+CST23 = ExprInt(0x23, 32)
+CST24 = ExprInt(0x24, 32)
+CST33 = ExprInt(0x33, 32)
+CST35 = ExprInt(0x35, 32)
+CST37 = ExprInt(0x37, 32)
 
 LBL0 = AsmLabel("lbl0")
 LBL1 = AsmLabel("lbl1")
diff --git a/test/analysis/range.py b/test/analysis/range.py
index 4cc27f2c..8b1224f9 100644
--- a/test/analysis/range.py
+++ b/test/analysis/range.py
@@ -11,62 +11,62 @@ for expr in [
         a,
         b,
         b[4:6],
-        a + ExprInt8(4),
-        ExprInt8(5) + ExprInt8(4),
-        a.zeroExtend(32) + ExprInt32(0x100),
-        (a.zeroExtend(32) * ExprInt32(3)) + ExprInt32(0x100),
-        (a.zeroExtend(32) + ExprInt32(0x80)) * ExprInt32(3),
-        ExprCond(b, a.zeroExtend(32) + ExprInt32(0x100),
-                 a.zeroExtend(32) + ExprInt32(0x500)),
-        ExprCond(b[1:2], a.zeroExtend(32), a.zeroExtend(32) + ExprInt32(0x1000)) + \
-        ExprCond(b[0:1], a.zeroExtend(32) + ExprInt32(0x5000), a.zeroExtend(32) + ExprInt32(0x10000)),
+        a + ExprInt(4, 8),
+        ExprInt(5, 8) + ExprInt(4, 8),
+        a.zeroExtend(32) + ExprInt(0x100, 32),
+        (a.zeroExtend(32) * ExprInt(3, 32)) + ExprInt(0x100, 32),
+        (a.zeroExtend(32) + ExprInt(0x80, 32)) * ExprInt(3, 32),
+        ExprCond(b, a.zeroExtend(32) + ExprInt(0x100, 32),
+                 a.zeroExtend(32) + ExprInt(0x500, 32)),
+        ExprCond(b[1:2], a.zeroExtend(32), a.zeroExtend(32) + ExprInt(0x1000, 32)) + \
+        ExprCond(b[0:1], a.zeroExtend(32) + ExprInt(0x5000, 32), a.zeroExtend(32) + ExprInt(0x10000, 32)),
         - a,
-        - ExprInt8(4),
-        b[:8].zeroExtend(16) - ExprInt16(4),
-        a[4:6].zeroExtend(32) + ExprInt32(-1),
-        a >> ExprInt8(4),
-        a << ExprInt8(4),
-        ExprOp("a>>", a, ExprInt8(4)),
-        ExprInt8(4) >> a,
-        ExprInt8(4) << a,
-        ExprOp("a>>", ExprInt8(4), a),
+        - ExprInt(4, 8),
+        b[:8].zeroExtend(16) - ExprInt(4, 16),
+        a[4:6].zeroExtend(32) + ExprInt(-1, 32),
+        a >> ExprInt(4, 8),
+        a << ExprInt(4, 8),
+        ExprOp("a>>", a, ExprInt(4, 8)),
+        ExprInt(4, 8) >> a,
+        ExprInt(4, 8) << a,
+        ExprOp("a>>", ExprInt(4, 8), a),
         a >> a,
         a << a,
         ExprOp("a>>", a, a),
-        ExprInt8(4) >> ExprCond(b[0:1], ExprInt8(1), ExprInt8(10)),
-        ExprInt8(4) << ExprCond(b[0:1], ExprInt8(1), ExprInt8(10)),
-        ExprOp("a>>", ExprInt8(4), ExprCond(b[0:1], ExprInt8(1), ExprInt8(10))),
-        a | ExprInt8(4),
+        ExprInt(4, 8) >> ExprCond(b[0:1], ExprInt(1, 8), ExprInt(10, 8)),
+        ExprInt(4, 8) << ExprCond(b[0:1], ExprInt(1, 8), ExprInt(10, 8)),
+        ExprOp("a>>", ExprInt(4, 8), ExprCond(b[0:1], ExprInt(1, 8), ExprInt(10, 8))),
+        a | ExprInt(4, 8),
         a[3:5] | a[6:8],
-        ExprInt8(0) | a,
-        ExprInt8(0xF) | ExprInt8(0xC),
-        ExprCond(a[0:1], ExprInt8(5), ExprInt8(18)) | a[5:7].zeroExtend(8),
-        a & ExprInt8(4),
+        ExprInt(0, 8) | a,
+        ExprInt(0xF, 8) | ExprInt(0xC, 8),
+        ExprCond(a[0:1], ExprInt(5, 8), ExprInt(18, 8)) | a[5:7].zeroExtend(8),
+        a & ExprInt(4, 8),
         a[3:5] & a[6:8],
-        ExprInt8(8) & a,
-        ExprInt8(0xF) & ExprInt8(0xC),
-        ExprCond(a[0:1], ExprInt8(5), ExprInt8(18)) & (a[4:7].zeroExtend(8) << ExprInt8(2)),
-        a ^ ExprInt8(4),
+        ExprInt(8, 8) & a,
+        ExprInt(0xF, 8) & ExprInt(0xC, 8),
+        ExprCond(a[0:1], ExprInt(5, 8), ExprInt(18, 8)) & (a[4:7].zeroExtend(8) << ExprInt(2, 8)),
+        a ^ ExprInt(4, 8),
         a[3:5] ^ a[6:8],
-        ExprInt8(0xF) ^ a,
-        ExprInt8(0xF) ^ ExprInt8(0xC),
-        ExprCond(a[0:1], ExprInt8(5), ExprInt8(18)) ^ (a[4:7].zeroExtend(8) << ExprInt8(2)),
-        a % ExprInt8(8),
-        ExprInt8(33) % ExprInt8(8),
+        ExprInt(0xF, 8) ^ a,
+        ExprInt(0xF, 8) ^ ExprInt(0xC, 8),
+        ExprCond(a[0:1], ExprInt(5, 8), ExprInt(18, 8)) ^ (a[4:7].zeroExtend(8) << ExprInt(2, 8)),
+        a % ExprInt(8, 8),
+        ExprInt(33, 8) % ExprInt(8, 8),
         a % a,
-        a[:2].zeroExtend(8) + ExprInt8(0xF) % ExprCond(a[0:1], ExprInt8(5), ExprInt8(18)),
-        ExprOp("<<<", ExprInt8(4), ExprInt8(1)),
-        ExprOp("<<<", ExprInt8(4), ExprInt8(14)),
-        ExprOp("<<<", ExprInt8(4), a),
-        ExprOp("<<<", a, ExprInt8(4)),
+        a[:2].zeroExtend(8) + ExprInt(0xF, 8) % ExprCond(a[0:1], ExprInt(5, 8), ExprInt(18, 8)),
+        ExprOp("<<<", ExprInt(4, 8), ExprInt(1, 8)),
+        ExprOp("<<<", ExprInt(4, 8), ExprInt(14, 8)),
+        ExprOp("<<<", ExprInt(4, 8), a),
+        ExprOp("<<<", a, ExprInt(4, 8)),
         ExprOp("<<<", a, a),
-        ExprOp("<<<", a[1:2].zeroExtend(8) + ExprInt8(1), ExprCond(a[0:1], ExprInt8(5), ExprInt8(18))),
-        ExprOp(">>>", ExprInt8(4), ExprInt8(1)),
-        ExprOp(">>>", ExprInt8(4), ExprInt8(14)),
-        ExprOp(">>>", ExprInt8(4), a),
-        ExprOp(">>>", a, ExprInt8(4)),
+        ExprOp("<<<", a[1:2].zeroExtend(8) + ExprInt(1, 8), ExprCond(a[0:1], ExprInt(5, 8), ExprInt(18, 8))),
+        ExprOp(">>>", ExprInt(4, 8), ExprInt(1, 8)),
+        ExprOp(">>>", ExprInt(4, 8), ExprInt(14, 8)),
+        ExprOp(">>>", ExprInt(4, 8), a),
+        ExprOp(">>>", a, ExprInt(4, 8)),
         ExprOp(">>>", a, a),
-        ExprOp(">>>", a[1:2].zeroExtend(8) + ExprInt8(1), ExprCond(a[0:1], ExprInt8(5), ExprInt8(18))),
+        ExprOp(">>>", a[1:2].zeroExtend(8) + ExprInt(1, 8), ExprCond(a[0:1], ExprInt(5, 8), ExprInt(18, 8))),
 
         # Fuzzed by ExprRandom, with previous bug
         ExprSlice(ExprSlice(ExprOp('<<<', ExprInt(0x7FBE84D6, 51), ExprId('WYBZj', 51)), 6, 48), 3, 35),