diff options
Diffstat (limited to '')
| -rw-r--r-- | miasm2/ir/ir2C.py | 32 | ||||
| -rw-r--r-- | miasm2/ir/translators/translator.py | 6 | ||||
| -rw-r--r-- | test/ir/ir2C.py | 15 |
3 files changed, 28 insertions, 25 deletions
diff --git a/miasm2/ir/ir2C.py b/miasm2/ir/ir2C.py index 1e4e653e..4c9dff8c 100644 --- a/miasm2/ir/ir2C.py +++ b/miasm2/ir/ir2C.py @@ -1,7 +1,7 @@ import miasm2.expression.expression as m2_expr from miasm2.expression.simplifications import expr_simp from miasm2.core import asmbloc -from miasm2.ir.translators.C import TranslatorC +from miasm2.ir.translators import Translator import logging @@ -11,6 +11,8 @@ console_handler.setFormatter(logging.Formatter("%(levelname)-5s: %(message)s")) log_to_c_h.addHandler(console_handler) log_to_c_h.setLevel(logging.WARN) +# Miasm to C translator +translator = Translator.to_language("C") prefetch_id = [] prefetch_id_size = {} @@ -164,13 +166,13 @@ def gen_resolve_id_lbl(ir_arch, e): return 'Resolve_dst(BlockDst, 0x%X, 0)'%(e.name.offset) def gen_resolve_id(ir_arch, e): - return 'Resolve_dst(BlockDst, %s, 0)'%(TranslatorC.from_expr(patch_c_id(ir_arch.arch, e))) + return 'Resolve_dst(BlockDst, %s, 0)'%(translator.from_expr(patch_c_id(ir_arch.arch, e))) def gen_resolve_mem(ir_arch, e): - return 'Resolve_dst(BlockDst, %s, 0)'%(TranslatorC.from_expr(patch_c_id(ir_arch.arch, e))) + return 'Resolve_dst(BlockDst, %s, 0)'%(translator.from_expr(patch_c_id(ir_arch.arch, e))) def gen_resolve_other(ir_arch, e): - return 'Resolve_dst(BlockDst, %s, 0)'%(TranslatorC.from_expr(patch_c_id(ir_arch.arch, e))) + return 'Resolve_dst(BlockDst, %s, 0)'%(translator.from_expr(patch_c_id(ir_arch.arch, e))) def gen_resolve_dst_simple(ir_arch, e): if isinstance(e, m2_expr.ExprInt): @@ -189,7 +191,7 @@ def gen_resolve_dst_simple(ir_arch, e): def gen_irdst(ir_arch, e): out = [] if isinstance(e, m2_expr.ExprCond): - dst_cond_c = TranslatorC.from_expr(patch_c_id(ir_arch.arch, e.cond)) + dst_cond_c = translator.from_expr(patch_c_id(ir_arch.arch, e.cond)) out.append("if (%s)"%dst_cond_c) out.append(' %s;'%(gen_resolve_dst_simple(ir_arch, e.src1))) out.append("else") @@ -257,8 +259,8 @@ def Expr2C(ir_arch, l, exprs, gen_exception_code=False): mem_k = src_mem.keys() mem_k.sort() for k in mem_k: - str_src = TranslatorC.from_expr(patch_c_id(ir_arch.arch, k)) - str_dst = TranslatorC.from_expr(patch_c_id(ir_arch.arch, src_mem[k])) + str_src = translator.from_expr(patch_c_id(ir_arch.arch, k)) + str_dst = translator.from_expr(patch_c_id(ir_arch.arch, src_mem[k])) out.append('%s = %s;' % (str_dst, str_src)) src_w_len = {} for k, v in src_mem.items(): @@ -273,8 +275,8 @@ def Expr2C(ir_arch, l, exprs, gen_exception_code=False): continue - str_src = TranslatorC.from_expr(patch_c_id(ir_arch.arch, src)) - str_dst = TranslatorC.from_expr(patch_c_id(ir_arch.arch, dst)) + str_src = translator.from_expr(patch_c_id(ir_arch.arch, src)) + str_dst = translator.from_expr(patch_c_id(ir_arch.arch, dst)) @@ -304,12 +306,12 @@ def Expr2C(ir_arch, l, exprs, gen_exception_code=False): if gen_exception_code: if fetch_mem: e = set_pc(ir_arch, l.offset & mask_int) - s1 = "%s" % TranslatorC.from_expr(patch_c_id(ir_arch.arch, e)) + s1 = "%s" % translator.from_expr(patch_c_id(ir_arch.arch, e)) s1 += ';\n Resolve_dst(BlockDst, 0x%X, 0)'%(l.offset & mask_int) out.append(code_exception_fetch_mem_at_instr_noautomod % s1) if set_exception_flags: e = set_pc(ir_arch, l.offset & mask_int) - s1 = "%s" % TranslatorC.from_expr(patch_c_id(ir_arch.arch, e)) + s1 = "%s" % translator.from_expr(patch_c_id(ir_arch.arch, e)) s1 += ';\n Resolve_dst(BlockDst, 0x%X, 0)'%(l.offset & mask_int) out.append(code_exception_at_instr_noautomod % s1) @@ -328,10 +330,10 @@ def Expr2C(ir_arch, l, exprs, gen_exception_code=False): "/*pc = 0x%X; */return; }" % (l.offset)) else: e = set_pc(ir_arch, l.offset & mask_int) - s1 = "%s" % TranslatorC.from_expr(patch_c_id(ir_arch.arch, e)) + s1 = "%s" % translator.from_expr(patch_c_id(ir_arch.arch, e)) s1 += ';\n Resolve_dst(BlockDst, 0x%X, 0)'%(l.offset & mask_int) e = set_pc(ir_arch, (l.offset + l.l) & mask_int) - s2 = "%s" % TranslatorC.from_expr(patch_c_id(ir_arch.arch, e)) + s2 = "%s" % translator.from_expr(patch_c_id(ir_arch.arch, e)) s2 += ';\n Resolve_dst(BlockDst, 0x%X, 0)'%((l.offset + l.l) & mask_int) post_instr.append( code_exception_post_instr_noautomod % (s1, s2)) @@ -343,7 +345,7 @@ def Expr2C(ir_arch, l, exprs, gen_exception_code=False): offset = l.offset + l.l e = set_pc(ir_arch, offset & mask_int) - s1 = "%s" % TranslatorC.from_expr(patch_c_id(ir_arch.arch, e)) + s1 = "%s" % translator.from_expr(patch_c_id(ir_arch.arch, e)) s1 += ';\n Resolve_dst(BlockDst, 0x%X, 0)'%(offset & mask_int) post_instr.append( code_exception_fetch_mem_post_instr_noautomod % (s1)) @@ -383,7 +385,7 @@ def ir2C(ir_arch, irbloc, lbl_done, for l, exprs in zip(irbloc.lines, irbloc.irs): if l.offset not in lbl_done: e = set_pc(ir_arch, l.offset & mask_int) - s1 = "%s" % TranslatorC.from_expr(patch_c_id(ir_arch.arch, e)) + s1 = "%s" % translator.from_expr(patch_c_id(ir_arch.arch, e)) s1 += ';\n Resolve_dst(BlockDst, 0x%X, 0)'%(l.offset & mask_int) out.append([pre_instr_test_exception % (s1)]) lbl_done.add(l.offset) diff --git a/miasm2/ir/translators/translator.py b/miasm2/ir/translators/translator.py index f283618f..90e5890c 100644 --- a/miasm2/ir/translators/translator.py +++ b/miasm2/ir/translators/translator.py @@ -17,15 +17,15 @@ class Translator(object): cls.available_translators.append(translator) @classmethod - def to_language(cls, target_lang): - """Return the corresponding translator + def to_language(cls, target_lang, *args, **kwargs): + """Return the corresponding translator instance @target_lang: str (case insensitive) wanted language Raise a NotImplementedError in case of unmatched language """ target_lang = target_lang.lower() for translator in cls.available_translators: if translator.__LANG__.lower() == target_lang: - return translator + return translator(*args, **kwargs) raise NotImplementedError("Unknown target language: %s" % target_lang) diff --git a/test/ir/ir2C.py b/test/ir/ir2C.py index 11b9b10e..48518c50 100644 --- a/test/ir/ir2C.py +++ b/test/ir/ir2C.py @@ -7,16 +7,17 @@ import unittest class TestIrIr2C(unittest.TestCase): def translationTest(self, expr, expected): - from miasm2.ir.translators.C import TranslatorC + from miasm2.ir.translators import Translator - self.assertEqual(TranslatorC.from_expr(expr), expected) + translator = Translator.to_language("C") + self.assertEqual(translator.from_expr(expr), expected) def test_ExprOp_toC(self): from miasm2.expression.expression import ExprInt32, ExprOp - from miasm2.ir.translators.C import TranslatorC + from miasm2.ir.translators.C import Translator args = [ExprInt32(i) for i in xrange(9)] - + translator = Translator.to_language("C") # Unary operators self.translationTest( @@ -26,7 +27,7 @@ class TestIrIr2C(unittest.TestCase): self.translationTest( ExprOp('hex2bcd', *args[:1]), r'hex2bcd_32(0x0)') self.translationTest(ExprOp('fabs', *args[:1]), r'fabs(0x0)') - self.assertRaises(NotImplementedError, TranslatorC.from_expr, + self.assertRaises(NotImplementedError, translator.from_expr, ExprOp('X', *args[:1])) # Binary operators @@ -50,7 +51,7 @@ class TestIrIr2C(unittest.TestCase): ExprOp('imod', *args[:2]), r'imod32(vmcpu, 0x0, 0x1)') self.translationTest( ExprOp('bcdadd', *args[:2]), r'bcdadd_32(0x0, 0x1)') - self.assertRaises(NotImplementedError, TranslatorC.from_expr, + self.assertRaises(NotImplementedError, translator.from_expr, ExprOp('X', *args[:2])) # Ternary operators @@ -60,7 +61,7 @@ class TestIrIr2C(unittest.TestCase): # Other cases self.translationTest( ExprOp('+', *args[:3]), r'(((0x0&0xffffffff)+(0x1&0xffffffff)+(0x2&0xffffffff))&0xffffffff)') - self.assertRaises(NotImplementedError, TranslatorC.from_expr, + self.assertRaises(NotImplementedError, translator.from_expr, ExprOp('X', *args[:3])) if __name__ == '__main__': |