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

1 files changed, 168 insertions, 168 deletions

diff --git a/test/expression/simplifications.py b/test/expression/simplifications.py
index 5391fbee..d4553495 100644
--- a/test/expression/simplifications.py
+++ b/test/expression/simplifications.py
@@ -32,23 +32,23 @@ l = [a[:8], b[:8], c[:8], m[:8], s, i1[:8], i2[:8], o[:8]]
 l2 = l[::-1]
 
 
-x = ExprMem(a + b + ExprInt32(0x42))
+x = ExprMem(a + b + ExprInt(0x42, 32))
 
 # Define tests: (expression to simplify, expected value)
-to_test = [(ExprInt32(1) - ExprInt32(1), ExprInt32(0)),
-           ((ExprInt32(5) + c + a + b - a + ExprInt32(1) - ExprInt32(5)),
-            ExprOp('+', b, c, ExprInt32(1))),
+to_test = [(ExprInt(1, 32) - ExprInt(1, 32), ExprInt(0, 32)),
+           ((ExprInt(5, 32) + c + a + b - a + ExprInt(1, 32) - ExprInt(5, 32)),
+            ExprOp('+', b, c, ExprInt(1, 32))),
            (a + b + c - a - b - c + a, a),
            (a + a + b + c - (a + (b + c)), a),
            (c ^ b ^ a ^ c ^ b, a),
-           (a ^ ExprInt32(0), a),
+           (a ^ ExprInt(0, 32), a),
            ((a + b) - b, a),
-           (-(ExprInt32(0) - ((a + b) - b)), a),
+           (-(ExprInt(0, 32) - ((a + b) - b)), a),
 
-           (ExprOp('<<<', a, ExprInt32(32)), a),
-           (ExprOp('>>>', a, ExprInt32(32)), a),
-           (ExprOp('>>>', a, ExprInt32(0)), a),
-           (ExprOp('<<', a, ExprInt32(0)), a),
+           (ExprOp('<<<', a, ExprInt(32, 32)), a),
+           (ExprOp('>>>', a, ExprInt(32, 32)), a),
+           (ExprOp('>>>', a, ExprInt(0, 32)), a),
+           (ExprOp('<<', a, ExprInt(0, 32)), a),
 
            (ExprOp('<<<', a, ExprOp('<<<', b, c)),
             ExprOp('<<<', a, ExprOp('<<<', b, c))),
@@ -60,31 +60,31 @@ to_test = [(ExprInt32(1) - ExprInt32(1), ExprInt32(0)),
             ExprOp('<<<', a, (b-c))),
            (ExprOp('>>>', ExprOp('<<<', a, b), b),
             a),
-           (ExprOp(">>>", ExprInt16(0x1000), ExprInt16(0x11)),
-            ExprInt16(0x800)),
-           (ExprOp("<<<", ExprInt16(0x1000), ExprInt16(0x11)),
-            ExprInt16(0x2000)),
-
-           (ExprOp('>>>', ExprOp('<<<', a, ExprInt32(10)), ExprInt32(2)),
-            ExprOp('<<<', a, ExprInt32(8))),
-
-           (ExprOp('>>>', ExprOp('<<<', a, ExprInt32(10)), ExprInt32(2)) ^ ExprOp('>>>', ExprOp('<<<', a, ExprInt32(10)), ExprInt32(2)),
-            ExprInt32(0)),
-           (ExprOp(">>", (a & ExprInt32(0xF)), ExprInt32(0x15)),
-            ExprInt32(0)),
-           (ExprOp(">>", (ExprInt32(0x12345678)), ExprInt32(0x4)),
-            ExprInt32(0x1234567)),
-           (ExprOp("a>>", (ExprInt32(0x12345678)), ExprInt32(0x4)),
-            ExprInt32(0x1234567)),
-           (ExprOp("a>>", (ExprInt32(0xF1234567)), ExprInt32(0x4)),
-            ExprInt32(0xFF123456)),
-           (ExprOp("a>>", (ExprInt32(0xF1234567)), ExprInt32(28)),
-            ExprInt32(0xFFFFFFFF)),
-           (ExprOp("parity", ExprInt32(0xf)), ExprInt1(1)),
-           (ExprOp("parity", ExprInt32(0xe)), ExprInt1(0)),
-           (ExprInt32(0x4142)[:32], ExprInt32(0x4142)),
-           (ExprInt32(0x4142)[:8], ExprInt8(0x42)),
-           (ExprInt32(0x4142)[8:16], ExprInt8(0x41)),
+           (ExprOp(">>>", ExprInt(0x1000, 16), ExprInt(0x11, 16)),
+            ExprInt(0x800, 16)),
+           (ExprOp("<<<", ExprInt(0x1000, 16), ExprInt(0x11, 16)),
+            ExprInt(0x2000, 16)),
+
+           (ExprOp('>>>', ExprOp('<<<', a, ExprInt(10, 32)), ExprInt(2, 32)),
+            ExprOp('<<<', a, ExprInt(8, 32))),
+
+           (ExprOp('>>>', ExprOp('<<<', a, ExprInt(10, 32)), ExprInt(2, 32)) ^ ExprOp('>>>', ExprOp('<<<', a, ExprInt(10, 32)), ExprInt(2, 32)),
+            ExprInt(0, 32)),
+           (ExprOp(">>", (a & ExprInt(0xF, 32)), ExprInt(0x15, 32)),
+            ExprInt(0, 32)),
+           (ExprOp(">>", (ExprInt(0x12345678, 32)), ExprInt(0x4, 32)),
+            ExprInt(0x1234567, 32)),
+           (ExprOp("a>>", (ExprInt(0x12345678, 32)), ExprInt(0x4, 32)),
+            ExprInt(0x1234567, 32)),
+           (ExprOp("a>>", (ExprInt(0xF1234567, 32)), ExprInt(0x4, 32)),
+            ExprInt(0xFF123456, 32)),
+           (ExprOp("a>>", (ExprInt(0xF1234567, 32)), ExprInt(28, 32)),
+            ExprInt(0xFFFFFFFF, 32)),
+           (ExprOp("parity", ExprInt(0xf, 32)), ExprInt(1, 1)),
+           (ExprOp("parity", ExprInt(0xe, 32)), ExprInt(0, 1)),
+           (ExprInt(0x4142, 32)[:32], ExprInt(0x4142, 32)),
+           (ExprInt(0x4142, 32)[:8], ExprInt(0x42, 8)),
+           (ExprInt(0x4142, 32)[8:16], ExprInt(0x41, 8)),
            (a[:32], a),
            (a[:8][:8], a[:8]),
            (a[:16][:8], a[:8]),
@@ -100,59 +100,59 @@ to_test = [(ExprInt32(1) - ExprInt32(1), ExprInt32(0)),
            (ExprMem(a)[:32], ExprMem(a)),
            (ExprMem(a)[:16], ExprMem(a, size=16)),
 
-           (ExprCond(ExprInt32(1), a, b), a),
-           (ExprCond(ExprInt32(0), b, a), a),
+           (ExprCond(ExprInt(1, 32), a, b), a),
+           (ExprCond(ExprInt(0, 32), b, a), a),
 
-           (ExprInt32(0x80000000)[31:32], ExprInt1(1)),
-           (ExprCompose(ExprInt16(0x1337)[:8], ExprInt16(0x1337)[8:16]),
-            ExprInt16(0x1337)),
+           (ExprInt(0x80000000, 32)[31:32], ExprInt(1, 1)),
+           (ExprCompose(ExprInt(0x1337, 16)[:8], ExprInt(0x1337, 16)[8:16]),
+            ExprInt(0x1337, 16)),
 
-           (ExprCompose(ExprInt32(0x1337beef)[:8],
-                        ExprInt32(0x1337beef)[8:16],
-                        ExprInt32(0x1337beef)[16:32]),
-            ExprInt32(0x1337BEEF)),
+           (ExprCompose(ExprInt(0x1337beef, 32)[:8],
+                        ExprInt(0x1337beef, 32)[8:16],
+                        ExprInt(0x1337beef, 32)[16:32]),
+            ExprInt(0x1337BEEF, 32)),
            (ExprCond(a,
                      ExprCond(a,
                               b,
                               c),
                      d), ExprCond(a, b, d)),
-           ((a & b & ExprInt32(0x12))[31:32], ExprInt1(0)),
+           ((a & b & ExprInt(0x12, 32))[31:32], ExprInt(0, 1)),
 
            (ExprCompose(
-               ExprCond(a, ExprInt16(0x10), ExprInt16(0x20)),
-               ExprInt16(0x1337)),
-               ExprCond(a, ExprInt32(0x13370010), ExprInt32(0x13370020))),
-    (ExprCond(ExprCond(a, ExprInt1(0), ExprInt1(1)), b, c),
+               ExprCond(a, ExprInt(0x10, 16), ExprInt(0x20, 16)),
+               ExprInt(0x1337, 16)),
+               ExprCond(a, ExprInt(0x13370010, 32), ExprInt(0x13370020, 32))),
+    (ExprCond(ExprCond(a, ExprInt(0, 1), ExprInt(1, 1)), b, c),
      ExprCond(a, c, b)),
-    (ExprCond(a, ExprInt32(0x10), ExprInt32(0x20)) + ExprInt32(0x13370000),
-     ExprCond(a, ExprInt32(0x13370010), ExprInt32(0x13370020))),
-
-    (ExprCond(a, ExprInt32(0x10), ExprInt32(0x20)) + ExprCond(a, ExprInt32(0x13370000), ExprInt32(0x13380000)),
-     ExprCond(a, ExprInt32(0x13370010), ExprInt32(0x13380020))),
-    (-ExprCond(a, ExprInt32(0x1), ExprInt32(0x2)),
-     ExprCond(a, ExprInt32(-0x1), ExprInt32(-0x2))),
-    (ExprOp('*', a, b, c, ExprInt32(0x12))[0:17],
+    (ExprCond(a, ExprInt(0x10, 32), ExprInt(0x20, 32)) + ExprInt(0x13370000, 32),
+     ExprCond(a, ExprInt(0x13370010, 32), ExprInt(0x13370020, 32))),
+
+    (ExprCond(a, ExprInt(0x10, 32), ExprInt(0x20, 32)) + ExprCond(a, ExprInt(0x13370000, 32), ExprInt(0x13380000, 32)),
+     ExprCond(a, ExprInt(0x13370010, 32), ExprInt(0x13380020, 32))),
+    (-ExprCond(a, ExprInt(0x1, 32), ExprInt(0x2, 32)),
+     ExprCond(a, ExprInt(-0x1, 32), ExprInt(-0x2, 32))),
+    (ExprOp('*', a, b, c, ExprInt(0x12, 32))[0:17],
      ExprOp(
      '*', a[0:17], b[0:17], c[0:17], ExprInt(0x12, 17))),
-    (ExprOp('*', a, ExprInt32(0xffffffff)),
+    (ExprOp('*', a, ExprInt(0xffffffff, 32)),
      -a),
-    (ExprOp('*', -a, -b, c, ExprInt32(0x12)),
-     ExprOp('*', a, b, c, ExprInt32(0x12))),
-    (ExprOp('*', -a, -b, -c, ExprInt32(0x12)),
-     - ExprOp('*', a, b, c, ExprInt32(0x12))),
-     (ExprOp('**', ExprInt32(2), ExprInt32(8)), ExprInt32(0x100)),
-     (ExprInt32(2)**ExprInt32(8), ExprInt32(256)),
-    (a | ExprInt32(0xffffffff),
-     ExprInt32(0xffffffff)),
-    (ExprCond(a, ExprInt32(1), ExprInt32(2)) * ExprInt32(4),
-     ExprCond(a, ExprInt32(4), ExprInt32(8))),
+    (ExprOp('*', -a, -b, c, ExprInt(0x12, 32)),
+     ExprOp('*', a, b, c, ExprInt(0x12, 32))),
+    (ExprOp('*', -a, -b, -c, ExprInt(0x12, 32)),
+     - ExprOp('*', a, b, c, ExprInt(0x12, 32))),
+     (ExprOp('**', ExprInt(2, 32), ExprInt(8, 32)), ExprInt(0x100, 32)),
+     (ExprInt(2, 32)**ExprInt(8, 32), ExprInt(256, 32)),
+    (a | ExprInt(0xffffffff, 32),
+     ExprInt(0xffffffff, 32)),
+    (ExprCond(a, ExprInt(1, 32), ExprInt(2, 32)) * ExprInt(4, 32),
+     ExprCond(a, ExprInt(4, 32), ExprInt(8, 32))),
     (ExprCond(a, b, c) + ExprCond(a, d, e),
      ExprCond(a, b + d, c + e)),
     (ExprCond(a, b, c) * ExprCond(a, d, e),
      ExprCond(a, b * d, c * e)),
 
-    (ExprCond(a, ExprInt32(8), ExprInt32(4)) >> ExprInt32(1),
-     ExprCond(a, ExprInt32(4), ExprInt32(2))),
+    (ExprCond(a, ExprInt(8, 32), ExprInt(4, 32)) >> ExprInt(1, 32),
+     ExprCond(a, ExprInt(4, 32), ExprInt(2, 32))),
 
     (ExprCond(a, b, c) >> ExprCond(a, d, e),
      ExprCond(a, b >> d, c >> e)),
@@ -160,52 +160,52 @@ to_test = [(ExprInt32(1) - ExprInt32(1), ExprInt32(0)),
     (a & b & ExprInt(-1, a.size), a & b),
     (a | b | ExprInt(-1, a.size),
      ExprInt(-1, a.size)),
-    (ExprOp('-', ExprInt8(1), ExprInt8(0)),
-     ExprInt8(1)),
-
-    (ExprCompose(a, ExprInt32(0)) << ExprInt64(0x20),
-     ExprCompose(ExprInt32(0), a)),
-    (ExprCompose(a, ExprInt32(0)) << ExprInt64(0x10),
-     ExprCompose(ExprInt16(0), a, ExprInt16(0))),
-    (ExprCompose(a, ExprInt32(0)) << ExprInt64(0x30),
+    (ExprOp('-', ExprInt(1, 8), ExprInt(0, 8)),
+     ExprInt(1, 8)),
+
+    (ExprCompose(a, ExprInt(0, 32)) << ExprInt(0x20, 64),
+     ExprCompose(ExprInt(0, 32), a)),
+    (ExprCompose(a, ExprInt(0, 32)) << ExprInt(0x10, 64),
+     ExprCompose(ExprInt(0, 16), a, ExprInt(0, 16))),
+    (ExprCompose(a, ExprInt(0, 32)) << ExprInt(0x30, 64),
      ExprCompose(ExprInt(0, 48), a[:0x10])),
-    (ExprCompose(a, ExprInt32(0)) << ExprInt64(0x11),
+    (ExprCompose(a, ExprInt(0, 32)) << ExprInt(0x11, 64),
      ExprCompose(ExprInt(0, 0x11), a, ExprInt(0, 0xF))),
-    (ExprCompose(a, ExprInt32(0)) << ExprInt64(0x40),
-     ExprInt64(0)),
-    (ExprCompose(a, ExprInt32(0)) << ExprInt64(0x50),
-     ExprInt64(0)),
-
-    (ExprCompose(ExprInt32(0), a) >> ExprInt64(0x20),
-     ExprCompose(a, ExprInt32(0))),
-    (ExprCompose(ExprInt32(0), a) >> ExprInt64(0x10),
-     ExprCompose(ExprInt16(0), a, ExprInt16(0))),
-    (ExprCompose(ExprInt32(0), a) >> ExprInt64(0x30),
+    (ExprCompose(a, ExprInt(0, 32)) << ExprInt(0x40, 64),
+     ExprInt(0, 64)),
+    (ExprCompose(a, ExprInt(0, 32)) << ExprInt(0x50, 64),
+     ExprInt(0, 64)),
+
+    (ExprCompose(ExprInt(0, 32), a) >> ExprInt(0x20, 64),
+     ExprCompose(a, ExprInt(0, 32))),
+    (ExprCompose(ExprInt(0, 32), a) >> ExprInt(0x10, 64),
+     ExprCompose(ExprInt(0, 16), a, ExprInt(0, 16))),
+    (ExprCompose(ExprInt(0, 32), a) >> ExprInt(0x30, 64),
      ExprCompose(a[0x10:], ExprInt(0, 48))),
-    (ExprCompose(ExprInt32(0), a) >> ExprInt64(0x11),
+    (ExprCompose(ExprInt(0, 32), a) >> ExprInt(0x11, 64),
      ExprCompose(ExprInt(0, 0xf), a, ExprInt(0, 0x11))),
-    (ExprCompose(ExprInt32(0), a) >> ExprInt64(0x40),
-     ExprInt64(0)),
-    (ExprCompose(ExprInt32(0), a) >> ExprInt64(0x50),
-     ExprInt64(0)),
+    (ExprCompose(ExprInt(0, 32), a) >> ExprInt(0x40, 64),
+     ExprInt(0, 64)),
+    (ExprCompose(ExprInt(0, 32), a) >> ExprInt(0x50, 64),
+     ExprInt(0, 64)),
 
 
-    (ExprCompose(a, b) << ExprInt64(0x20),
-     ExprCompose(ExprInt32(0), a)),
-    (ExprCompose(a, b) << ExprInt64(0x10),
-     ExprCompose(ExprInt16(0), a, b[:16])),
+    (ExprCompose(a, b) << ExprInt(0x20, 64),
+     ExprCompose(ExprInt(0, 32), a)),
+    (ExprCompose(a, b) << ExprInt(0x10, 64),
+     ExprCompose(ExprInt(0, 16), a, b[:16])),
 
     (ExprCompose(a, b) | ExprCompose(c, d),
      ExprCompose(a|c, b|d)),
-    (ExprCompose(a, ExprInt32(0)) | ExprCompose(ExprInt32(0), d),
+    (ExprCompose(a, ExprInt(0, 32)) | ExprCompose(ExprInt(0, 32), d),
      ExprCompose(a, d)),
-    (ExprCompose(f[:32], ExprInt32(0)) | ExprCompose(ExprInt32(0), f[32:]),
+    (ExprCompose(f[:32], ExprInt(0, 32)) | ExprCompose(ExprInt(0, 32), f[32:]),
      f),
-    ((ExprCompose(a, ExprInt32(0)) * ExprInt64(0x123))[32:64],
-     (ExprCompose(a, ExprInt32(0)) * ExprInt64(0x123))[32:64]),
+    ((ExprCompose(a, ExprInt(0, 32)) * ExprInt(0x123, 64))[32:64],
+     (ExprCompose(a, ExprInt(0, 32)) * ExprInt(0x123, 64))[32:64]),
 
-    (ExprInt32(0x12),
-     ExprInt32(0x12L)),
+    (ExprInt(0x12, 32),
+     ExprInt(0x12L, 32)),
 
 
     (ExprCompose(a, b, c)[:16],
@@ -235,13 +235,13 @@ to_test = [(ExprInt32(1) - ExprInt32(1), ExprInt32(0)),
                   &
                   ExprInt(0x1L, 24),
                   ExprInt(0x0L, 40)),
-     ExprInt64(0)),
+     ExprInt(0, 64)),
 
     (ExprCompose(ExprCompose(a[:8], ExprInt(0x0L, 56))[:8]
                  &
                  ExprInt(0x1L, 8),
                  (ExprInt(0x0L, 56))),
-     ExprCompose(a[:8]&ExprInt8(1), ExprInt(0, 56))),
+     ExprCompose(a[:8]&ExprInt(1, 8), ExprInt(0, 56))),
 
     (ExprCompose(ExprCompose(a[:8],
                              ExprInt(0x0L, 56))[:32]
@@ -256,63 +256,63 @@ to_test = [(ExprInt32(1) - ExprInt32(1), ExprInt32(0)),
        ),
     (ExprCompose(a[:16], b[:16])[8:32],
      ExprCompose(a[8:16], b[:16])),
-    ((a >> ExprInt32(16))[:16],
+    ((a >> ExprInt(16, 32))[:16],
      a[16:32]),
-    ((a >> ExprInt32(16))[8:16],
+    ((a >> ExprInt(16, 32))[8:16],
      a[24:32]),
-    ((a << ExprInt32(16))[16:32],
+    ((a << ExprInt(16, 32))[16:32],
      a[:16]),
-    ((a << ExprInt32(16))[24:32],
+    ((a << ExprInt(16, 32))[24:32],
      a[8:16]),
-    (expr_cmpu(ExprInt32(0), ExprInt32(0)),
-     ExprInt1(0)),
-    (expr_cmpu(ExprInt32(10), ExprInt32(0)),
-     ExprInt1(1)),
-    (expr_cmpu(ExprInt32(10), ExprInt32(5)),
-     ExprInt1(1)),
-    (expr_cmpu(ExprInt32(5), ExprInt32(10)),
-     ExprInt1(0)),
-    (expr_cmpu(ExprInt32(-1), ExprInt32(0)),
-     ExprInt1(1)),
-    (expr_cmpu(ExprInt32(-1), ExprInt32(-1)),
-     ExprInt1(0)),
-    (expr_cmpu(ExprInt32(0), ExprInt32(-1)),
-     ExprInt1(0)),
-    (expr_cmps(ExprInt32(0), ExprInt32(0)),
-     ExprInt1(0)),
-    (expr_cmps(ExprInt32(10), ExprInt32(0)),
-     ExprInt1(1)),
-    (expr_cmps(ExprInt32(10), ExprInt32(5)),
-     ExprInt1(1)),
-    (expr_cmps(ExprInt32(5), ExprInt32(10)),
-     ExprInt1(0)),
-    (expr_cmps(ExprInt32(-1), ExprInt32(0)),
-     ExprInt1(0)),
-    (expr_cmps(ExprInt32(-1), ExprInt32(-1)),
-     ExprInt1(0)),
-    (expr_cmps(ExprInt32(0), ExprInt32(-1)),
-     ExprInt1(1)),
-    (expr_cmps(ExprInt32(-5), ExprInt32(-10)),
-     ExprInt1(1)),
-    (expr_cmps(ExprInt32(-10), ExprInt32(-5)),
-     ExprInt1(0)),
+    (expr_cmpu(ExprInt(0, 32), ExprInt(0, 32)),
+     ExprInt(0, 1)),
+    (expr_cmpu(ExprInt(10, 32), ExprInt(0, 32)),
+     ExprInt(1, 1)),
+    (expr_cmpu(ExprInt(10, 32), ExprInt(5, 32)),
+     ExprInt(1, 1)),
+    (expr_cmpu(ExprInt(5, 32), ExprInt(10, 32)),
+     ExprInt(0, 1)),
+    (expr_cmpu(ExprInt(-1, 32), ExprInt(0, 32)),
+     ExprInt(1, 1)),
+    (expr_cmpu(ExprInt(-1, 32), ExprInt(-1, 32)),
+     ExprInt(0, 1)),
+    (expr_cmpu(ExprInt(0, 32), ExprInt(-1, 32)),
+     ExprInt(0, 1)),
+    (expr_cmps(ExprInt(0, 32), ExprInt(0, 32)),
+     ExprInt(0, 1)),
+    (expr_cmps(ExprInt(10, 32), ExprInt(0, 32)),
+     ExprInt(1, 1)),
+    (expr_cmps(ExprInt(10, 32), ExprInt(5, 32)),
+     ExprInt(1, 1)),
+    (expr_cmps(ExprInt(5, 32), ExprInt(10, 32)),
+     ExprInt(0, 1)),
+    (expr_cmps(ExprInt(-1, 32), ExprInt(0, 32)),
+     ExprInt(0, 1)),
+    (expr_cmps(ExprInt(-1, 32), ExprInt(-1, 32)),
+     ExprInt(0, 1)),
+    (expr_cmps(ExprInt(0, 32), ExprInt(-1, 32)),
+     ExprInt(1, 1)),
+    (expr_cmps(ExprInt(-5, 32), ExprInt(-10, 32)),
+     ExprInt(1, 1)),
+    (expr_cmps(ExprInt(-10, 32), ExprInt(-5, 32)),
+     ExprInt(0, 1)),
 
     (ExprOp("<<<c_rez", i1, i0, i0),
      i1),
     (ExprOp("<<<c_rez", i1, i1, i0),
-     ExprInt32(2)),
+     ExprInt(2, 32)),
     (ExprOp("<<<c_rez", i1, i1, i1),
-     ExprInt32(3)),
+     ExprInt(3, 32)),
     (ExprOp(">>>c_rez", icustom, i0, i0),
      icustom),
     (ExprOp(">>>c_rez", icustom, i1, i0),
-     ExprInt32(0x91A2B3C)),
+     ExprInt(0x91A2B3C, 32)),
     (ExprOp(">>>c_rez", icustom, i1, i1),
-     ExprInt32(0x891A2B3C)),
-    (ExprOp("idiv", ExprInt16(0x0123), ExprInt16(0xfffb))[:8],
-     ExprInt8(0xc6)),
-    (ExprOp("imod", ExprInt16(0x0123), ExprInt16(0xfffb))[:8],
-     ExprInt8(0x01)),
+     ExprInt(0x891A2B3C, 32)),
+    (ExprOp("idiv", ExprInt(0x0123, 16), ExprInt(0xfffb, 16))[:8],
+     ExprInt(0xc6, 8)),
+    (ExprOp("imod", ExprInt(0x0123, 16), ExprInt(0xfffb, 16))[:8],
+     ExprInt(0x01, 8)),
 
 ]
 
@@ -334,21 +334,21 @@ to_test = [
      ExprOp_inf_signed(a, b)),
     ((((a - b) ^ ((a ^ b) & ((a - b) ^ a))) ^ a ^ b).msb(),
      ExprOp_inf_unsigned(a, b)),
-    (ExprOp_inf_unsigned(ExprInt32(-1), ExprInt32(3)), ExprInt1(0)),
-    (ExprOp_inf_signed(ExprInt32(-1), ExprInt32(3)), ExprInt1(1)),
+    (ExprOp_inf_unsigned(ExprInt(-1, 32), ExprInt(3, 32)), ExprInt(0, 1)),
+    (ExprOp_inf_signed(ExprInt(-1, 32), ExprInt(3, 32)), ExprInt(1, 1)),
     (ExprOp_inf_unsigned(a, b) ^ (a ^ b).msb(), ExprOp_inf_signed(a, b)),
     (ExprOp_inf_signed(a, b) ^ (a ^ b).msb(), ExprOp_inf_unsigned(a, b)),
-    (ExprOp_equal(ExprInt32(12), ExprInt32(10)), ExprInt1(0)),
-    (ExprOp_equal(ExprInt32(12), ExprInt32(12)), ExprInt1(1)),
-    (ExprOp_equal(ExprInt32(12), ExprInt32(-12)), ExprInt1(0)),
-    (ExprCond(a - b, ExprInt1(0), ExprInt1(1)), ExprOp_equal(a, b)),
-    (ExprCond(a + b, ExprInt1(0), ExprInt1(1)), ExprOp_equal(a, -b)),
-    (ExprOp_inf_signed(ExprInt32(-2), ExprInt32(3)), ExprInt1(1)),
-    (ExprOp_inf_signed(ExprInt32(3), ExprInt32(-3)), ExprInt1(0)),
-    (ExprOp_inf_signed(ExprInt32(2), ExprInt32(3)), ExprInt1(1)),
-    (ExprOp_inf_signed(ExprInt32(-3), ExprInt32(-2)), ExprInt1(1)),
-    (ExprOp_inf_signed(ExprInt32(0), ExprInt32(2)), ExprInt1(1)),
-    (ExprOp_inf_signed(ExprInt32(-3), ExprInt32(0)), ExprInt1(1)),
+    (ExprOp_equal(ExprInt(12, 32), ExprInt(10, 32)), ExprInt(0, 1)),
+    (ExprOp_equal(ExprInt(12, 32), ExprInt(12, 32)), ExprInt(1, 1)),
+    (ExprOp_equal(ExprInt(12, 32), ExprInt(-12, 32)), ExprInt(0, 1)),
+    (ExprCond(a - b, ExprInt(0, 1), ExprInt(1, 1)), ExprOp_equal(a, b)),
+    (ExprCond(a + b, ExprInt(0, 1), ExprInt(1, 1)), ExprOp_equal(a, -b)),
+    (ExprOp_inf_signed(ExprInt(-2, 32), ExprInt(3, 32)), ExprInt(1, 1)),
+    (ExprOp_inf_signed(ExprInt(3, 32), ExprInt(-3, 32)), ExprInt(0, 1)),
+    (ExprOp_inf_signed(ExprInt(2, 32), ExprInt(3, 32)), ExprInt(1, 1)),
+    (ExprOp_inf_signed(ExprInt(-3, 32), ExprInt(-2, 32)), ExprInt(1, 1)),
+    (ExprOp_inf_signed(ExprInt(0, 32), ExprInt(2, 32)), ExprInt(1, 1)),
+    (ExprOp_inf_signed(ExprInt(-3, 32), ExprInt(0, 32)), ExprInt(1, 1)),
 ]
 
 expr_simp_cond = ExpressionSimplifier()
@@ -382,18 +382,18 @@ jrb = ExprId('jrb')
 jrint1 = ExprId('jrint1')
 
 
-e1 = ExprMem((a & ExprInt32(0xFFFFFFFC)) + ExprInt32(0x10), 32)
-e2 = ExprMem((a & ExprInt32(0xFFFFFFFC)) + b, 32)
+e1 = ExprMem((a & ExprInt(0xFFFFFFFC, 32)) + ExprInt(0x10, 32), 32)
+e2 = ExprMem((a & ExprInt(0xFFFFFFFC, 32)) + b, 32)
 e3 = (a ^ b ^ ((a ^ b) & (b ^ (b - a))) ^ (b - a)).canonize()
 
 match_tests = [
-    (MatchExpr(ExprInt32(12), a, [a]), {a: ExprInt32(12)}),
+    (MatchExpr(ExprInt(12, 32), a, [a]), {a: ExprInt(12, 32)}),
     (MatchExpr(x, a, [a]), {a: x}),
     (MatchExpr(x + y, a, [a]), {a: x + y}),
     (MatchExpr(x + y, a + y, [a]), {a: x}),
     (MatchExpr(x + y, x + a, [a]), {a: y}),
     (MatchExpr(x + y, a + b, [a, b]), {a: x, b: y}),
-    (MatchExpr(x + ExprInt32(12), a + b, [a, b]), {a: x, b: ExprInt32(12)}),
+    (MatchExpr(x + ExprInt(12, 32), a + b, [a, b]), {a: x, b: ExprInt(12, 32)}),
     (MatchExpr(ExprMem(x), a, [a]), {a: ExprMem(x)}),
     (MatchExpr(ExprMem(x), ExprMem(a), [a]), {a: x}),
     (MatchExpr(x[0:8], a, [a]), {a: x[0:8]}),
@@ -407,7 +407,7 @@ match_tests = [
     (MatchExpr(ExprCompose(x[:8], y[:8]),
                ExprCompose(a[:8], b[:8]), [a, b]),
      {a: x, b: y}),
-    (MatchExpr(e1, e2, [b]), {b: ExprInt32(0x10)}),
+    (MatchExpr(e1, e2, [b]), {b: ExprInt(0x10, 32)}),
     (MatchExpr(e3,
                (((jra ^ jrb) & (jrb ^ jrint1))
                 ^ jra ^ jrb ^ jrint1).canonize(),