about summary refs log tree commit diff stats
path: root/miasm2/analysis
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--miasm2/analysis/binary.py4
-rw-r--r--miasm2/analysis/cst_propag.py8
-rw-r--r--miasm2/analysis/data_flow.py14
-rw-r--r--miasm2/analysis/depgraph.py4
-rw-r--r--miasm2/analysis/dse.py6
-rw-r--r--miasm2/analysis/machine.py2
-rw-r--r--miasm2/analysis/modularintervals.py2
-rw-r--r--miasm2/analysis/ssa.py8
8 files changed, 24 insertions, 24 deletions
diff --git a/miasm2/analysis/binary.py b/miasm2/analysis/binary.py
index 6dfef92a..90d71369 100644
--- a/miasm2/analysis/binary.py
+++ b/miasm2/analysis/binary.py
@@ -36,7 +36,7 @@ class Container(object):
 
     @classmethod
     def from_string(cls, data, *args, **kwargs):
-        """Instanciate a container and parse the binary
+        """Instantiate a container and parse the binary
         @data: str containing the binary
         """
         log.info('Load binary')
@@ -65,7 +65,7 @@ class Container(object):
 
     @classmethod
     def from_stream(cls, stream, *args, **kwargs):
-        """Instanciate a container and parse the binary
+        """Instantiate a container and parse the binary
         @stream: stream to use as binary
         @vm: (optional) VmMngr instance to link with the executable
         @addr: (optional) Shift to apply before parsing the binary. If set,
diff --git a/miasm2/analysis/cst_propag.py b/miasm2/analysis/cst_propag.py
index 43e83c4a..9a5e3d54 100644
--- a/miasm2/analysis/cst_propag.py
+++ b/miasm2/analysis/cst_propag.py
@@ -26,8 +26,8 @@ def add_state(ircfg, todo, states, addr, state):
     """
     Add or merge the computed @state for the block at @addr. Update @todo
     @todo: modified block set
-    @states: dictionnary linking a label to its entering state.
-    @addr: address of the concidered block
+    @states: dictionary linking a label to its entering state.
+    @addr: address of the considered block
     @state: computed state
     """
     addr = ircfg.get_loc_key(addr)
@@ -122,7 +122,7 @@ def compute_cst_propagation_states(ir_arch, ircfg, init_addr, init_infos):
 
     @ir_arch: IntermediateRepresentation instance
     @init_addr: analysis start address
-    @init_infos: dictionnary linking expressions to their values at @init_addr
+    @init_infos: dictionary linking expressions to their values at @init_addr
     """
 
     done = set()
@@ -169,7 +169,7 @@ def propagate_cst_expr(ir_arch, ircfg, addr, init_infos):
 
     @ir_arch: IntermediateRepresentation instance
     @addr: analysis start address
-    @init_infos: dictionnary linking expressions to their values at @init_addr
+    @init_infos: dictionary linking expressions to their values at @init_addr
 
     Returns a mapping between replaced Expression and their new values.
     """
diff --git a/miasm2/analysis/data_flow.py b/miasm2/analysis/data_flow.py
index 49519e9c..23e2f77e 100644
--- a/miasm2/analysis/data_flow.py
+++ b/miasm2/analysis/data_flow.py
@@ -28,7 +28,7 @@ class ReachingDefinitions(dict):
     A survey of data flow analysis techniques.
     IBM Thomas J. Watson Research Division,  Algorithm MK
 
-    This class is usable as a dictionnary whose struture is
+    This class is usable as a dictionary whose structure is
     { (block, index): { lvalue: set((block, index)) } }
     """
 
@@ -122,7 +122,7 @@ class DiGraphDefUse(DiGraph):
 
     def __init__(self, reaching_defs,
                  deref_mem=False, *args, **kwargs):
-        """Instanciate a DiGraph
+        """Instantiate a DiGraph
         @blocks: IR blocks
         """
         self._edge_attr = {}
@@ -171,7 +171,7 @@ class DiGraphDefUse(DiGraph):
 
     def add_uniq_labeled_edge(self, src, dst, edge_label):
         """Adds the edge (@src, @dst) with label @edge_label.
-        if edge (@src, @dst) already exists, the previous label is overriden
+        if edge (@src, @dst) already exists, the previous label is overridden
         """
         self.add_uniq_edge(src, dst)
         self._edge_attr[(src, dst)] = edge_label
@@ -216,7 +216,7 @@ def dead_simp_useful_assignblks(irarch, defuse, reaching_defs):
         else:
             keep_all_definitions = False
 
-        # Block has a nonexistant successor or is a leaf
+        # Block has a nonexistent successor or is a leaf
         if keep_all_definitions or (len(successors) == 0):
             valid_definitions = reaching_defs.get_definitions(block_lbl,
                                                               len(block))
@@ -831,7 +831,7 @@ def check_expr_below_stack(ir_arch_a, expr):
 def retrieve_stack_accesses(ir_arch_a, ssa):
     """
     Walk the ssa graph and find stack based variables.
-    Return a dictionnary linking stack base address to its size/name
+    Return a dictionary linking stack base address to its size/name
     @ir_arch_a: ira instance
     @ssa: SSADiGraph instance
     """
@@ -881,9 +881,9 @@ def retrieve_stack_accesses(ir_arch_a, ssa):
 
 def fix_stack_vars(expr, base_to_info):
     """
-    Replace local stack accesses in expr using informations in @base_to_info
+    Replace local stack accesses in expr using information in @base_to_info
     @expr: Expression instance
-    @base_to_info: dictionnary linking stack base address to its size/name
+    @base_to_info: dictionary linking stack base address to its size/name
     """
     if not expr.is_mem():
         return expr
diff --git a/miasm2/analysis/depgraph.py b/miasm2/analysis/depgraph.py
index 5923e7ed..62967991 100644
--- a/miasm2/analysis/depgraph.py
+++ b/miasm2/analysis/depgraph.py
@@ -279,7 +279,7 @@ class DependencyResult(DependencyState):
         """Symbolic execution of relevant nodes according to the history
         Return the values of inputs nodes' elements
         @ir_arch: IntermediateRepresentation instance
-        @ctx: (optional) Initial context as dictionnary
+        @ctx: (optional) Initial context as dictionary
         @step: (optional) Verbose execution
         Warning: The emulation is not sound if the inputs nodes depend on loop
         variant.
@@ -447,7 +447,7 @@ class DependencyGraph(object):
     A dependency graph contains DependencyNode as nodes. The oriented edges
     stand for a dependency.
     The dependency graph is made of the lines of a group of IRblock
-    *explicitely* or *implicitely* involved in the equation of given element.
+    *explicitly* or *implicitly* involved in the equation of given element.
     """
 
     def __init__(self, ircfg,
diff --git a/miasm2/analysis/dse.py b/miasm2/analysis/dse.py
index 1875f138..3a986537 100644
--- a/miasm2/analysis/dse.py
+++ b/miasm2/analysis/dse.py
@@ -35,7 +35,7 @@ If one is only interested in constraints associated to its path, the option
 The constraints are accumulated in the .z3_cur z3.Solver object.
 
 Here are a few remainings TODO:
- - handle endianess in check_state / atomic read: currently, but this is also
+ - handle endianness in check_state / atomic read: currently, but this is also
    true for others Miasm2 symbolic engines, the endianness is not take in
    account, and assumed to be Little Endian
 
@@ -143,7 +143,7 @@ class ESETrackModif(EmulatedSymbExec):
 class DSEEngine(object):
     """Dynamic Symbolic Execution Engine
 
-    This class aims to be overrided for each specific purpose
+    This class aims to be overridden for each specific purpose
     """
     SYMB_ENGINE = ESETrackModif
 
@@ -208,7 +208,7 @@ class DSEEngine(object):
             dse.attach(jitter)
             dse.update...
             ...
-            # Additionnal call to the exec callback is necessary, as breakpoints are
+            # Additional call to the exec callback is necessary, as breakpoints are
             # honored AFTER exec callback
             jitter.exec_cb(jitter)
 
diff --git a/miasm2/analysis/machine.py b/miasm2/analysis/machine.py
index 7b24328a..f12b7e57 100644
--- a/miasm2/analysis/machine.py
+++ b/miasm2/analysis/machine.py
@@ -2,7 +2,7 @@
 
 
 class Machine(object):
-    """Abstract machine architecture to restrict architecture dependant code"""
+    """Abstract machine architecture to restrict architecture dependent code"""
 
     __dis_engine = None   # Disassembly engine
     __mn = None           # Machine instance
diff --git a/miasm2/analysis/modularintervals.py b/miasm2/analysis/modularintervals.py
index 650dbc21..83890f19 100644
--- a/miasm2/analysis/modularintervals.py
+++ b/miasm2/analysis/modularintervals.py
@@ -7,7 +7,7 @@ class ModularIntervals(object):
     """Intervals with a maximum size, supporting modular arithmetic"""
 
     def __init__(self, size, intervals=None):
-        """Instanciate a ModularIntervals of size @size
+        """Instantiate a ModularIntervals of size @size
         @size: maximum size of elements
         @intervals: (optional) interval instance, or any type  supported by
                     interval initialisation; element of the current instance
diff --git a/miasm2/analysis/ssa.py b/miasm2/analysis/ssa.py
index 0320d117..c22aae59 100644
--- a/miasm2/analysis/ssa.py
+++ b/miasm2/analysis/ssa.py
@@ -579,7 +579,7 @@ class SSADiGraph(SSA):
 
 def get_assignblk(graph, loc, index):
     """
-    Return the dictionnary of the AssignBlock from @graph at location @loc at
+    Return the dictionary of the AssignBlock from @graph at location @loc at
     @index
     @graph: IRCFG instance
     @loc: Location instance
@@ -595,13 +595,13 @@ def get_assignblk(graph, loc, index):
 
 def set_assignblk(graph, loc, index, assignblk_dct):
     """
-    Set the Assignblock in @graph at location @loc at @index using dictionnary
+    Set the Assignblock in @graph at location @loc at @index using dictionary
     @assignblk_dct
 
     @graph: IRCFG instance
     @loc: Location instance
     @index: assignblock index
-    @assignblk_dct: dictionnary representing the AssignBlock
+    @assignblk_dct: dictionary representing the AssignBlock
     """
 
     irblock = graph.blocks[loc]
@@ -629,7 +629,7 @@ def remove_phi(ssa, head):
 
     all_ssa_vars = ssa._ssa_variable_to_expr
 
-    # Retrive Phi nodes
+    # Retrieve Phi nodes
     phi_nodes = []
     for irblock in ssa.graph.blocks.itervalues():
         for index, assignblk in enumerate(irblock):