diff options
| author | Pierre Lalet <pierre@droids-corp.org> | 2019-05-18 12:41:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-18 12:41:03 +0200 |
| commit | 78bfeedcc028df9f2e43f26a3c522bc3341ebe61 (patch) | |
| tree | 9d93aa60a6b3c033b0573f89b3b85ff5e2c116c1 | |
| parent | 142fb3411317e6ce63e9c3f9154530d9e65c9664 (diff) | |
| parent | e86dec41a03028340399f31844d0f5357eff52c7 (diff) | |
| download | miasm-78bfeedcc028df9f2e43f26a3c522bc3341ebe61.tar.gz miasm-78bfeedcc028df9f2e43f26a3c522bc3341ebe61.zip | |
Merge pull request #1041 from serpilliere/fix_tipo
Fix typo
| -rw-r--r-- | .codespell_ignore | 2 | ||||
| -rw-r--r-- | miasm/analysis/data_flow.py | 2 | ||||
| -rw-r--r-- | miasm/analysis/depgraph.py | 2 | ||||
| -rw-r--r-- | miasm/arch/mep/arch.py | 2 | ||||
| -rw-r--r-- | miasm/core/graph.py | 2 | ||||
| -rw-r--r-- | miasm/jitter/codegen.py | 2 | ||||
| -rw-r--r-- | miasm/jitter/llvmconvert.py | 2 | ||||
| -rw-r--r-- | test/arch/mep/asm/test_asm.py | 4 | ||||
| -rw-r--r-- | test/arch/mep/asm/test_major_opcode_4.py | 2 |
9 files changed, 11 insertions, 9 deletions
diff --git a/.codespell_ignore b/.codespell_ignore index 8eab9f6f..06b8df87 100644 --- a/.codespell_ignore +++ b/.codespell_ignore @@ -5,3 +5,5 @@ mye iff nto rela +daa +od diff --git a/miasm/analysis/data_flow.py b/miasm/analysis/data_flow.py index c86bece5..be0e4528 100644 --- a/miasm/analysis/data_flow.py +++ b/miasm/analysis/data_flow.py @@ -185,7 +185,7 @@ class DiGraphDefUse(DiGraph): self._edge_attr[(src, dst)] = edge_label def add_data_edge(self, src, dst): - """Adds an edge representing a data dependencie + """Adds an edge representing a data dependency and sets the label accordingly""" self.add_uniq_labeled_edge(src, dst, ATTR_DEP) diff --git a/miasm/analysis/depgraph.py b/miasm/analysis/depgraph.py index 219a32ee..80e94c7f 100644 --- a/miasm/analysis/depgraph.py +++ b/miasm/analysis/depgraph.py @@ -357,7 +357,7 @@ class DependencyResultImplicit(DependencyResult): conds = z3.Or(*out) else: # Ex: expr: lblgen1, expected: 0x1234 - # -> Avoid unconsistent solution lblgen1 = 0x1234 + # -> Avoid inconsistent solution lblgen1 = 0x1234 conds = translator.from_expr(self.unsat_expr) return conds diff --git a/miasm/arch/mep/arch.py b/miasm/arch/mep/arch.py index 171f5fab..8a9f60fd 100644 --- a/miasm/arch/mep/arch.py +++ b/miasm/arch/mep/arch.py @@ -293,7 +293,7 @@ class mn_mep(cls_mn): """ # Define variables that stores information used to disassemble & assemble - # Notes: - theses variables are mandatory + # Notes: - these variables are mandatory # - they could be moved to the cls_mn class num = 0 # holds the number of mnemonics diff --git a/miasm/core/graph.py b/miasm/core/graph.py index f585379b..01f580a3 100644 --- a/miasm/core/graph.py +++ b/miasm/core/graph.py @@ -978,7 +978,7 @@ class MatchGraph(DiGraph): """ # Partial solution: nodes corrects, edges between these nodes corrects # A partial solution is a dictionary MatchGraphJoker -> @graph's node - todo = list() # Dictionnaries containing partial solution + todo = list() # Dictionaries containing partial solution done = list() # Already computed partial solutions # Elect first candidates diff --git a/miasm/jitter/codegen.py b/miasm/jitter/codegen.py index 792feae0..abbf65d2 100644 --- a/miasm/jitter/codegen.py +++ b/miasm/jitter/codegen.py @@ -187,7 +187,7 @@ class CGen(object): def add_local_var(self, dst_var, dst_index, expr): """ - Add local variable used to store temporay result + Add local variable used to store temporary result @dst_var: dictionary of Expr -> local_var_expr @dst_index : dictionary of size -> local var count @expr: Expression source diff --git a/miasm/jitter/llvmconvert.py b/miasm/jitter/llvmconvert.py index d0e0407b..c4467411 100644 --- a/miasm/jitter/llvmconvert.py +++ b/miasm/jitter/llvmconvert.py @@ -1720,7 +1720,7 @@ class LLVMFunction(object): self.gen_bad_block(asmblock) return - # Create basic blocks (for label branchs) + # Create basic blocks (for label branches) entry_bbl, builder = self.entry_bbl, self.builder for instr in asmblock.lines: lbl = self.llvm_context.ir_arch.loc_db.get_or_create_offset_location(instr.offset) diff --git a/test/arch/mep/asm/test_asm.py b/test/arch/mep/asm/test_asm.py index 7762669a..e8b8afb9 100644 --- a/test/arch/mep/asm/test_asm.py +++ b/test/arch/mep/asm/test_asm.py @@ -22,12 +22,12 @@ class TestMisc(object): for mn_str, mn_hex in unit_tests: print("-" * 49) # Tests separation - # Dissassemble + # Disassemble mn_bin = decode_hex(mn_hex) mn = mn_mep.dis(mn_bin, "b") print("dis: %s -> %s" % (mn_hex.rjust(20), str(mn).rjust(20))) - assert(str(mn) == mn_str) # dissassemble assertion + assert(str(mn) == mn_str) # disassemble assertion # Assemble and return all possible candidates instr = mn_mep.fromstring(str(mn), "b") diff --git a/test/arch/mep/asm/test_major_opcode_4.py b/test/arch/mep/asm/test_major_opcode_4.py index a6f57ac2..fd466b62 100644 --- a/test/arch/mep/asm/test_major_opcode_4.py +++ b/test/arch/mep/asm/test_major_opcode_4.py @@ -107,7 +107,7 @@ class TestMajor4(object): check_instruction("LBU $4, 0x22($TP)", "4ca2", multi=2) # Note: the following instruction can not be easily manipulated due to # expressions simplifications performed by miasm at assembly and - # dissassembly, i.e. ExprMem($TP + 0) is simplified into ExprMem($TP) + # disassembly, i.e. ExprMem($TP + 0) is simplified into ExprMem($TP) #check_instruction("LBU $6, 0x0($TP)", "4e80", multi=2) check_instruction("LBU $7, 0x3C($TP)", "4fbc", multi=2) check_instruction("LBU $2, 0x4($TP)", "4a84", multi=2) |