diff options
| -rw-r--r-- | miasm/expression/simplifications_common.py | 4 | ||||
| -rw-r--r-- | test/expression/simplifications.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/miasm/expression/simplifications_common.py b/miasm/expression/simplifications_common.py index e96d6fea..444308f0 100644 --- a/miasm/expression/simplifications_common.py +++ b/miasm/expression/simplifications_common.py @@ -1570,8 +1570,8 @@ def simp_compose_and_mask(_, expr): return expr if not arg2.is_int(): return expr - int2 = arg2.arg.arg + int2 = arg2.arg if (int2 + 1) & int2 != 0: return expr - mask_size = int2.bit_length() + 7 // 8 + mask_size = int2.arg.bit_length() + 7 // 8 return ExprSlice(arg1, 0, mask_size).zeroExtend(expr.size) diff --git a/test/expression/simplifications.py b/test/expression/simplifications.py index 31d55b71..b1e590ec 100644 --- a/test/expression/simplifications.py +++ b/test/expression/simplifications.py @@ -194,7 +194,7 @@ to_test = [(ExprInt(1, 32) - ExprInt(1, 32), ExprInt(0, 32)), ExprOp('&', a, ExprInt(0xFFFFFFF0, 32))), (ExprCompose(ExprInt(0x1234, 16), ExprId("a", 16)) & ExprInt(0xFF, 32), ExprInt(0x34, 32)), - (ExprCompose(ExprInt(0x12, 8), ExprInt(0x34, 8)) & ExprInt(0xFFFF, 16), ExprInt(0x3412, 32)), + (ExprCompose(ExprInt(0x12, 8), ExprInt(0x34, 8)) & ExprInt(0xFFFF, 16), ExprInt(0x3412, 16)), (ExprCompose(ExprInt(0x12, 8), ExprInt(0x3456, 16), ExprInt(0x78, 8)) & ExprInt(0xFFFFFF, 32), ExprInt(0x345612, 32)), (ExprCompose(ExprInt(0x1234, 16), ExprId("a", 8), ExprInt(0x67, 8)) & ExprInt(0xFFFFFFFF, 32), ExprCompose(ExprInt(0x1234, 16), ExprId("a", 8), ExprInt(0x67, 8))), |