about summary refs log tree commit diff stats
path: root/miasm2/ir
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--miasm2/ir/ir.py14
-rw-r--r--miasm2/ir/symbexec.py4
-rw-r--r--miasm2/ir/symbexec_top.py2
-rw-r--r--miasm2/ir/symbexec_types.py2
-rw-r--r--miasm2/ir/translators/smt2.py4
-rw-r--r--miasm2/ir/translators/z3_ir.py6
6 files changed, 16 insertions, 16 deletions
diff --git a/miasm2/ir/ir.py b/miasm2/ir/ir.py
index 16dffc79..72f775fb 100644
--- a/miasm2/ir/ir.py
+++ b/miasm2/ir/ir.py
@@ -48,7 +48,7 @@ class AssignBlock(object):
 
     -> Exchange between EBX and EAX
 
-    AssignBlock can be seen as a dictionnary where keys are the destinations
+    AssignBlock can be seen as a dictionary where keys are the destinations
     (ExprId or ExprMem), and values their corresponding sources.
 
     Also provides common manipulation on this assignments.
@@ -58,7 +58,7 @@ class AssignBlock(object):
 
     def __init__(self, irs=None, instr=None):
         """Create a new AssignBlock
-        @irs: (optional) sequence of ExprAssign, or dictionnary dst (Expr) -> src
+        @irs: (optional) sequence of ExprAssign, or dictionary dst (Expr) -> src
               (Expr)
         @instr: (optional) associate an instruction with this AssignBlock
 
@@ -109,7 +109,7 @@ class AssignBlock(object):
                 # prev_RAX = 0x1122334455667788
                 # input_RAX[0:8] = 0x89
                 # final_RAX -> ? (assignment are in parallel)
-                raise RuntimeError("Concurent access on same bit not allowed")
+                raise RuntimeError("Concurrent access on same bit not allowed")
 
             # Consider slice grouping
             expr_list = [(new_dst, new_src),
@@ -126,7 +126,7 @@ class AssignBlock(object):
             for i, (_, stop) in enumerate(known_intervals[:-1]):
                 if stop > known_intervals[i + 1][0]:
                     raise RuntimeError(
-                        "Concurent access on same bit not allowed")
+                        "Concurrent access on same bit not allowed")
 
             # Fill with missing data
             missing_i = get_missing_interval(known_intervals, 0, new_dst.size)
@@ -202,7 +202,7 @@ class AssignBlock(object):
     @staticmethod
     def get_modified_slice(dst, src):
         """Return an Expr list of extra expressions needed during the
-        object instanciation"""
+        object instantiation"""
         if not isinstance(src, m2_expr.ExprCompose):
             raise ValueError("Get mod slice not on expraff slice", str(src))
         modified_s = []
@@ -220,7 +220,7 @@ class AssignBlock(object):
         return set(self.keys())
 
     def get_rw(self, mem_read=False, cst_read=False):
-        """Return a dictionnary associating written expressions to a set of
+        """Return a dictionary associating written expressions to a set of
         their read requirements
         @mem_read: (optional) mem_read argument of `get_r`
         @cst_read: (optional) cst_read argument of `get_r`
@@ -471,7 +471,7 @@ class IRCFG(DiGraph):
     """DiGraph for IR instances"""
 
     def __init__(self, irdst, loc_db, blocks=None, *args, **kwargs):
-        """Instanciate a IRCFG
+        """Instantiate a IRCFG
         @loc_db: LocationDB instance
         @blocks: IR blocks
         """
diff --git a/miasm2/ir/symbexec.py b/miasm2/ir/symbexec.py
index 052736ee..a1ffebf5 100644
--- a/miasm2/ir/symbexec.py
+++ b/miasm2/ir/symbexec.py
@@ -81,7 +81,7 @@ class SymbolicState(StateEngine):
 
     @property
     def symbols(self):
-        """Return the dictionnary of known symbols"""
+        """Return the dictionary of known symbols"""
         return dict(self._symbols)
 
 
@@ -945,7 +945,7 @@ class SymbolicExecutionEngine(object):
     def eval_expr(self, expr, eval_cache=None):
         """
         Evaluate @expr
-        @expr: Expresion instance to evaluate
+        @expr: Expression instance to evaluate
         @cache: None or dictionary linking variables to their values
         """
         if eval_cache is None:
diff --git a/miasm2/ir/symbexec_top.py b/miasm2/ir/symbexec_top.py
index f5ecb566..887ebe59 100644
--- a/miasm2/ir/symbexec_top.py
+++ b/miasm2/ir/symbexec_top.py
@@ -68,7 +68,7 @@ class SymbolicStateTop(StateEngine):
 
     @property
     def symbols(self):
-        """Return the dictionnary of known symbols"""
+        """Return the dictionary of known symbols"""
         return dict(self._symbols)
 
     @property
diff --git a/miasm2/ir/symbexec_types.py b/miasm2/ir/symbexec_types.py
index 2b7643ca..7580d1f8 100644
--- a/miasm2/ir/symbexec_types.py
+++ b/miasm2/ir/symbexec_types.py
@@ -51,7 +51,7 @@ class SymbolicStateCTypes(StateEngine):
 
     @property
     def symbols(self):
-        """Return the dictionnary of known symbols'types"""
+        """Return the dictionary of known symbols'types"""
         return dict(self._symbols)
 
 
diff --git a/miasm2/ir/translators/smt2.py b/miasm2/ir/translators/smt2.py
index 802481fe..eda24bb7 100644
--- a/miasm2/ir/translators/smt2.py
+++ b/miasm2/ir/translators/smt2.py
@@ -47,7 +47,7 @@ class SMT2Mem(object):
         try:
             mem = self.mems[size]
         except KeyError:
-            # Lazy instanciation
+            # Lazy instantiation
             self.mems[size] = self.name + str(size)
             mem = self.mems[size]
         return mem
@@ -105,7 +105,7 @@ class TranslatorSMT2(Translator):
     expression. Memory is abstracted via SMT2Mem.
     The result of from_expr will be an SMT2 expression.
 
-    If you want to interract with the memory abstraction after the translation,
+    If you want to interact with the memory abstraction after the translation,
     you can instantiate your own SMT2Mem that will be equivalent to the one
     used by TranslatorSMT2.
 
diff --git a/miasm2/ir/translators/z3_ir.py b/miasm2/ir/translators/z3_ir.py
index 1cc8c29d..d43468ef 100644
--- a/miasm2/ir/translators/z3_ir.py
+++ b/miasm2/ir/translators/z3_ir.py
@@ -50,7 +50,7 @@ class Z3Mem(object):
         try:
             mem = self.mems[size]
         except KeyError:
-            # Lazy instanciation
+            # Lazy instantiation
             self.mems[size] = z3.Array(self.name + str(size),
                                         z3.BitVecSort(size),
                                         z3.BitVecSort(8))
@@ -104,8 +104,8 @@ class TranslatorZ3(Translator):
     expression. Memory is abstracted via z3.Array (see Z3Mem).
     The result of from_expr will be a z3 Expr.
 
-    If you want to interract with the memory abstraction after the translation,
-    you can instanciate your own Z3Mem, that will be equivalent to the one
+    If you want to interact with the memory abstraction after the translation,
+    you can instantiate your own Z3Mem, that will be equivalent to the one
     used by TranslatorZ3.
     """