diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/analysis/data_flow.py | 316 | ||||
| -rw-r--r-- | test/analysis/depgraph.py | 168 | ||||
| -rw-r--r-- | test/arch/mep/ir/ut_helpers_ir.py | 4 | ||||
| -rw-r--r-- | test/expression/expr_pickle.py | 4 | ||||
| -rw-r--r-- | test/expression/expression.py | 4 | ||||
| -rw-r--r-- | test/expression/parser.py | 4 | ||||
| -rw-r--r-- | test/expression/simplifications.py | 6 | ||||
| -rw-r--r-- | test/ir/ir.py | 4 | ||||
| -rw-r--r-- | test/ir/reduce_graph.py | 128 | ||||
| -rwxr-xr-x | test/ir/symbexec.py | 6 | ||||
| -rw-r--r-- | test/ir/translators/smt2.py | 2 | ||||
| -rw-r--r-- | test/jitter/jitload.py | 6 |
12 files changed, 326 insertions, 326 deletions
diff --git a/test/analysis/data_flow.py b/test/analysis/data_flow.py index d0dbbd8d..53c9b01b 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, ExprInt, ExprAff, ExprMem +from miasm2.expression.expression import ExprId, ExprInt, ExprAssign, ExprMem from miasm2.core.locationdb import LocationDB from miasm2.analysis.data_flow import * from miasm2.ir.analysis import ira @@ -83,9 +83,9 @@ IRA = IRATest(loc_db) G1_IRA = IRA.new_ircfg() -G1_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)], [ExprAff(b, CST2)]]) -G1_IRB1 = gen_irblock(LBL1, [[ExprAff(a, b)]]) -G1_IRB2 = gen_irblock(LBL2, [[ExprAff(r, a)]]) +G1_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)], [ExprAssign(b, CST2)]]) +G1_IRB1 = gen_irblock(LBL1, [[ExprAssign(a, b)]]) +G1_IRB2 = gen_irblock(LBL2, [[ExprAssign(r, a)]]) for irb in [G1_IRB0, G1_IRB1, G1_IRB2]: G1_IRA.add_irblock(irb) @@ -96,9 +96,9 @@ G1_IRA.add_uniq_edge(G1_IRB1.loc_key, G1_IRB2.loc_key) # Expected output for graph 1 G1_EXP_IRA = IRA.new_ircfg() -G1_EXP_IRB0 = gen_irblock(LBL0, [[], [ExprAff(b, CST2)]]) -G1_EXP_IRB1 = gen_irblock(LBL1, [[ExprAff(a, b)]]) -G1_EXP_IRB2 = gen_irblock(LBL2, [[ExprAff(r, a)]]) +G1_EXP_IRB0 = gen_irblock(LBL0, [[], [ExprAssign(b, CST2)]]) +G1_EXP_IRB1 = gen_irblock(LBL1, [[ExprAssign(a, b)]]) +G1_EXP_IRB2 = gen_irblock(LBL2, [[ExprAssign(r, a)]]) for irb in [G1_EXP_IRB0, G1_EXP_IRB1, G1_EXP_IRB2]: G1_EXP_IRA.add_irblock(irb) @@ -107,9 +107,9 @@ for irb in [G1_EXP_IRB0, G1_EXP_IRB1, G1_EXP_IRB2]: G2_IRA = IRA.new_ircfg() -G2_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)], [ExprAff(r, CST1)]]) -G2_IRB1 = gen_irblock(LBL1, [[ExprAff(a, a+CST1)]]) -G2_IRB2 = gen_irblock(LBL2, [[ExprAff(a, r)]]) +G2_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)], [ExprAssign(r, CST1)]]) +G2_IRB1 = gen_irblock(LBL1, [[ExprAssign(a, a+CST1)]]) +G2_IRB2 = gen_irblock(LBL2, [[ExprAssign(a, r)]]) for irb in [G2_IRB0, G2_IRB1, G2_IRB2]: G2_IRA.add_irblock(irb) @@ -121,7 +121,7 @@ G2_IRA.add_uniq_edge(G2_IRB1.loc_key, G2_IRB1.loc_key) # Expected output for graph 2 G2_EXP_IRA = IRA.new_ircfg() -G2_EXP_IRB0 = gen_irblock(LBL0, [[], [ExprAff(r, CST1)]]) +G2_EXP_IRB0 = gen_irblock(LBL0, [[], [ExprAssign(r, CST1)]]) G2_EXP_IRB1 = gen_irblock(LBL1, [[]]) G2_EXP_IRB2 = gen_irblock(LBL2, [[]]) @@ -132,9 +132,9 @@ for irb in [G2_EXP_IRB0, G2_EXP_IRB1, G2_EXP_IRB2]: G3_IRA = IRA.new_ircfg() -G3_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)]]) -G3_IRB1 = gen_irblock(LBL1, [[ExprAff(a, a+CST1)]]) -G3_IRB2 = gen_irblock(LBL2, [[ExprAff(r, a)]]) +G3_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)]]) +G3_IRB1 = gen_irblock(LBL1, [[ExprAssign(a, a+CST1)]]) +G3_IRB2 = gen_irblock(LBL2, [[ExprAssign(r, a)]]) for irb in [G3_IRB0, G3_IRB1, G3_IRB2]: G3_IRA.add_irblock(irb) @@ -146,9 +146,9 @@ G3_IRA.add_uniq_edge(G3_IRB1.loc_key, G3_IRB1.loc_key) # Expected output for graph 3 G3_EXP_IRA = IRA.new_ircfg() -G3_EXP_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)]]) -G3_EXP_IRB1 = gen_irblock(LBL1, [[ExprAff(a, a+CST1)]]) -G3_EXP_IRB2 = gen_irblock(LBL2, [[ExprAff(r, a)]]) +G3_EXP_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)]]) +G3_EXP_IRB1 = gen_irblock(LBL1, [[ExprAssign(a, a+CST1)]]) +G3_EXP_IRB2 = gen_irblock(LBL2, [[ExprAssign(r, a)]]) for irb in [G3_EXP_IRB0, G3_EXP_IRB1, G3_EXP_IRB2]: G3_EXP_IRA.add_irblock(irb) @@ -157,10 +157,10 @@ for irb in [G3_EXP_IRB0, G3_EXP_IRB1, G3_EXP_IRB2]: G4_IRA = IRA.new_ircfg() -G4_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)]]) -G4_IRB1 = gen_irblock(LBL1, [[ExprAff(a, a+CST1)]]) -G4_IRB2 = gen_irblock(LBL2, [[ExprAff(a, a+CST2)]]) -G4_IRB3 = gen_irblock(LBL3, [[ExprAff(a, CST3)], [ExprAff(r, a)]]) +G4_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)]]) +G4_IRB1 = gen_irblock(LBL1, [[ExprAssign(a, a+CST1)]]) +G4_IRB2 = gen_irblock(LBL2, [[ExprAssign(a, a+CST2)]]) +G4_IRB3 = gen_irblock(LBL3, [[ExprAssign(a, CST3)], [ExprAssign(r, a)]]) for irb in [G4_IRB0, G4_IRB1, G4_IRB2, G4_IRB3]: G4_IRA.add_irblock(irb) @@ -176,7 +176,7 @@ G4_EXP_IRA = IRA.new_ircfg() G4_EXP_IRB0 = gen_irblock(LBL0, [[]]) G4_EXP_IRB1 = gen_irblock(LBL1, [[]]) G4_EXP_IRB2 = gen_irblock(LBL2, [[]]) -G4_EXP_IRB3 = gen_irblock(LBL3, [[ExprAff(a, CST3)], [ExprAff(r, a)]]) +G4_EXP_IRB3 = gen_irblock(LBL3, [[ExprAssign(a, CST3)], [ExprAssign(r, a)]]) for irb in [G4_EXP_IRB0, G4_EXP_IRB1, G4_EXP_IRB2, G4_EXP_IRB3]: G4_EXP_IRA.add_irblock(irb) @@ -185,12 +185,12 @@ for irb in [G4_EXP_IRB0, G4_EXP_IRB1, G4_EXP_IRB2, G4_EXP_IRB3]: G5_IRA = IRA.new_ircfg() -G5_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)]]) -G5_IRB1 = gen_irblock(LBL1, [[ExprAff(r, CST2)]]) -G5_IRB2 = gen_irblock(LBL2, [[ExprAff(a, a+CST2)]]) -G5_IRB3 = gen_irblock(LBL3, [[ExprAff(a, a+CST3)]]) -G5_IRB4 = gen_irblock(LBL4, [[ExprAff(a, a+CST1)]]) -G5_IRB5 = gen_irblock(LBL5, [[ExprAff(a, r)]]) +G5_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)]]) +G5_IRB1 = gen_irblock(LBL1, [[ExprAssign(r, CST2)]]) +G5_IRB2 = gen_irblock(LBL2, [[ExprAssign(a, a+CST2)]]) +G5_IRB3 = gen_irblock(LBL3, [[ExprAssign(a, a+CST3)]]) +G5_IRB4 = gen_irblock(LBL4, [[ExprAssign(a, a+CST1)]]) +G5_IRB5 = gen_irblock(LBL5, [[ExprAssign(a, r)]]) for irb in [G5_IRB0, G5_IRB1, G5_IRB2, G5_IRB3, G5_IRB4, G5_IRB5]: G5_IRA.add_irblock(irb) @@ -207,7 +207,7 @@ G5_IRA.add_uniq_edge(G5_IRB4.loc_key, G5_IRB1.loc_key) G5_EXP_IRA = IRA.new_ircfg() G5_EXP_IRB0 = gen_irblock(LBL0, [[]]) -G5_EXP_IRB1 = gen_irblock(LBL1, [[ExprAff(r, CST2)]]) +G5_EXP_IRB1 = gen_irblock(LBL1, [[ExprAssign(r, CST2)]]) G5_EXP_IRB2 = gen_irblock(LBL2, [[]]) G5_EXP_IRB3 = gen_irblock(LBL3, [[]]) G5_EXP_IRB4 = gen_irblock(LBL4, [[]]) @@ -222,10 +222,10 @@ for irb in [G5_EXP_IRB0, G5_EXP_IRB1, G5_EXP_IRB2, G6_IRA = IRA.new_ircfg() -G6_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)]]) -G6_IRB1 = gen_irblock(LBL1, [[ExprAff(b, a)]]) -G6_IRB2 = gen_irblock(LBL2, [[ExprAff(a, b)]]) -G6_IRB3 = gen_irblock(LBL3, [[ExprAff(r, CST2)]]) +G6_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)]]) +G6_IRB1 = gen_irblock(LBL1, [[ExprAssign(b, a)]]) +G6_IRB2 = gen_irblock(LBL2, [[ExprAssign(a, b)]]) +G6_IRB3 = gen_irblock(LBL3, [[ExprAssign(r, CST2)]]) for irb in [G6_IRB0, G6_IRB1, G6_IRB2, G6_IRB3]: G6_IRA.add_irblock(irb) @@ -241,7 +241,7 @@ G6_EXP_IRA = IRA.new_ircfg() G6_EXP_IRB0 = gen_irblock(LBL0, [[]]) G6_EXP_IRB1 = gen_irblock(LBL1, [[]]) G6_EXP_IRB2 = gen_irblock(LBL2, [[]]) -G6_EXP_IRB3 = gen_irblock(LBL3, [[ExprAff(r, CST2)]]) +G6_EXP_IRB3 = gen_irblock(LBL3, [[ExprAssign(r, CST2)]]) for irb in [G6_EXP_IRB0, G6_EXP_IRB1, G6_EXP_IRB2, G6_EXP_IRB3]: G6_EXP_IRA.add_irblock(irb) @@ -250,10 +250,10 @@ for irb in [G6_EXP_IRB0, G6_EXP_IRB1, G6_EXP_IRB2, G6_EXP_IRB3]: G7_IRA = IRA.new_ircfg() -G7_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)], [ExprAff(r, CST1)]]) -G7_IRB1 = gen_irblock(LBL1, [[ExprAff(a, a+CST1)]]) -G7_IRB2 = gen_irblock(LBL2, [[ExprAff(a, a+CST2)]]) -G7_IRB3 = gen_irblock(LBL3, [[ExprAff(a, r)]]) +G7_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)], [ExprAssign(r, CST1)]]) +G7_IRB1 = gen_irblock(LBL1, [[ExprAssign(a, a+CST1)]]) +G7_IRB2 = gen_irblock(LBL2, [[ExprAssign(a, a+CST2)]]) +G7_IRB3 = gen_irblock(LBL3, [[ExprAssign(a, r)]]) for irb in [G7_IRB0, G7_IRB1, G7_IRB2, G7_IRB3]: G7_IRA.add_irblock(irb) @@ -268,7 +268,7 @@ G7_IRA.add_uniq_edge(G7_IRB0.loc_key, G7_IRB2.loc_key) # Expected output for graph 7 G7_EXP_IRA = IRA.new_ircfg() -G7_EXP_IRB0 = gen_irblock(LBL0, [[], [ExprAff(r, CST1)]]) +G7_EXP_IRB0 = gen_irblock(LBL0, [[], [ExprAssign(r, CST1)]]) G7_EXP_IRB1 = gen_irblock(LBL1, [[]]) G7_EXP_IRB2 = gen_irblock(LBL2, [[]]) G7_EXP_IRB3 = gen_irblock(LBL3, [[]]) @@ -280,10 +280,10 @@ for irb in [G7_EXP_IRB0, G7_EXP_IRB1, G7_EXP_IRB2, G7_EXP_IRB3]: G8_IRA = IRA.new_ircfg() -G8_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)], [ExprAff(b, CST1)]]) -G8_IRB1 = gen_irblock(LBL1, [[ExprAff(a, a+CST1)]]) -G8_IRB2 = gen_irblock(LBL2, [[ExprAff(b, b+CST2)]]) -G8_IRB3 = gen_irblock(LBL3, [[ExprAff(a, b)]]) +G8_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)], [ExprAssign(b, CST1)]]) +G8_IRB1 = gen_irblock(LBL1, [[ExprAssign(a, a+CST1)]]) +G8_IRB2 = gen_irblock(LBL2, [[ExprAssign(b, b+CST2)]]) +G8_IRB3 = gen_irblock(LBL3, [[ExprAssign(a, b)]]) for irb in [G8_IRB0, G8_IRB1, G8_IRB2, G8_IRB3]: @@ -312,11 +312,11 @@ for irb in [G8_EXP_IRB0, G8_EXP_IRB1, G8_EXP_IRB2, G8_EXP_IRB3]: G9_IRA = IRA.new_ircfg() -G9_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)], [ExprAff(b, CST1)]]) -G9_IRB1 = gen_irblock(LBL1, [[ExprAff(a, a+CST1)], [ExprAff(b, b+CST1)]]) -G9_IRB2 = gen_irblock(LBL2, [[ExprAff(a, a+CST2)], [ExprAff(b, b+CST2)]]) -G9_IRB3 = gen_irblock(LBL3, [[ExprAff(a, b)]]) -G9_IRB4 = gen_irblock(LBL4, [[ExprAff(r, a)], [ExprAff(r, b)]]) +G9_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)], [ExprAssign(b, CST1)]]) +G9_IRB1 = gen_irblock(LBL1, [[ExprAssign(a, a+CST1)], [ExprAssign(b, b+CST1)]]) +G9_IRB2 = gen_irblock(LBL2, [[ExprAssign(a, a+CST2)], [ExprAssign(b, b+CST2)]]) +G9_IRB3 = gen_irblock(LBL3, [[ExprAssign(a, b)]]) +G9_IRB4 = gen_irblock(LBL4, [[ExprAssign(r, a)], [ExprAssign(r, b)]]) for irb in [G9_IRB0, G9_IRB1, G9_IRB2, G9_IRB3, G9_IRB4]: G9_IRA.add_irblock(irb) @@ -335,11 +335,11 @@ G9_IRA.add_uniq_edge(G9_IRB3.loc_key, G9_IRB4.loc_key) G9_EXP_IRA = IRA.new_ircfg() -G9_EXP_IRB0 = gen_irblock(LBL0, [[], [ExprAff(b, CST1)]]) -G9_EXP_IRB1 = gen_irblock(LBL1, [[], [ExprAff(b, b+CST1)]]) -G9_EXP_IRB2 = gen_irblock(LBL2, [[], [ExprAff(b, b+CST2)]]) +G9_EXP_IRB0 = gen_irblock(LBL0, [[], [ExprAssign(b, CST1)]]) +G9_EXP_IRB1 = gen_irblock(LBL1, [[], [ExprAssign(b, b+CST1)]]) +G9_EXP_IRB2 = gen_irblock(LBL2, [[], [ExprAssign(b, b+CST2)]]) G9_EXP_IRB3 = gen_irblock(LBL3, [[]]) -G9_EXP_IRB4 = gen_irblock(LBL4, [[], [ExprAff(r, b)]]) +G9_EXP_IRB4 = gen_irblock(LBL4, [[], [ExprAssign(r, b)]]) for irb in [G9_EXP_IRB0, G9_EXP_IRB1, G9_EXP_IRB2, G9_EXP_IRB3, G9_EXP_IRB4]: G9_EXP_IRA.add_irblock(irb) @@ -349,10 +349,10 @@ for irb in [G9_EXP_IRB0, G9_EXP_IRB1, G9_EXP_IRB2, G9_EXP_IRB3, G9_EXP_IRB4]: G10_IRA = IRA.new_ircfg() -G10_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)]]) -G10_IRB1 = gen_irblock(LBL1, [[ExprAff(b, a)]]) -G10_IRB2 = gen_irblock(LBL2, [[ExprAff(a, b)]]) -G10_IRB3 = gen_irblock(LBL3, [[ExprAff(r, CST1)]]) +G10_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)]]) +G10_IRB1 = gen_irblock(LBL1, [[ExprAssign(b, a)]]) +G10_IRB2 = gen_irblock(LBL2, [[ExprAssign(a, b)]]) +G10_IRB3 = gen_irblock(LBL3, [[ExprAssign(r, CST1)]]) for irb in [G10_IRB0, G10_IRB1, G10_IRB2, G10_IRB3]: G10_IRA.add_irblock(irb) @@ -369,7 +369,7 @@ G10_EXP_IRA = IRA.new_ircfg() G10_EXP_IRB0 = gen_irblock(LBL0, [[]]) G10_EXP_IRB1 = gen_irblock(LBL1, [[]]) G10_EXP_IRB2 = gen_irblock(LBL2, [[]]) -G10_EXP_IRB3 = gen_irblock(LBL3, [[ExprAff(r, CST1)]]) +G10_EXP_IRB3 = gen_irblock(LBL3, [[ExprAssign(r, CST1)]]) for irb in [G10_EXP_IRB0, G10_EXP_IRB1, G10_EXP_IRB2, G10_EXP_IRB3]: G10_EXP_IRA.add_irblock(irb) @@ -378,11 +378,11 @@ for irb in [G10_EXP_IRB0, G10_EXP_IRB1, G10_EXP_IRB2, G10_EXP_IRB3]: G11_IRA = IRA.new_ircfg() -G11_IRB0 = gen_irblock(LBL0, [[ExprAff(a, b)]]) -G11_IRB1 = gen_irblock(LBL1, [[ExprAff(b, a)]]) -G11_IRB2 = gen_irblock(LBL2, [[ExprAff(r, a)]]) -G11_IRB3 = gen_irblock(LBL3, [[ExprAff(a, a+CST1)]]) -G11_IRB4 = gen_irblock(LBL4, [[ExprAff(b, b+CST1)]]) +G11_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, b)]]) +G11_IRB1 = gen_irblock(LBL1, [[ExprAssign(b, a)]]) +G11_IRB2 = gen_irblock(LBL2, [[ExprAssign(r, a)]]) +G11_IRB3 = gen_irblock(LBL3, [[ExprAssign(a, a+CST1)]]) +G11_IRB4 = gen_irblock(LBL4, [[ExprAssign(b, b+CST1)]]) for irb in [G11_IRB0, G11_IRB1, G11_IRB2]: @@ -398,11 +398,11 @@ G11_IRA.add_uniq_edge(G11_IRB1.loc_key, G11_IRB2.loc_key) # Expected output for graph 11 G11_EXP_IRA = IRA.new_ircfg() -G11_EXP_IRB0 = gen_irblock(LBL0, [[ExprAff(a, b)]]) -G11_EXP_IRB1 = gen_irblock(LBL1, [[ExprAff(b, a)]]) -G11_EXP_IRB2 = gen_irblock(LBL2, [[ExprAff(r, a)]]) -#G11_EXP_IRB3 = gen_irblock(LBL3, [[ExprAff(a, a+CST1)]]) -#G11_EXP_IRB4 = gen_irblock(LBL4, [[ExprAff(b, b+CST1)]]) +G11_EXP_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, b)]]) +G11_EXP_IRB1 = gen_irblock(LBL1, [[ExprAssign(b, a)]]) +G11_EXP_IRB2 = gen_irblock(LBL2, [[ExprAssign(r, a)]]) +#G11_EXP_IRB3 = gen_irblock(LBL3, [[ExprAssign(a, a+CST1)]]) +#G11_EXP_IRB4 = gen_irblock(LBL4, [[ExprAssign(b, b+CST1)]]) for irb in [G11_EXP_IRB0, G11_EXP_IRB1, G11_EXP_IRB2]: @@ -413,12 +413,12 @@ for irb in [G11_EXP_IRB0, G11_EXP_IRB1, G12_IRA = IRA.new_ircfg() -G12_IRB0 = gen_irblock(LBL0, [[ExprAff(r, CST1)], [ExprAff(a, CST2)]]) -G12_IRB1 = gen_irblock(LBL1, [[ExprAff(r, CST2)]]) -G12_IRB2 = gen_irblock(LBL2, [[ExprAff(r, a)], [ExprAff(b, CST3)]]) -G12_IRB3 = gen_irblock(LBL3, [[ExprAff(r, CST3)]]) -G12_IRB4 = gen_irblock(LBL4, [[ExprAff(r, CST2)]]) -G12_IRB5 = gen_irblock(LBL5, [[ExprAff(r, b)]]) +G12_IRB0 = gen_irblock(LBL0, [[ExprAssign(r, CST1)], [ExprAssign(a, CST2)]]) +G12_IRB1 = gen_irblock(LBL1, [[ExprAssign(r, CST2)]]) +G12_IRB2 = gen_irblock(LBL2, [[ExprAssign(r, a)], [ExprAssign(b, CST3)]]) +G12_IRB3 = gen_irblock(LBL3, [[ExprAssign(r, CST3)]]) +G12_IRB4 = gen_irblock(LBL4, [[ExprAssign(r, CST2)]]) +G12_IRB5 = gen_irblock(LBL5, [[ExprAssign(r, b)]]) for irb in [G12_IRB0, G12_IRB1, G12_IRB2, G12_IRB3, G12_IRB4, G12_IRB5]: G12_IRA.add_irblock(irb) @@ -433,11 +433,11 @@ G12_IRA.add_uniq_edge(G12_IRB4.loc_key, G12_IRB5.loc_key) G12_EXP_IRA = IRA.new_ircfg() G12_EXP_IRB0 = gen_irblock(LBL0, [[], []]) -G12_EXP_IRB1 = gen_irblock(LBL1, [[ExprAff(r, CST2)]]) -G12_EXP_IRB2 = gen_irblock(LBL2, [[], [ExprAff(b, CST3)]]) -G12_EXP_IRB3 = gen_irblock(LBL3, [[ExprAff(r, CST3)]]) +G12_EXP_IRB1 = gen_irblock(LBL1, [[ExprAssign(r, CST2)]]) +G12_EXP_IRB2 = gen_irblock(LBL2, [[], [ExprAssign(b, CST3)]]) +G12_EXP_IRB3 = gen_irblock(LBL3, [[ExprAssign(r, CST3)]]) G12_EXP_IRB4 = gen_irblock(LBL4, [[]]) -G12_EXP_IRB5 = gen_irblock(LBL5, [[ExprAff(r, b)]]) +G12_EXP_IRB5 = gen_irblock(LBL5, [[ExprAssign(r, b)]]) for irb in [G12_EXP_IRB0, G12_EXP_IRB1, @@ -449,12 +449,12 @@ for irb in [G12_EXP_IRB0, G12_EXP_IRB1, G13_IRA = IRA.new_ircfg() -G13_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)], [ExprAff(b, CST2)]]) -G13_IRB1 = gen_irblock(LBL1, [[ExprAff(r, b)]]) -G13_IRB2 = gen_irblock(LBL2, [[ExprAff(d, CST2)], [ExprAff(a, b+CST1), - ExprAff(c, a+b)]]) +G13_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)], [ExprAssign(b, CST2)]]) +G13_IRB1 = gen_irblock(LBL1, [[ExprAssign(r, b)]]) +G13_IRB2 = gen_irblock(LBL2, [[ExprAssign(d, CST2)], [ExprAssign(a, b+CST1), + ExprAssign(c, a+b)]]) G13_IRB3 = gen_irblock(LBL3, [[]]) # lost son -G13_IRB4 = gen_irblock(LBL4, [[ExprAff(b, CST2)]]) +G13_IRB4 = gen_irblock(LBL4, [[ExprAssign(b, CST2)]]) for irb in [G13_IRB0, G13_IRB1, G13_IRB2, G13_IRB4]: G13_IRA.add_irblock(irb) @@ -467,12 +467,12 @@ G13_IRA.add_uniq_edge(G13_IRB4.loc_key, G13_IRB2.loc_key) # Expected output for graph 13 G13_EXP_IRA = IRA.new_ircfg() -G13_EXP_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)], [ExprAff(b, CST2)]]) -G13_EXP_IRB1 = gen_irblock(LBL1, [[ExprAff(r, b)]]) -G13_EXP_IRB2 = gen_irblock(LBL2, [[ExprAff(d, CST2)], [ExprAff(a, b+CST1), - ExprAff(c, a+b)]]) +G13_EXP_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)], [ExprAssign(b, CST2)]]) +G13_EXP_IRB1 = gen_irblock(LBL1, [[ExprAssign(r, b)]]) +G13_EXP_IRB2 = gen_irblock(LBL2, [[ExprAssign(d, CST2)], [ExprAssign(a, b+CST1), + ExprAssign(c, a+b)]]) G13_EXP_IRB3 = gen_irblock(LBL3, [[]]) -G13_EXP_IRB4 = gen_irblock(LBL4, [[ExprAff(b, CST2)]]) +G13_EXP_IRB4 = gen_irblock(LBL4, [[ExprAssign(b, CST2)]]) for irb in [G13_EXP_IRB0, G13_EXP_IRB1, G13_EXP_IRB2, G13_EXP_IRB4]: G13_EXP_IRA.add_irblock(irb) @@ -484,9 +484,9 @@ for irb in [G13_EXP_IRB0, G13_EXP_IRB1, G13_EXP_IRB2, G13_EXP_IRB4]: G14_IRA = IRA.new_ircfg() -G14_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)], [ExprAff(c, a)], - [ExprAff(a, CST2)]]) -G14_IRB1 = gen_irblock(LBL1, [[ExprAff(r, a+c)]]) +G14_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)], [ExprAssign(c, a)], + [ExprAssign(a, CST2)]]) +G14_IRB1 = gen_irblock(LBL1, [[ExprAssign(r, a+c)]]) for irb in [G14_IRB0, G14_IRB1]: G14_IRA.add_irblock(irb) @@ -496,9 +496,9 @@ G14_IRA.add_uniq_edge(G14_IRB0.loc_key, G14_IRB1.loc_key) # Expected output for graph 1 G14_EXP_IRA = IRA.new_ircfg() -G14_EXP_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1)], [ExprAff(c, a)], - [ExprAff(a, CST2)]]) -G14_EXP_IRB1 = gen_irblock(LBL1, [[ExprAff(r, a+c)]]) +G14_EXP_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1)], [ExprAssign(c, a)], + [ExprAssign(a, CST2)]]) +G14_EXP_IRB1 = gen_irblock(LBL1, [[ExprAssign(r, a+c)]]) for irb in [G14_EXP_IRB0, G14_EXP_IRB1]: G14_EXP_IRA.add_irblock(irb) @@ -508,10 +508,10 @@ for irb in [G14_EXP_IRB0, G14_EXP_IRB1]: G15_IRA = IRA.new_ircfg() -G15_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST2)], [ExprAff(a, CST1), - ExprAff(b, a+CST2), - ExprAff(c, CST1)]]) -G15_IRB1 = gen_irblock(LBL1, [[ExprAff(r, a)]]) +G15_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST2)], [ExprAssign(a, CST1), + ExprAssign(b, a+CST2), + ExprAssign(c, CST1)]]) +G15_IRB1 = gen_irblock(LBL1, [[ExprAssign(r, a)]]) for irb in [G15_IRB0, G15_IRB1]: G15_IRA.add_irblock(irb) @@ -521,8 +521,8 @@ G15_IRA.add_uniq_edge(G15_IRB0.loc_key, G15_IRB1.loc_key) # Expected output for graph 1 G15_EXP_IRA = IRA.new_ircfg() -G15_EXP_IRB0 = gen_irblock(LBL0, [[], [ExprAff(a, CST1)]]) -G15_EXP_IRB1 = gen_irblock(LBL1, [[ExprAff(r, a)]]) +G15_EXP_IRB0 = gen_irblock(LBL0, [[], [ExprAssign(a, CST1)]]) +G15_EXP_IRB1 = gen_irblock(LBL1, [[ExprAssign(r, a)]]) for irb in [G15_EXP_IRB0, G15_EXP_IRB1]: G15_EXP_IRA.add_irblock(irb) @@ -531,10 +531,10 @@ for irb in [G15_EXP_IRB0, G15_EXP_IRB1]: G16_IRA = IRA.new_ircfg() -G16_IRB0 = gen_irblock(LBL0, [[ExprAff(a, CST1), ExprAff(b, CST2), - ExprAff(c, CST3)], [ExprAff(a, c+CST1), - ExprAff(b, c+CST2)]]) -G16_IRB1 = gen_irblock(LBL1, [[ExprAff(r, a+b)], [ExprAff(r, c+r)]]) +G16_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, CST1), ExprAssign(b, CST2), + ExprAssign(c, CST3)], [ExprAssign(a, c+CST1), + ExprAssign(b, c+CST2)]]) +G16_IRB1 = gen_irblock(LBL1, [[ExprAssign(r, a+b)], [ExprAssign(r, c+r)]]) G16_IRB2 = gen_irblock(LBL2, [[]]) for irb in [G16_IRB0, G16_IRB1]: @@ -549,9 +549,9 @@ for irb in [G16_IRB0, G16_IRB1]: # Expected output for graph 1 G16_EXP_IRA = IRA.new_ircfg() -G16_EXP_IRB0 = gen_irblock(LBL0, [[ExprAff(c, CST3)], [ExprAff(a, c + CST1), - ExprAff(b, c + CST2)]]) -G16_EXP_IRB1 = gen_irblock(LBL1, [[ExprAff(r, a+b)], [ExprAff(r, c+r)]]) +G16_EXP_IRB0 = gen_irblock(LBL0, [[ExprAssign(c, CST3)], [ExprAssign(a, c + CST1), + ExprAssign(b, c + CST2)]]) +G16_EXP_IRB1 = gen_irblock(LBL1, [[ExprAssign(r, a+b)], [ExprAssign(r, c+r)]]) for irb in [G16_EXP_IRB0, G16_EXP_IRB1]: G16_EXP_IRA.add_irblock(irb) @@ -560,57 +560,57 @@ for irb in [G16_EXP_IRB0, G16_EXP_IRB1]: G17_IRA = IRA.new_ircfg() -G17_IRB0 = gen_irblock(LBL0, [[ExprAff(a, a*b), - ExprAff(b, c), - ExprAff(c, CST1)], +G17_IRB0 = gen_irblock(LBL0, [[ExprAssign(a, a*b), + ExprAssign(b, c), + ExprAssign(c, CST1)], - [ExprAff(d, d+ CST2)], + [ExprAssign(d, d+ CST2)], - [ExprAff(a, CST1), - ExprAff(b, a), - ExprAff(c, b)], + [ExprAssign(a, CST1), + ExprAssign(b, a), + ExprAssign(c, b)], - [ExprAff(ExprMem(d+CST1, 32), a), - ExprAff(a, b), - ExprAff(b, c), - ExprAff(c, CST1)], + [ExprAssign(ExprMem(d+CST1, 32), a), + ExprAssign(a, b), + ExprAssign(b, c), + ExprAssign(c, CST1)], - [ExprAff(a, CST1), - ExprAff(b, a), - ExprAff(c, b)], + [ExprAssign(a, CST1), + ExprAssign(b, a), + ExprAssign(c, b)], - [ExprAff(ExprMem(d+CST2, 32), a), - ExprAff(a, b), - ExprAff(b, c), - ExprAff(c, CST1)], + [ExprAssign(ExprMem(d+CST2, 32), a), + ExprAssign(a, b), + ExprAssign(b, c), + ExprAssign(c, CST1)], - [ExprAff(a, CST2), - ExprAff(b, a), - ExprAff(c, b)], + [ExprAssign(a, CST2), + ExprAssign(b, a), + ExprAssign(c, b)], - [ExprAff(a, a+CST1)], + [ExprAssign(a, a+CST1)], - [ExprAff(d, a), - ExprAff(a, d)], + [ExprAssign(d, a), + ExprAssign(a, d)], - [ExprAff(d, d+CST1)], + [ExprAssign(d, d+CST1)], - [ExprAff(a, CST2), - ExprAff(b, a), - ExprAff(c, b)], + [ExprAssign(a, CST2), + ExprAssign(b, a), + ExprAssign(c, b)], - [ExprAff(a, a+CST2)], + [ExprAssign(a, a+CST2)], - [ExprAff(a, CST2), - ExprAff(b, a), - ExprAff(c, b)], + [ExprAssign(a, CST2), + ExprAssign(b, a), + ExprAssign(c, b)], - [ExprAff(a, CST1), - ExprAff(b, a), - ExprAff(c, b)], + [ExprAssign(a, CST1), + ExprAssign(b, a), + ExprAssign(c, b)], - [ExprAff(ExprMem(d, 32), a+b+c)], + [ExprAssign(ExprMem(d, 32), a+b+c)], ]) @@ -624,34 +624,34 @@ G17_EXP_IRA = IRA.new_ircfg() G17_EXP_IRB0 = gen_irblock(LBL0, [[], - [ExprAff(d, d+ CST2)], + [ExprAssign(d, d+ CST2)], - [ExprAff(a, CST1)], + [ExprAssign(a, CST1)], - [ExprAff(ExprMem(d+CST1, 32), a)], + [ExprAssign(ExprMem(d+CST1, 32), a)], - [ExprAff(a, CST1)], + [ExprAssign(a, CST1)], - [ExprAff(ExprMem(d+CST2, 32), a)], + [ExprAssign(ExprMem(d+CST2, 32), a)], - [ExprAff(a, CST2)], + [ExprAssign(a, CST2)], - [ExprAff(a, a+CST1)], + [ExprAssign(a, a+CST1)], - [ExprAff(d, a)], + [ExprAssign(d, a)], - [ExprAff(d, d+CST1)], + [ExprAssign(d, d+CST1)], - [ExprAff(a, CST2)], + [ExprAssign(a, CST2)], - [ExprAff(a, a+CST2)], + [ExprAssign(a, a+CST2)], - [ExprAff(a, CST2), - ExprAff(b, a)], + [ExprAssign(a, CST2), + ExprAssign(b, a)], - [ExprAff(a, CST1), - ExprAff(b, a), - ExprAff(c, b)], + [ExprAssign(a, CST1), + ExprAssign(b, a), + ExprAssign(c, b)], G17_IRB0[14] # Trick because a+b+c != ((a+b)+c) diff --git a/test/analysis/depgraph.py b/test/analysis/depgraph.py index 2ba5f044..0d909ba2 100644 --- a/test/analysis/depgraph.py +++ b/test/analysis/depgraph.py @@ -1,5 +1,5 @@ """Regression test module for DependencyGraph""" -from miasm2.expression.expression import ExprId, ExprInt, ExprAff, ExprCond, \ +from miasm2.expression.expression import ExprId, ExprInt, ExprAssign, ExprCond, \ ExprLoc, LocKey from miasm2.core.locationdb import LocationDB from miasm2.ir.analysis import ira @@ -236,9 +236,9 @@ END = ExprId("END", IRDst.size) G1_IRA = IRA.new_ircfg() -G1_IRB0 = gen_irblock(LBL0, [[ExprAff(C, CST1), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) -G1_IRB1 = gen_irblock(LBL1, [[ExprAff(B, C), ExprAff(IRDst, ExprLoc(LBL2, 32))]]) -G1_IRB2 = gen_irblock(LBL2, [[ExprAff(A, B), ExprAff(IRDst, END)]]) +G1_IRB0 = gen_irblock(LBL0, [[ExprAssign(C, CST1), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) +G1_IRB1 = gen_irblock(LBL1, [[ExprAssign(B, C), ExprAssign(IRDst, ExprLoc(LBL2, 32))]]) +G1_IRB2 = gen_irblock(LBL2, [[ExprAssign(A, B), ExprAssign(IRDst, END)]]) for irb in [G1_IRB0, G1_IRB1, G1_IRB2]: G1_IRA.add_irblock(irb) @@ -247,9 +247,9 @@ for irb in [G1_IRB0, G1_IRB1, G1_IRB2]: G2_IRA = IRA.new_ircfg() -G2_IRB0 = gen_irblock(LBL0, [[ExprAff(C, CST1), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) -G2_IRB1 = gen_irblock(LBL1, [[ExprAff(B, CST2), ExprAff(IRDst, ExprLoc(LBL2, 32))]]) -G2_IRB2 = gen_irblock(LBL2, [[ExprAff(A, B + C), ExprAff(IRDst, END)]]) +G2_IRB0 = gen_irblock(LBL0, [[ExprAssign(C, CST1), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) +G2_IRB1 = gen_irblock(LBL1, [[ExprAssign(B, CST2), ExprAssign(IRDst, ExprLoc(LBL2, 32))]]) +G2_IRB2 = gen_irblock(LBL2, [[ExprAssign(A, B + C), ExprAssign(IRDst, END)]]) for irb in [G2_IRB0, G2_IRB1, G2_IRB2]: G2_IRA.add_irblock(irb) @@ -262,7 +262,7 @@ G3_IRA = IRA.new_ircfg() G3_IRB0 = gen_irblock( LBL0, [ - [ExprAff(C, CST1), ExprAff( + [ExprAssign(C, CST1), ExprAssign( IRDst, ExprCond( COND, ExprLoc(LBL1, 32), @@ -273,9 +273,9 @@ G3_IRB0 = gen_irblock( ] ) -G3_IRB1 = gen_irblock(LBL1, [[ExprAff(B, CST2), ExprAff(IRDst, ExprLoc(LBL3, 32))]]) -G3_IRB2 = gen_irblock(LBL2, [[ExprAff(B, CST3), ExprAff(IRDst, ExprLoc(LBL3, 32))]]) -G3_IRB3 = gen_irblock(LBL3, [[ExprAff(A, B + C), ExprAff(IRDst, END)]]) +G3_IRB1 = gen_irblock(LBL1, [[ExprAssign(B, CST2), ExprAssign(IRDst, ExprLoc(LBL3, 32))]]) +G3_IRB2 = gen_irblock(LBL2, [[ExprAssign(B, CST3), ExprAssign(IRDst, ExprLoc(LBL3, 32))]]) +G3_IRB3 = gen_irblock(LBL3, [[ExprAssign(A, B + C), ExprAssign(IRDst, END)]]) for irb in [G3_IRB0, G3_IRB1, G3_IRB2, G3_IRB3]: G3_IRA.add_irblock(irb) @@ -284,12 +284,12 @@ for irb in [G3_IRB0, G3_IRB1, G3_IRB2, G3_IRB3]: G4_IRA = IRA.new_ircfg() -G4_IRB0 = gen_irblock(LBL0, [[ExprAff(C, CST1), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) +G4_IRB0 = gen_irblock(LBL0, [[ExprAssign(C, CST1), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) G4_IRB1 = gen_irblock( LBL1, [ - [ExprAff(C, C + CST2)], - [ExprAff(IRDst, + [ExprAssign(C, C + CST2)], + [ExprAssign(IRDst, ExprCond( C, ExprLoc(LBL2, 32), @@ -298,7 +298,7 @@ G4_IRB1 = gen_irblock( ]] ) -G4_IRB2 = gen_irblock(LBL2, [[ExprAff(A, B), ExprAff(IRDst, END)]]) +G4_IRB2 = gen_irblock(LBL2, [[ExprAssign(A, B), ExprAssign(IRDst, END)]]) for irb in [G4_IRB0, G4_IRB1, G4_IRB2]: G4_IRA.add_irblock(irb) @@ -308,12 +308,12 @@ for irb in [G4_IRB0, G4_IRB1, G4_IRB2]: G5_IRA = IRA.new_ircfg() -G5_IRB0 = gen_irblock(LBL0, [[ExprAff(B, CST1), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) +G5_IRB0 = gen_irblock(LBL0, [[ExprAssign(B, CST1), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) G5_IRB1 = gen_irblock( LBL1, [ - [ExprAff(B, B + CST2)], - [ExprAff( + [ExprAssign(B, B + CST2)], + [ExprAssign( IRDst, ExprCond( B, @@ -325,7 +325,7 @@ G5_IRB1 = gen_irblock( ] ) -G5_IRB2 = gen_irblock(LBL2, [[ExprAff(A, B), ExprAff(IRDst, END)]]) +G5_IRB2 = gen_irblock(LBL2, [[ExprAssign(A, B), ExprAssign(IRDst, END)]]) for irb in [G5_IRB0, G5_IRB1, G5_IRB2]: G5_IRA.add_irblock(irb) @@ -334,8 +334,8 @@ for irb in [G5_IRB0, G5_IRB1, G5_IRB2]: G6_IRA = IRA.new_ircfg() -G6_IRB0 = gen_irblock(LBL0, [[ExprAff(B, CST1), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) -G6_IRB1 = gen_irblock(LBL1, [[ExprAff(A, B), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) +G6_IRB0 = gen_irblock(LBL0, [[ExprAssign(B, CST1), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) +G6_IRB1 = gen_irblock(LBL1, [[ExprAssign(A, B), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) for irb in [G6_IRB0, G6_IRB1]: G6_IRA.add_irblock(irb) @@ -344,13 +344,13 @@ for irb in [G6_IRB0, G6_IRB1]: G7_IRA = IRA.new_ircfg() -G7_IRB0 = gen_irblock(LBL0, [[ExprAff(C, CST1), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) +G7_IRB0 = gen_irblock(LBL0, [[ExprAssign(C, CST1), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) G7_IRB1 = gen_irblock( LBL1, [ - [ExprAff(B, C)], - [ExprAff(A, B)], - [ExprAff( + [ExprAssign(B, C)], + [ExprAssign(A, B)], + [ExprAssign( IRDst, ExprCond( COND, @@ -362,7 +362,7 @@ G7_IRB1 = gen_irblock( ] ) -G7_IRB2 = gen_irblock(LBL2, [[ExprAff(D, A), ExprAff(IRDst, END)]]) +G7_IRB2 = gen_irblock(LBL2, [[ExprAssign(D, A), ExprAssign(IRDst, END)]]) for irb in [G7_IRB0, G7_IRB1, G7_IRB2]: G7_IRA.add_irblock(irb) @@ -371,13 +371,13 @@ for irb in [G7_IRB0, G7_IRB1, G7_IRB2]: G8_IRA = IRA.new_ircfg() -G8_IRB0 = gen_irblock(LBL0, [[ExprAff(C, CST1), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) +G8_IRB0 = gen_irblock(LBL0, [[ExprAssign(C, CST1), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) G8_IRB1 = gen_irblock( LBL1, [ - [ExprAff(B, C)], - [ExprAff(C, D), - ExprAff( + [ExprAssign(B, C)], + [ExprAssign(C, D), + ExprAssign( IRDst, ExprCond( COND, @@ -388,7 +388,7 @@ G8_IRB1 = gen_irblock( ] ] ) -G8_IRB2 = gen_irblock(LBL2, [[ExprAff(A, B), ExprAff(IRDst, END)]]) +G8_IRB2 = gen_irblock(LBL2, [[ExprAssign(A, B), ExprAssign(IRDst, END)]]) for irb in [G8_IRB0, G8_IRB1, G8_IRB2]: G8_IRA.add_irblock(irb) @@ -402,8 +402,8 @@ G10_IRA = IRA.new_ircfg() G10_IRB1 = gen_irblock( LBL1, [ - [ExprAff(B, B + CST2), - ExprAff( + [ExprAssign(B, B + CST2), + ExprAssign( IRDst, ExprCond( COND, @@ -415,7 +415,7 @@ G10_IRB1 = gen_irblock( ] ) -G10_IRB2 = gen_irblock(LBL2, [[ExprAff(A, B), ExprAff(IRDst, END)]]) +G10_IRB2 = gen_irblock(LBL2, [[ExprAssign(A, B), ExprAssign(IRDst, END)]]) for irb in [G10_IRB1, G10_IRB2]: G10_IRA.add_irblock(irb) @@ -427,9 +427,9 @@ G11_IRA = IRA.new_ircfg() G11_IRB0 = gen_irblock( LBL0, [ - [ExprAff(A, CST1), - ExprAff(B, CST2), - ExprAff(IRDst, ExprLoc(LBL1, 32)) + [ExprAssign(A, CST1), + ExprAssign(B, CST2), + ExprAssign(IRDst, ExprLoc(LBL1, 32)) ] ] ) @@ -437,14 +437,14 @@ G11_IRB0 = gen_irblock( G11_IRB1 = gen_irblock( LBL1, [ - [ExprAff(A, B), - ExprAff(B, A), - ExprAff(IRDst, ExprLoc(LBL2, 32)) + [ExprAssign(A, B), + ExprAssign(B, A), + ExprAssign(IRDst, ExprLoc(LBL2, 32)) ] ] ) -G11_IRB2 = gen_irblock(LBL2, [[ExprAff(A, A - B), ExprAff(IRDst, END)]]) +G11_IRB2 = gen_irblock(LBL2, [[ExprAssign(A, A - B), ExprAssign(IRDst, END)]]) for irb in [G11_IRB0, G11_IRB1, G11_IRB2]: G11_IRA.add_irblock(irb) @@ -453,13 +453,13 @@ for irb in [G11_IRB0, G11_IRB1, G11_IRB2]: G12_IRA = IRA.new_ircfg() -G12_IRB0 = gen_irblock(LBL0, [[ExprAff(B, CST1), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) +G12_IRB0 = gen_irblock(LBL0, [[ExprAssign(B, CST1), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) G12_IRB1 = gen_irblock( LBL1, [ - [ExprAff(A, B)], - [ExprAff(B, B + CST2), - ExprAff( + [ExprAssign(A, B)], + [ExprAssign(B, B + CST2), + ExprAssign( IRDst, ExprCond( COND, @@ -471,7 +471,7 @@ G12_IRB1 = gen_irblock( ] ) -G12_IRB2 = gen_irblock(LBL2, [[ExprAff(B, A), ExprAff(IRDst, END)]]) +G12_IRB2 = gen_irblock(LBL2, [[ExprAssign(B, A), ExprAssign(IRDst, END)]]) for irb in [G12_IRB0, G12_IRB1, G12_IRB2]: G12_IRA.add_irblock(irb) @@ -481,13 +481,13 @@ for irb in [G12_IRB0, G12_IRB1, G12_IRB2]: G13_IRA = IRA.new_ircfg() -G13_IRB0 = gen_irblock(LBL0, [[ExprAff(A, CST1)], - #[ExprAff(B, A)], - [ExprAff(IRDst, +G13_IRB0 = gen_irblock(LBL0, [[ExprAssign(A, CST1)], + #[ExprAssign(B, A)], + [ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) -G13_IRB1 = gen_irblock(LBL1, [[ExprAff(C, A)], - #[ExprAff(A, A + CST1)], - [ExprAff(IRDst, +G13_IRB1 = gen_irblock(LBL1, [[ExprAssign(C, A)], + #[ExprAssign(A, A + CST1)], + [ExprAssign(IRDst, ExprCond( R, ExprLoc(LBL2, 32), @@ -495,11 +495,11 @@ G13_IRB1 = gen_irblock(LBL1, [[ExprAff(C, A)], ) )]]) -G13_IRB2 = gen_irblock(LBL2, [[ExprAff(B, A + CST3)], [ExprAff(A, B + CST3)], - [ExprAff(IRDst, +G13_IRB2 = gen_irblock(LBL2, [[ExprAssign(B, A + CST3)], [ExprAssign(A, B + CST3)], + [ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) -G13_IRB3 = gen_irblock(LBL3, [[ExprAff(R, C), ExprAff(IRDst, END)]]) +G13_IRB3 = gen_irblock(LBL3, [[ExprAssign(R, C), ExprAssign(IRDst, END)]]) for irb in [G13_IRB0, G13_IRB1, G13_IRB2, G13_IRB3]: G13_IRA.add_irblock(irb) @@ -508,12 +508,12 @@ for irb in [G13_IRB0, G13_IRB1, G13_IRB2, G13_IRB3]: G14_IRA = IRA.new_ircfg() -G14_IRB0 = gen_irblock(LBL0, [[ExprAff(A, CST1)], - [ExprAff(IRDst, +G14_IRB0 = gen_irblock(LBL0, [[ExprAssign(A, CST1)], + [ExprAssign(IRDst, ExprLoc(LBL1, 32))] ]) -G14_IRB1 = gen_irblock(LBL1, [[ExprAff(B, A)], - [ExprAff(IRDst, +G14_IRB1 = gen_irblock(LBL1, [[ExprAssign(B, A)], + [ExprAssign(IRDst, ExprCond( C, ExprLoc(LBL2, 32), @@ -523,13 +523,13 @@ G14_IRB1 = gen_irblock(LBL1, [[ExprAff(B, A)], ] ]) -G14_IRB2 = gen_irblock(LBL2, [[ExprAff(D, A)], - [ExprAff(A, D + CST1)], - [ExprAff(IRDst, +G14_IRB2 = gen_irblock(LBL2, [[ExprAssign(D, A)], + [ExprAssign(A, D + CST1)], + [ExprAssign(IRDst, ExprLoc(LBL1, 32))] ]) -G14_IRB3 = gen_irblock(LBL3, [[ExprAff(R, D + B), ExprAff(IRDst, END)]]) +G14_IRB3 = gen_irblock(LBL3, [[ExprAssign(R, D + B), ExprAssign(IRDst, END)]]) for irb in [G14_IRB0, G14_IRB1, G14_IRB2, G14_IRB3]: G14_IRA.add_irblock(irb) @@ -538,18 +538,18 @@ for irb in [G14_IRB0, G14_IRB1, G14_IRB2, G14_IRB3]: G15_IRA = IRA.new_ircfg() -G15_IRB0 = gen_irblock(LBL0, [[ExprAff(A, CST1), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) -G15_IRB1 = gen_irblock(LBL1, [[ExprAff(D, A + B)], - [ExprAff(C, D)], - [ExprAff(B, C), - ExprAff(IRDst, +G15_IRB0 = gen_irblock(LBL0, [[ExprAssign(A, CST1), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) +G15_IRB1 = gen_irblock(LBL1, [[ExprAssign(D, A + B)], + [ExprAssign(C, D)], + [ExprAssign(B, C), + ExprAssign(IRDst, ExprCond( C, ExprLoc(LBL1, 32), ExprLoc(LBL2, 32) ) )]]) -G15_IRB2 = gen_irblock(LBL2, [[ExprAff(R, B), ExprAff(IRDst, END)]]) +G15_IRB2 = gen_irblock(LBL2, [[ExprAssign(R, B), ExprAssign(IRDst, END)]]) for irb in [G15_IRB0, G15_IRB1, G15_IRB2]: G15_IRA.add_irblock(irb) @@ -560,15 +560,15 @@ G16_IRA = IRA.new_ircfg() G16_IRB0 = gen_irblock( LBL0, [ - [ExprAff(A, CST1), ExprAff(IRDst, ExprLoc(LBL1, 32))] + [ExprAssign(A, CST1), ExprAssign(IRDst, ExprLoc(LBL1, 32))] ] ) G16_IRB1 = gen_irblock( LBL1, [ - [ExprAff(R, D), - ExprAff( + [ExprAssign(R, D), + ExprAssign( IRDst, ExprCond( C, @@ -590,10 +590,10 @@ G16_IRB1 = gen_irblock( -G16_IRB2 = gen_irblock(LBL2, [[ExprAff(D, A), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) -G16_IRB3 = gen_irblock(LBL3, [[ExprAff(R, D), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) -G16_IRB4 = gen_irblock(LBL4, [[ExprAff(R, A), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) -G16_IRB5 = gen_irblock(LBL5, [[ExprAff(R, A), ExprAff(IRDst, ExprLoc(LBL1, 32))]]) +G16_IRB2 = gen_irblock(LBL2, [[ExprAssign(D, A), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) +G16_IRB3 = gen_irblock(LBL3, [[ExprAssign(R, D), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) +G16_IRB4 = gen_irblock(LBL4, [[ExprAssign(R, A), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) +G16_IRB5 = gen_irblock(LBL5, [[ExprAssign(R, A), ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) for irb in [G16_IRB0, G16_IRB1, G16_IRB2, G16_IRB3, G16_IRB4, G16_IRB5]: G16_IRA.add_irblock(irb) @@ -602,14 +602,14 @@ for irb in [G16_IRB0, G16_IRB1, G16_IRB2, G16_IRB3, G16_IRB4, G16_IRB5]: G17_IRA = IRA.new_ircfg() -G17_IRB0 = gen_irblock(LBL0, [[ExprAff(A, CST1), - ExprAff(D, CST2), - ExprAff(IRDst, ExprLoc(LBL1, 32))]]) -G17_IRB1 = gen_irblock(LBL1, [[ExprAff(A, D), - ExprAff(B, D), - ExprAff(IRDst, ExprLoc(LBL2, 32))]]) -G17_IRB2 = gen_irblock(LBL2, [[ExprAff(A, A - B), - ExprAff(IRDst, END)]]) +G17_IRB0 = gen_irblock(LBL0, [[ExprAssign(A, CST1), + ExprAssign(D, CST2), + ExprAssign(IRDst, ExprLoc(LBL1, 32))]]) +G17_IRB1 = gen_irblock(LBL1, [[ExprAssign(A, D), + ExprAssign(B, D), + ExprAssign(IRDst, ExprLoc(LBL2, 32))]]) +G17_IRB2 = gen_irblock(LBL2, [[ExprAssign(A, A - B), + ExprAssign(IRDst, END)]]) G17_IRA.add_uniq_edge(G17_IRB0.loc_key, G17_IRB1.loc_key) G17_IRA.add_uniq_edge(G17_IRB1.loc_key, G17_IRB2.loc_key) diff --git a/test/arch/mep/ir/ut_helpers_ir.py b/test/arch/mep/ir/ut_helpers_ir.py index fcf31764..9c9efdfa 100644 --- a/test/arch/mep/ir/ut_helpers_ir.py +++ b/test/arch/mep/ir/ut_helpers_ir.py @@ -10,7 +10,7 @@ from miasm2.core.locationdb import LocationDB from miasm2.core.utils import Disasm_Exception from miasm2.ir.ir import AssignBlock from miasm2.arch.mep.ira import ir_a_mepb -from miasm2.expression.expression import ExprId, ExprInt, ExprOp, ExprMem, ExprAff, ExprLoc +from miasm2.expression.expression import ExprId, ExprInt, ExprOp, ExprMem, ExprAssign, ExprLoc def exec_instruction(mn_str, init_values, results, index=0, offset=0): @@ -36,7 +36,7 @@ def exec_instruction(mn_str, init_values, results, index=0, offset=0): iir, eiir = im.get_ir(instr) # Filter out IRDst - iir = [ir for ir in iir if not (isinstance(ir, ExprAff) and + iir = [ir for ir in iir if not (isinstance(ir, ExprAssign) and isinstance(ir.dst, ExprId) and ir.dst.name == "IRDst")] diff --git a/test/expression/expr_pickle.py b/test/expression/expr_pickle.py index 84ad0b9f..870f761a 100644 --- a/test/expression/expr_pickle.py +++ b/test/expression/expr_pickle.py @@ -1,5 +1,5 @@ import pickle -from miasm2.expression.expression import ExprInt, ExprAff, ExprId, \ +from miasm2.expression.expression import ExprInt, ExprAssign, ExprId, \ Expr, ExprCompose, ExprMem @@ -9,7 +9,7 @@ c = a + b d = ExprCompose(a, b) e = ExprMem(a, 32) f = a[:8] -aff = ExprAff(a, b) +aff = ExprAssign(a, b) print 'Pickling' diff --git a/test/expression/expression.py b/test/expression/expression.py index b998d4a5..1b39ab9f 100644 --- a/test/expression/expression.py +++ b/test/expression/expression.py @@ -61,12 +61,12 @@ for expr in [ A + cst1, ExprCompose(A, cst1), A.msb(), - ExprAff(A, cst1), + ExprAssign(A, cst1), ]: print repr(expr) assert expr == eval(repr(expr)) -aff = ExprAff(A[0:32], cst1) +aff = ExprAssign(A[0:32], cst1) assert aff.dst == A and aff.src == cst1 diff --git a/test/expression/parser.py b/test/expression/parser.py index 1d5889fb..ccae49b0 100644 --- a/test/expression/parser.py +++ b/test/expression/parser.py @@ -1,6 +1,6 @@ from miasm2.expression.parser import str_to_expr from miasm2.expression.expression import ExprInt, ExprId, ExprSlice, ExprMem, \ - ExprCond, ExprCompose, ExprOp, ExprAff, ExprLoc, LocKey + ExprCond, ExprCompose, ExprOp, ExprAssign, ExprLoc, LocKey for expr_test in [ExprInt(0x12, 32), ExprId('test', 32), @@ -10,7 +10,7 @@ for expr_test in [ExprInt(0x12, 32), ExprCond(ExprInt(0x10, 32), ExprInt(0x11, 32), ExprInt(0x12, 32)), ExprCompose(ExprInt(0x10, 16), ExprInt(0x11, 8), ExprInt(0x12, 8)), ExprInt(0x11, 8) + ExprInt(0x12, 8), - ExprAff(ExprId('EAX', 32), ExprInt(0x12, 32)), + ExprAssign(ExprId('EAX', 32), ExprInt(0x12, 32)), ]: print 'Test: %s' % expr_test diff --git a/test/expression/simplifications.py b/test/expression/simplifications.py index 046c948e..68dc0437 100644 --- a/test/expression/simplifications.py +++ b/test/expression/simplifications.py @@ -575,9 +575,9 @@ for test, res in match_tests: get_tests = [ - (ExprAff(ExprMem(a, 32), ExprMem(b, 32)).get_r(True), set([a, b, ExprMem(b, 32)])), - (ExprAff(ExprMem(a, 32), ExprMem(b, 32)).get_w(), set([ExprMem(a, 32)])), - (ExprAff(ExprMem(ExprMem(a, 32), 32), ExprMem(b, 32)) + (ExprAssign(ExprMem(a, 32), ExprMem(b, 32)).get_r(True), set([a, b, ExprMem(b, 32)])), + (ExprAssign(ExprMem(a, 32), ExprMem(b, 32)).get_w(), set([ExprMem(a, 32)])), + (ExprAssign(ExprMem(ExprMem(a, 32), 32), ExprMem(b, 32)) .get_r(True), set([a, b, ExprMem(b, 32), ExprMem(a, 32)])), ] diff --git a/test/ir/ir.py b/test/ir/ir.py index 3774e4e9..072c90f6 100644 --- a/test/ir/ir.py +++ b/test/ir/ir.py @@ -8,11 +8,11 @@ int0 = ExprInt(0, id_a.size) # Test AssignBlock ## Constructors -assignblk1 = AssignBlock([ExprAff(id_a, id_b)]) +assignblk1 = AssignBlock([ExprAssign(id_a, id_b)]) assignblk2 = AssignBlock({id_a: id_b}) ## Equality -assignblk1_bis = AssignBlock([ExprAff(id_a, id_b)]) +assignblk1_bis = AssignBlock([ExprAssign(id_a, id_b)]) assert assignblk1 == assignblk1_bis assert assignblk1 == assignblk2 diff --git a/test/ir/reduce_graph.py b/test/ir/reduce_graph.py index 68a3aea8..29a3501f 100644 --- a/test/ir/reduce_graph.py +++ b/test/ir/reduce_graph.py @@ -1,7 +1,7 @@ """Regression test module for DependencyGraph""" from pdb import pm -from miasm2.expression.expression import ExprId, ExprInt, ExprAff, ExprCond, \ +from miasm2.expression.expression import ExprId, ExprInt, ExprAssign, ExprCond, \ ExprLoc, LocKey from miasm2.core.locationdb import LocationDB @@ -109,8 +109,8 @@ G1_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(B, C), - ExprAff(IRDst, ExprLoc(LBL1, 32)), + ExprAssign(B, C), + ExprAssign(IRDst, ExprLoc(LBL1, 32)), ] ] ) @@ -119,7 +119,7 @@ G1_IRB1 = gen_irblock( LBL1, [ [ - ExprAff(IRDst, ExprLoc(LBL2, 32)), + ExprAssign(IRDst, ExprLoc(LBL2, 32)), ] ] ) @@ -128,8 +128,8 @@ G1_IRB2 = gen_irblock( LBL2, [ [ - ExprAff(A, B), - ExprAff(IRDst, C), + ExprAssign(A, B), + ExprAssign(IRDst, C), ] ] ) @@ -144,11 +144,11 @@ G1_RES_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(B, C), + ExprAssign(B, C), ], [ - ExprAff(A, B), - ExprAff(IRDst, C), + ExprAssign(A, B), + ExprAssign(IRDst, C), ] ] @@ -176,7 +176,7 @@ G2_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(IRDst, ExprLoc(LBL1, 32)), + ExprAssign(IRDst, ExprLoc(LBL1, 32)), ] ] ) @@ -185,8 +185,8 @@ G2_IRB1 = gen_irblock( LBL1, [ [ - ExprAff(A, C), - ExprAff(IRDst, C), + ExprAssign(A, C), + ExprAssign(IRDst, C), ] ] ) @@ -202,8 +202,8 @@ G2_RES_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(A, C), - ExprAff(IRDst, C), + ExprAssign(A, C), + ExprAssign(IRDst, C), ] ] ) @@ -222,7 +222,7 @@ G3_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(IRDst, ExprLoc(LBL1, 32)), + ExprAssign(IRDst, ExprLoc(LBL1, 32)), ] ] ) @@ -231,8 +231,8 @@ G3_IRB1 = gen_irblock( LBL1, [ [ - ExprAff(A, C), - ExprAff(IRDst, ExprLoc(LBL2, 32)), + ExprAssign(A, C), + ExprAssign(IRDst, ExprLoc(LBL2, 32)), ] ] ) @@ -241,8 +241,8 @@ G3_IRB2 = gen_irblock( LBL2, [ [ - ExprAff(D, A), - ExprAff(IRDst, C), + ExprAssign(D, A), + ExprAssign(IRDst, C), ] ] ) @@ -259,11 +259,11 @@ G3_RES_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(A, C), + ExprAssign(A, C), ], [ - ExprAff(D, A), - ExprAff(IRDst, C), + ExprAssign(D, A), + ExprAssign(IRDst, C), ] ] ) @@ -284,7 +284,7 @@ G4_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(IRDst, ExprLoc(LBL1, 32)), + ExprAssign(IRDst, ExprLoc(LBL1, 32)), ] ] ) @@ -293,8 +293,8 @@ G4_IRB1 = gen_irblock( LBL1, [ [ - ExprAff(A, C), - ExprAff(IRDst, ExprLoc(LBL2, 32)), + ExprAssign(A, C), + ExprAssign(IRDst, ExprLoc(LBL2, 32)), ] ] ) @@ -303,8 +303,8 @@ G4_IRB2 = gen_irblock( LBL2, [ [ - ExprAff(D, A), - ExprAff(IRDst, ExprLoc(LBL1, 32)), + ExprAssign(D, A), + ExprAssign(IRDst, ExprLoc(LBL1, 32)), ] ] ) @@ -321,11 +321,11 @@ G4_RES_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(A, C), + ExprAssign(A, C), ], [ - ExprAff(D, A), - ExprAff(IRDst, ExprLoc(LBL0, 32)), + ExprAssign(D, A), + ExprAssign(IRDst, ExprLoc(LBL0, 32)), ] ] ) @@ -345,7 +345,7 @@ G5_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(IRDst, ExprLoc(LBL1, 32)), + ExprAssign(IRDst, ExprLoc(LBL1, 32)), ] ] ) @@ -354,8 +354,8 @@ G5_IRB1 = gen_irblock( LBL1, [ [ - ExprAff(A, C), - ExprAff(IRDst, ExprLoc(LBL2, 32)), + ExprAssign(A, C), + ExprAssign(IRDst, ExprLoc(LBL2, 32)), ] ] ) @@ -364,8 +364,8 @@ G5_IRB2 = gen_irblock( LBL2, [ [ - ExprAff(D, A), - ExprAff(IRDst, ExprCond(C, ExprLoc(LBL1, 32), ExprLoc(LBL3, 32))), + ExprAssign(D, A), + ExprAssign(IRDst, ExprCond(C, ExprLoc(LBL1, 32), ExprLoc(LBL3, 32))), ] ] ) @@ -375,8 +375,8 @@ G5_IRB3 = gen_irblock( LBL3, [ [ - ExprAff(D, A), - ExprAff(IRDst, C), + ExprAssign(D, A), + ExprAssign(IRDst, C), ] ] ) @@ -393,11 +393,11 @@ G5_RES_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(A, C), + ExprAssign(A, C), ], [ - ExprAff(D, A), - ExprAff(IRDst, ExprCond(C, ExprLoc(LBL0, 32), ExprLoc(LBL3, 32))), + ExprAssign(D, A), + ExprAssign(IRDst, ExprCond(C, ExprLoc(LBL0, 32), ExprLoc(LBL3, 32))), ] ] ) @@ -407,8 +407,8 @@ G5_RES_IRB3 = gen_irblock( LBL3, [ [ - ExprAff(D, A), - ExprAff(IRDst, C), + ExprAssign(D, A), + ExprAssign(IRDst, C), ] ] ) @@ -427,7 +427,7 @@ G6_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(IRDst, ExprCond(C, ExprLoc(LBL1, 32), ExprLoc(LBL2, 32))), + ExprAssign(IRDst, ExprCond(C, ExprLoc(LBL1, 32), ExprLoc(LBL2, 32))), ] ] ) @@ -436,7 +436,7 @@ G6_IRB1 = gen_irblock( LBL1, [ [ - ExprAff(IRDst, ExprLoc(LBL3, 32)), + ExprAssign(IRDst, ExprLoc(LBL3, 32)), ] ] ) @@ -445,8 +445,8 @@ G6_IRB2 = gen_irblock( LBL2, [ [ - ExprAff(D, A), - ExprAff(IRDst, D), + ExprAssign(D, A), + ExprAssign(IRDst, D), ] ] ) @@ -456,8 +456,8 @@ G6_IRB3 = gen_irblock( LBL3, [ [ - ExprAff(A, D), - ExprAff(IRDst, ExprLoc(LBL3, 32)), + ExprAssign(A, D), + ExprAssign(IRDst, ExprLoc(LBL3, 32)), ] ] ) @@ -474,7 +474,7 @@ G6_RES_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(IRDst, ExprCond(C, ExprLoc(LBL3, 32), ExprLoc(LBL2, 32))), + ExprAssign(IRDst, ExprCond(C, ExprLoc(LBL3, 32), ExprLoc(LBL2, 32))), ] ] ) @@ -484,8 +484,8 @@ G6_RES_IRB2 = gen_irblock( LBL2, [ [ - ExprAff(D, A), - ExprAff(IRDst, D), + ExprAssign(D, A), + ExprAssign(IRDst, D), ] ] ) @@ -495,8 +495,8 @@ G6_RES_IRB3 = gen_irblock( LBL3, [ [ - ExprAff(A, D), - ExprAff(IRDst, ExprLoc(LBL3, 32)), + ExprAssign(A, D), + ExprAssign(IRDst, ExprLoc(LBL3, 32)), ] ] ) @@ -517,8 +517,8 @@ G7_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(A, C), - ExprAff(IRDst, ExprLoc(LBL1, 32)), + ExprAssign(A, C), + ExprAssign(IRDst, ExprLoc(LBL1, 32)), ] ] ) @@ -527,7 +527,7 @@ G7_IRB1 = gen_irblock( LBL1, [ [ - ExprAff(IRDst, ExprLoc(LBL1, 32)), + ExprAssign(IRDst, ExprLoc(LBL1, 32)), ] ] ) @@ -546,8 +546,8 @@ G7_RES_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(A, C), - ExprAff(IRDst, ExprLoc(LBL1, 32)), + ExprAssign(A, C), + ExprAssign(IRDst, ExprLoc(LBL1, 32)), ] ] ) @@ -556,7 +556,7 @@ G7_RES_IRB1 = gen_irblock( LBL1, [ [ - ExprAff(IRDst, ExprLoc(LBL1, 32)), + ExprAssign(IRDst, ExprLoc(LBL1, 32)), ] ] ) @@ -576,7 +576,7 @@ G8_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(IRDst, ExprLoc(LBL1, 32)), + ExprAssign(IRDst, ExprLoc(LBL1, 32)), ] ] ) @@ -585,8 +585,8 @@ G8_IRB1 = gen_irblock( LBL1, [ [ - ExprAff(A, C), - ExprAff(IRDst, ExprLoc(LBL1, 32)), + ExprAssign(A, C), + ExprAssign(IRDst, ExprLoc(LBL1, 32)), ] ] ) @@ -605,8 +605,8 @@ G8_RES_IRB0 = gen_irblock( LBL0, [ [ - ExprAff(A, C), - ExprAff(IRDst, ExprLoc(LBL0, 32)), + ExprAssign(A, C), + ExprAssign(IRDst, ExprLoc(LBL0, 32)), ] ] ) diff --git a/test/ir/symbexec.py b/test/ir/symbexec.py index 3158be60..00ef7c10 100755 --- a/test/ir/symbexec.py +++ b/test/ir/symbexec.py @@ -8,7 +8,7 @@ class TestSymbExec(unittest.TestCase): def test_ClassDef(self): from miasm2.expression.expression import ExprInt, ExprId, ExprMem, \ - ExprCompose, ExprAff + ExprCompose, ExprAssign from miasm2.arch.x86.sem import ir_x86_32 from miasm2.core.locationdb import LocationDB from miasm2.ir.symbexec import SymbolicExecutionEngine @@ -128,7 +128,7 @@ class TestSymbExec(unittest.TestCase): self.assertEqual(sb.eval_expr(id_x), id_a) ## x = a (with a = 0x0) - self.assertEqual(sb.eval_updt_expr(assignblk.dst2ExprAff(id_x)), ExprInt(0, 32)) + self.assertEqual(sb.eval_updt_expr(assignblk.dst2ExprAssign(id_x)), ExprInt(0, 32)) self.assertEqual(sb.eval_expr(id_x), ExprInt(0, 32)) self.assertEqual(sb.eval_updt_expr(id_x), ExprInt(0, 32)) @@ -137,7 +137,7 @@ class TestSymbExec(unittest.TestCase): ## state reads = set() for dst, src in sb.modified(): - reads.update(ExprAff(dst, src).get_r()) + reads.update(ExprAssign(dst, src).get_r()) self.assertEqual(reads, set([ id_x, id_a, diff --git a/test/ir/translators/smt2.py b/test/ir/translators/smt2.py index 838b0bc5..2b5c8df3 100644 --- a/test/ir/translators/smt2.py +++ b/test/ir/translators/smt2.py @@ -19,7 +19,7 @@ right = ExprCond(cond, a + ExprInt(0x64L, 64), ExprInt(0x16L, 64)) -e = ExprAff(left, right) +e = ExprAssign(left, right) # initialise translators t_z3 = TranslatorZ3() diff --git a/test/jitter/jitload.py b/test/jitter/jitload.py index dff1f0d6..1a56099f 100644 --- a/test/jitter/jitload.py +++ b/test/jitter/jitload.py @@ -3,7 +3,7 @@ from pdb import pm from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE from miasm2.analysis.machine import Machine -from miasm2.expression.expression import ExprId, ExprAff, ExprInt, ExprMem +from miasm2.expression.expression import ExprId, ExprAssign, ExprInt, ExprMem # Initial data: from 'example/samples/x86_32_sc.bin' data = "8d49048d5b0180f90174058d5bffeb038d5b0189d8c3".decode("hex") @@ -40,8 +40,8 @@ eax = ExprId("RAX", 64)[:32] imm0, imm4, imm4_64 = ExprInt(0, 32), ExprInt(4, 32), ExprInt(4, 64) memdata = ExprMem(ExprInt(run_addr, 32), len(data) * 8) assert myjit.eval_expr(eax) == imm0 -## Due to ExprAff construction, imm4 is "promoted" to imm4_64 -assert myjit.eval_expr(ExprAff(eax, imm4)) == imm4_64 +## Due to ExprAssign construction, imm4 is "promoted" to imm4_64 +assert myjit.eval_expr(ExprAssign(eax, imm4)) == imm4_64 assert myjit.eval_expr(eax) == imm4 ## Changes must be passed on myjit.cpu instance assert myjit.cpu.EAX == 4 |