diff options
Diffstat (limited to 'test/arch/arm')
| -rw-r--r-- | test/arch/arm/arch.py | 8 | ||||
| -rwxr-xr-x | test/arch/arm/sem.py | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/arch/arm/arch.py b/test/arch/arm/arch.py index f69bb104..3550a816 100644 --- a/test/arch/arm/arch.py +++ b/test/arch/arm/arch.py @@ -1,10 +1,10 @@ import time from miasm2.arch.arm.arch import * -from miasm2.core.asmblock import AsmSymbolPool +from miasm2.core.locationdb import LocationDB from pdb import pm -symbol_pool = AsmSymbolPool() +loc_db = LocationDB() def h2i(s): return s.replace(' ', '').decode('hex') @@ -233,7 +233,7 @@ for s, l in reg_tests_arm: print s print mn assert(str(mn) == s) - l = mn_arm.fromstring(s, symbol_pool, 'l') + l = mn_arm.fromstring(s, loc_db, 'l') assert(str(l) == s) a = mn_arm.asm(l) print [x for x in a] @@ -681,7 +681,7 @@ for s, l in reg_tests_armt: print s print mn assert(str(mn) == s) - l = mn_armt.fromstring(s, symbol_pool, 'l') + l = mn_armt.fromstring(s, loc_db, 'l') assert(str(l) == s) print 'Asm..', l a = mn_armt.asm(l) diff --git a/test/arch/arm/sem.py b/test/arch/arm/sem.py index 05d26f5c..252e5954 100755 --- a/test/arch/arm/sem.py +++ b/test/arch/arm/sem.py @@ -9,13 +9,13 @@ from miasm2.arch.arm.arch import mn_arm as mn from miasm2.arch.arm.sem import ir_arml as ir_arch from miasm2.arch.arm.regs import * from miasm2.expression.expression import * -from miasm2.core.asmblock import AsmSymbolPool +from miasm2.core.locationdb import LocationDB from pdb import pm logging.getLogger('cpuhelper').setLevel(logging.ERROR) EXCLUDE_REGS = set([ir_arch().IRDst]) -symbol_pool = AsmSymbolPool() +loc_db = LocationDB() def M(addr): return ExprMem(ExprInt(addr, 16), 16) @@ -26,7 +26,7 @@ def compute(asm, inputstate={}, debug=False): sympool.update({k: ExprInt(v, k.size) for k, v in inputstate.iteritems()}) interm = ir_arch() symexec = SymbolicExecutionEngine(interm, sympool) - instr = mn.fromstring(asm, symbol_pool, "l") + instr = mn.fromstring(asm, loc_db, "l") code = mn.asm(instr)[0] instr = mn.dis(code, "l") instr.offset = inputstate.get(PC, 0) |