IR: rename DiGraphIR=>IRCFG

2 files changed, 8 insertions, 7 deletions

diff --git a/miasm2/analysis/data_flow.py b/miasm2/analysis/data_flow.py
index b3c4df88..d0f2a0b1 100644
--- a/miasm2/analysis/data_flow.py
+++ b/miasm2/analysis/data_flow.py
@@ -121,7 +121,7 @@ class DiGraphDefUse(DiGraph):
 
     def __init__(self, reaching_defs,
                  deref_mem=False, *args, **kwargs):
-        """Instanciate a DiGraphIR
+        """Instanciate a DiGraph
         @blocks: IR blocks
         """
         self._edge_attr = {}
@@ -271,7 +271,7 @@ def dead_simp(irarch, ircfg):
 def _test_merge_next_block(ircfg, loc_key):
     """
     Test if the irblock at @loc_key can be merge with its son
-    @ircfg: DiGraphIR instance
+    @ircfg: IRCFG instance
     @loc_key: LocKey instance of the candidate parent irblock
     """
 
@@ -287,6 +287,7 @@ def _test_merge_next_block(ircfg, loc_key):
         return None
     return son
 
+
 def _do_merge_blocks(ircfg, loc_key, son_loc_key):
     """
     Merge two irblocks at @loc_key and @son_loc_key
@@ -376,7 +377,7 @@ def _remove_to_son(ircfg, loc_key, son_loc_key):
     - irblock at @loc_key is a pure jump block
     - @loc_key is not an entry point (can be removed)
 
-    @irblock: DiGraphIR
+    @irblock: IRCFG instance
     @loc_key: LocKey instance of the parent irblock
     @son_loc_key: LocKey instance of the son irblock
     """
@@ -450,7 +451,7 @@ def merge_blocks(ircfg, loc_key_entries):
 
     Return True if at least an irblock has been modified
 
-    @ircfg: DiGraphIR instance
+    @ircfg: IRCFG instance
     @loc_key_entries: loc_key to keep
     """
 
@@ -490,7 +491,7 @@ def remove_empty_assignblks(ircfg):
     Remove empty assignblks in irblocks of @ircfg
     Return True if at least an irblock has been modified
 
-    @ircfg: DiGraphIR
+    @ircfg: IRCFG instance
     """
     modified = False
     for loc_key, block in ircfg.blocks.iteritems():
diff --git a/miasm2/analysis/depgraph.py b/miasm2/analysis/depgraph.py
index 93b3edb5..a5f3f0fd 100644
--- a/miasm2/analysis/depgraph.py
+++ b/miasm2/analysis/depgraph.py
@@ -452,7 +452,7 @@ class DependencyGraph(object):
                  follow_call=True):
         """Create a DependencyGraph linked to @ircfg
 
-        @ircfg: DiGraphIR instance
+        @ircfg: IRCFG instance
         @implicit: (optional) Track IRDst for each block in the resulting path
 
         Following arguments define filters used to generate dependencies
@@ -590,7 +590,7 @@ class DependencyGraph(object):
 
     def get(self, loc_key, elements, line_nb, heads):
         """Compute the dependencies of @elements at line number @line_nb in
-        the block named @loc_key in the current DiGraphIR, before the execution of
+        the block named @loc_key in the current IRCFG, before the execution of
         this line. Dependency check stop if one of @heads is reached
         @loc_key: LocKey instance
         @element: set of Expr instances