diff options
| author | Camille Mougey <commial@gmail.com> | 2016-11-07 12:24:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-07 12:24:51 +0100 |
| commit | 3af8c4a5a6668cc89a4df3fb66222f4147a896b9 (patch) | |
| tree | 21a7d7ad5d6da120e8e23e0b92725073d4d4e27c /test/arch/arm/sem.py | |
| parent | a15e0faca425c6e2591448e510bf14f1c3f04e14 (diff) | |
| parent | f0fbc59a663774dc4f4861308bee3f91ccd9746d (diff) | |
| download | miasm-3af8c4a5a6668cc89a4df3fb66222f4147a896b9.tar.gz miasm-3af8c4a5a6668cc89a4df3fb66222f4147a896b9.zip | |
Merge pull request #445 from serpilliere/symb_exec_clean
Symb exec clean
Diffstat (limited to '')
| -rw-r--r-- | test/arch/arm/sem.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/arch/arm/sem.py b/test/arch/arm/sem.py index feef7372..8fc609fb 100644 --- a/test/arch/arm/sem.py +++ b/test/arch/arm/sem.py @@ -29,7 +29,7 @@ def compute(asm, inputstate={}, debug=False): instr = mn.dis(code, "l") instr.offset = inputstate.get(PC, 0) interm.add_instr(instr) - symexec.emul_ir_blocs(interm, instr.offset) + symexec.emul_ir_blocks(instr.offset) if debug: for k, v in symexec.symbols.items(): if regs_init.get(k, None) != v: @@ -285,7 +285,7 @@ class TestARMSemantic(unittest.TestCase): self.assertEqual(compute('AND R4, R4, R5 LSR 2 ', {R4: 0xFFFFFFFF, R5: 0x80000041, }), {R4: 0x20000010, R5: 0x80000041, }) self.assertEqual(compute('AND R4, R4, R5 ASR 3 ', {R4: 0xF00000FF, R5: 0x80000081, }), {R4: 0xF0000010, R5: 0x80000081, }) self.assertEqual(compute('AND R4, R4, R5 ROR 4 ', {R4: 0xFFFFFFFF, R5: 0x000000FF, }), {R4: 0xF000000F, R5: 0x000000FF, }) - self.assertEqual(compute('AND R4, R4, R5 RRX ', {R4: 0xFFFFFFFF, R5: 0x00000101, }), {R4: ExprCompose([(ExprInt(0x80, 31),0,31), (cf_init,31,32)]), R5: 0x00000101, }) + self.assertEqual(compute('AND R4, R4, R5 RRX ', {R4: 0xFFFFFFFF, R5: 0x00000101, }), {R4: ExprCompose(ExprInt(0x80, 31), cf_init), R5: 0x00000101, }) # §A8.8.15: AND{S}{<c>}{<q>} {<Rd>,} <Rn>, <Rm>, <type> <Rs> self.assertEqual(compute('AND R4, R6, R4 LSL R5', {R4: 0x00000001, R5: 0x00000004, R6: -1, }), {R4: 0x00000010, R5: 0x00000004, R6: 0xFFFFFFFF, }) |