Skip to content

Commit

Permalink
Merge pull request #1041 from serpilliere/fix_tipo
Browse files Browse the repository at this point in the history
Fix typo
  • Loading branch information
p-l- authored May 18, 2019
2 parents 142fb34 + e86dec4 commit 78bfeed
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .codespell_ignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ mye
iff
nto
rela
daa
od
2 changes: 1 addition & 1 deletion miasm/analysis/data_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def add_uniq_labeled_edge(self, src, dst, edge_label):
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)

Expand Down
2 changes: 1 addition & 1 deletion miasm/analysis/depgraph.py
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ def _gen_path_constraints(self, translator, expr, expected):
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

Expand Down
2 changes: 1 addition & 1 deletion miasm/arch/mep/arch.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion miasm/core/graph.py
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ def match(self, graph):
"""
# 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
Expand Down
2 changes: 1 addition & 1 deletion miasm/jitter/codegen.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def block2assignblks(self, block):

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
Expand Down
2 changes: 1 addition & 1 deletion miasm/jitter/llvmconvert.py
Original file line number Diff line number Diff line change
Expand Up @@ -1720,7 +1720,7 @@ def from_asmblock(self, asmblock):
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)
Expand Down
4 changes: 2 additions & 2 deletions test/arch/mep/asm/test_asm.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ def test(self):
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")
Expand Down
2 changes: 1 addition & 1 deletion test/arch/mep/asm/test_major_opcode_4.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def test_LBU(self):
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)
Expand Down

0 comments on commit 78bfeed

Please sign in to comment.