about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCamille Mougey <camille.mougey@cea.fr>2015-12-04 15:35:51 +0100
committerAjax <commial@gmail.com>2015-12-07 11:10:53 +0100
commit126e77becb6e82850c831bdfeca10aadca6162a3 (patch)
treee21d423fec681e1c1af2a8d400eee4b3cf9a6f49
parent092a6f54713b3e83d200c92dce54fd8186c44edd (diff)
downloadmiasm-126e77becb6e82850c831bdfeca10aadca6162a3.tar.gz
miasm-126e77becb6e82850c831bdfeca10aadca6162a3.zip
Example/Disasm: update full.py to produce both IR and IRA graphes
-rw-r--r--example/disasm/full.py3
-rw-r--r--test/test_all.py6
2 files changed, 7 insertions, 2 deletions
diff --git a/example/disasm/full.py b/example/disasm/full.py
index 03928e73..d939d430 100644
--- a/example/disasm/full.py
+++ b/example/disasm/full.py
@@ -194,6 +194,7 @@ if args.gen_ir:
     log.info("Print blocs (with analyse)")
     for label, bloc in ir_arch_a.blocs.iteritems():
         print bloc
+    ir_arch.gen_graph()
     ir_arch_a.gen_graph()
 
     if args.simplify:
@@ -201,3 +202,5 @@ if args.gen_ir:
 
     out = ir_arch_a.graph()
     open('graph_irflow.dot', 'w').write(out)
+    out = ir_arch.graph()
+    open('graph_irflow_raw.dot', 'w').write(out)
diff --git a/test/test_all.py b/test/test_all.py
index c449ef33..71ea51a5 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -337,13 +337,15 @@ class ExampleDisasmFull(ExampleDisassembler):
     """DisasmFull specificities:
     - script: disasm/full.py
     - flags: -g -s
-    - @products: graph_execflow.dot, graph_irflow.dot, lines.dot, out.dot
+    - @products: graph_execflow.dot, graph_irflow.dot, graph_irflow_raw.dot,
+                 lines.dot, out.dot
     """
 
     def __init__(self, *args, **kwargs):
         super(ExampleDisasmFull, self).__init__(*args, **kwargs)
         self.command_line = ["full.py", "-g", "-s", "-m"] + self.command_line
-        self.products += ["graph_execflow.dot", "graph_irflow.dot", "lines.dot"]
+        self.products += ["graph_execflow.dot", "graph_irflow.dot",
+                          "graph_irflow_raw.dot", "lines.dot"]
 
 
 testset += ExampleDisasmFull(["arml", Example.get_sample("demo_arm_l.bin"),