diff options
| author | serpilliere <fabrice.desclaux@cea.fr> | 2015-02-21 21:34:52 +0100 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2016-11-04 16:45:46 +0100 |
| commit | 895263f702876a2cdf3bd1e9359ce1b0340f87fd (patch) | |
| tree | 23135227a64390adcf153120f841d28f4d2ed530 /test/ir/symbexec.py | |
| parent | 8e8a60b5d55db6209d05577d038ed3b4dc961b60 (diff) | |
| download | miasm-895263f702876a2cdf3bd1e9359ce1b0340f87fd.tar.gz miasm-895263f702876a2cdf3bd1e9359ce1b0340f87fd.zip | |
Expression: remove is_term attribute
Diffstat (limited to '')
| -rw-r--r-- | test/ir/symbexec.py | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/test/ir/symbexec.py b/test/ir/symbexec.py index 9165fccb..19cc47db 100644 --- a/test/ir/symbexec.py +++ b/test/ir/symbexec.py @@ -21,7 +21,7 @@ class TestSymbExec(unittest.TestCase): addr40 = ExprInt32(40) addr50 = ExprInt32(50) mem0 = ExprMem(addr0) - mem1 = ExprMem(addr1) + mem1 = ExprMem(addr1, 8) mem8 = ExprMem(addr8) mem9 = ExprMem(addr9) mem20 = ExprMem(addr20) @@ -34,22 +34,24 @@ class TestSymbExec(unittest.TestCase): id_a = ExprId('a') id_eax = ExprId('eax_init') - e = symbexec( - ir_x86_32(), {mem0: id_x, mem1: id_y, mem9: id_x, mem40w: id_x, mem50v: id_y, id_a: addr0, id_eax: addr0}) + e = symbexec(ir_x86_32(), + {mem0: id_x, mem1: id_y, mem9: id_x, + mem40w: id_x[:16], mem50v: id_y, + id_a: addr0, id_eax: addr0}) self.assertEqual(e.find_mem_by_addr(addr0), mem0) self.assertEqual(e.find_mem_by_addr(addrX), None) - self.assertEqual(e.eval_ExprMem(ExprMem(addr1 - addr1)), id_x) - self.assertEqual(e.eval_ExprMem(ExprMem(addr1, 8)), id_y) - self.assertEqual(e.eval_ExprMem(ExprMem(addr1 + addr1)), ExprCompose( + self.assertEqual(e.eval_expr(ExprMem(addr1 - addr1)), id_x) + self.assertEqual(e.eval_expr(ExprMem(addr1, 8)), id_y) + self.assertEqual(e.eval_expr(ExprMem(addr1 + addr1)), ExprCompose( [(id_x[16:32], 0, 16), (ExprMem(ExprInt32(4), 16), 16, 32)])) - self.assertEqual(e.eval_ExprMem(mem8), ExprCompose( + self.assertEqual(e.eval_expr(mem8), ExprCompose( [(id_x[0:24], 0, 24), (ExprMem(ExprInt32(11), 8), 24, 32)])) - self.assertEqual(e.eval_ExprMem(mem40v), id_x[:8]) - self.assertEqual(e.eval_ExprMem(mem50w), ExprCompose( + self.assertEqual(e.eval_expr(mem40v), id_x[:8]) + self.assertEqual(e.eval_expr(mem50w), ExprCompose( [(id_y, 0, 8), (ExprMem(ExprInt32(51), 8), 8, 16)])) - self.assertEqual(e.eval_ExprMem(mem20), mem20) + self.assertEqual(e.eval_expr(mem20), mem20) e.func_read = lambda x: x - self.assertEqual(e.eval_ExprMem(mem20), mem20) + self.assertEqual(e.eval_expr(mem20), mem20) self.assertEqual(set(e.modified()), set(e.symbols)) self.assertRaises( KeyError, e.symbols.__getitem__, ExprMem(ExprInt32(100))) |