diff options
Diffstat (limited to 'miasm2/arch')
| -rw-r--r-- | miasm2/arch/arm/regs.py | 5 | ||||
| -rw-r--r-- | miasm2/arch/arm/sem.py | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/miasm2/arch/arm/regs.py b/miasm2/arch/arm/regs.py index dce4cb98..e20b00bd 100644 --- a/miasm2/arch/arm/regs.py +++ b/miasm2/arch/arm/regs.py @@ -9,6 +9,7 @@ regs32_str = ["R%d" % i for i in xrange(13)] + ["SP", "LR", "PC"] regs32_expr = [ExprId(x, 32) for x in regs32_str] exception_flags = ExprId('exception_flags', 32) +interrupt_num = ExprId('interrupt_num', 32) bp_num = ExprId('bp_num', 32) @@ -84,7 +85,7 @@ all_regs_ids = [ R0, R1, R2, R3, R4, R5, R6, R7, R8, R9, R10, R11, R12, SP, LR, PC, zf, nf, of, cf, ge0, ge1, ge2, ge3, - exception_flags, bp_num + exception_flags, interrupt_num, bp_num ] all_regs_ids_no_alias = all_regs_ids @@ -102,7 +103,7 @@ all_regs_ids_init = [R0_init, R1_init, R2_init, R3_init, R12_init, SP_init, LR_init, PC_init, zf_init, nf_init, of_init, cf_init, ge0_init, ge1_init, ge2_init, ge3_init, - ExprInt(0, 32), ExprInt(0, 32) + ExprInt(0, 32), ExprInt(0, 32), ExprInt(0, 32) ] regs_init = {} diff --git a/miasm2/arch/arm/sem.py b/miasm2/arch/arm/sem.py index 00250157..d9c2d6cd 100644 --- a/miasm2/arch/arm/sem.py +++ b/miasm2/arch/arm/sem.py @@ -3,7 +3,7 @@ from miasm2.ir.ir import IntermediateRepresentation, IRBlock, AssignBlock from miasm2.arch.arm.arch import mn_arm, mn_armt from miasm2.arch.arm.regs import * -from miasm2.jitter.csts import EXCEPT_DIV_BY_ZERO +from miasm2.jitter.csts import EXCEPT_DIV_BY_ZERO, EXCEPT_INT_XX # liris.cnrs.fr/~mmrissa/lib/exe/fetch.php?media=armv7-a-r-manual.pdf EXCEPT_SOFT_BP = (1 << 1) @@ -805,9 +805,10 @@ def stmdb(ir, instr, a, b): def svc(ir, instr, a): - # XXX TODO implement - e = [ - ExprAff(exception_flags, ExprInt(EXCEPT_PRIV_INSN, 32))] + e = [] + except_int = EXCEPT_INT_XX + e.append(ExprAff(exception_flags, ExprInt(except_int, 32))) + e.append(ExprAff(interrupt_num, a)) return e, [] |