Skip to content

Commit

Permalink
Merge pull request #1474 from DimitriPapadopoulos/codespell
Browse files Browse the repository at this point in the history
Fix typos found by codespell
  • Loading branch information
serpilliere authored Mar 28, 2024
2 parents 319229f + 46a201e commit 1ba37c3
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion doc/ir/lift.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -1729,7 +1729,7 @@
"\n",
"```\n",
"\n",
"This is the generic code used in `x86_64` to model function calls. But you can finely model functions. For example, suppose you are analysing code on `x86_32` with `stdcall` convention. Suppose you know the callee clean its stack arguments. Supppose as well you know for each function how many arguments it has. You can then customize the model to match the callee and compute the correct stack modification, as well as getting the arguments from stack:\n",
"This is the generic code used in `x86_64` to model function calls. But you can finely model functions. For example, suppose you are analysing code on `x86_32` with `stdcall` convention. Suppose you know the callee clean its stack arguments. Suppose as well you know for each function how many arguments it has. You can then customize the model to match the callee and compute the correct stack modification, as well as getting the arguments from stack:\n",
"\n",
"\n",
"\n"
Expand Down
4 changes: 2 additions & 2 deletions doc/locationdb/locationdb.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"metadata": {},
"source": [
"# LocationDB object \n",
"The `LocationDB` is the Miasm object responsible of the symbols' management. A `Location` is an object representing a code or data (or anywhere else) position. As the name explicits it, the `LocationDB` is a database of locations. Here are some rules:\n",
"The `LocationDB` is the Miasm object responsible of the symbols' management. A `Location` is an object representing a code or data (or anywhere else) position. As the name says, the `LocationDB` is a database of locations. Here are some rules:\n",
"- each location has exactly *one* associated `LocKey`\n",
"- a `LocKey` is linked to a unique `LocationDB` (and must not be used in another `LocationDB`)\n",
"- a `LocKey` is very similar to primary key object in a database.\n",
"- a `LocKey` can have an optional *offset*.\n",
"- a `LocKey` can have multiple symbol names\n",
"- two `Lockey`s cannot share an identic offset\n",
"- two `Lockey`s cannot share an identical offset\n",
"- two `LocKey`s cannot share a symbol name\n",
"\n",
"Below are manipulations of the `LocationDB`"
Expand Down
2 changes: 1 addition & 1 deletion example/disasm/dis_binary.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
loc_db = LocationDB()

# The Container will provide a *bin_stream*, bytes source for the disasm engine
# It will prodive a view from a PE or an ELF.
# It will provide a view from a PE or an ELF.
cont = Container.from_stream(fdesc, loc_db)

# The Machine, instantiated with the detected architecture, will provide tools
Expand Down
8 changes: 4 additions & 4 deletions miasm/analysis/data_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -1910,7 +1910,7 @@ def __ne__(self, other):

def may_interfer(self, dsts, src):
"""
Return True is @src may interfer with expressions in @dsts
Return True if @src may interfere with expressions in @dsts
@dsts: Set of Expressions
@src: expression to test
"""
Expand Down Expand Up @@ -2085,7 +2085,7 @@ def eval_assignblock(self, assignblock):
to_del = set()
for node in list(classes.nodes()):
if self.may_interfer(dsts, node):
# Interfer with known equivalence class
# Interfere with known equivalence class
self.equivalence_classes.del_element(node)
if node.is_id() or node.is_mem():
self.undefined.add(node)
Expand Down Expand Up @@ -2137,7 +2137,7 @@ def merge(self, other):
undefined = set(node for node in self.undefined if node.is_id() or node.is_mem())
undefined.update(set(node for node in other.undefined if node.is_id() or node.is_mem()))
# Should we compute interference between srcs and undefined ?
# Nop => should already interfer in other state
# Nop => should already interfere in other state
components1 = classes1.get_classes()
components2 = classes2.get_classes()

Expand Down Expand Up @@ -2173,7 +2173,7 @@ def merge(self, other):
continue
if common:
# Intersection contains multiple nodes
# Here, common nodes don't interfer with any undefined
# Here, common nodes don't interfere with any undefined
nodes_ok.update(common)
out.append(common)
diff = component1.difference(common)
Expand Down
2 changes: 1 addition & 1 deletion miasm/arch/mep/regs.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
csr_exprs, csr_inits, csr_infos = gen_regs(csr_names, globals())

# Define aliases to control/special registers
PC = csr_exprs[0] # Program Conter. On MeP, it is the special register R0
PC = csr_exprs[0] # Program Counter. On MeP, it is the special register R0
LP = csr_exprs[1] # Link Pointer. On MeP, it is the special register R1
SAR = csr_exprs[2] # Shift Amount Register. On MeP, it is the special register R2
RPB = csr_exprs[4] # Repeat Begin. On MeP, it is the special register R4
Expand Down
2 changes: 1 addition & 1 deletion miasm/arch/x86/sem.py
Original file line number Diff line number Diff line change
Expand Up @@ -5057,7 +5057,7 @@ def ldmxcsr(ir, instr, dst):


def _select4(src, control):
# Implementation inspired from Intel Intrisics Guide
# Implementation inspired from Intel Intrinsics Guide
# @control is already resolved (was an immediate)

if control == 0:
Expand Down
6 changes: 3 additions & 3 deletions miasm/expression/expression_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def merge_sliceto_slice(expr):
def is_pure_int(e):
"""
return True if expr is only composed with integers
[!] ExprCond returns True is src1 and src2 are integers
[!] ExprCond returns True if src1 and src2 are integers
"""
def modify_cond(e):
if isinstance(e, m2_expr.ExprCond):
Expand Down Expand Up @@ -344,7 +344,7 @@ class ExprRandom(object):
compose_max_layer = 5
# Maximum size of memory address in bits
memory_max_address_size = 32
# Re-use already generated elements to mimic a more realistic behavior
# Reuse already generated elements to mimic a more realistic behavior
reuse_element = True
generated_elements = {} # (depth, size) -> [Expr]

Expand Down Expand Up @@ -450,7 +450,7 @@ def _gen(cls, size=32, depth=1):
if not cls.perfect_tree:
depth = random.randint(max(0, depth - 2), depth)

# Element re-use
# Element reuse
if cls.reuse_element and random.choice([True, False]) and \
(depth, size) in cls.generated_elements:
return random.choice(cls.generated_elements[(depth, size)])
Expand Down
2 changes: 1 addition & 1 deletion miasm/jitter/jitload.py
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ def init_stack(self):
def get_exception(self):
return self.cpu.get_exception() | self.vm.get_exception()

# commun functions
# common functions
def get_c_str(self, addr, max_char=None):
"""Get C str from vm.
@addr: address in memory
Expand Down
2 changes: 1 addition & 1 deletion miasm/loader/pe.py
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,7 @@ def get_funcrva(self, func):
if isfromva(tmp_thunk[j].rva & 0x7FFFFFFF) == func:
return isfromva(entry.firstthunk) + j * 4
else:
raise ValueError('unknown func tpye %r' % func)
raise ValueError('unknown func type %r' % func)

def get_funcvirt(self, addr):
rva = self.get_funcrva(addr)
Expand Down
2 changes: 1 addition & 1 deletion test/arch/mep/ir/test_loadstore.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def test_sw(self):
[(ExprMem(ExprInt(0x1010, 32), 32), ExprInt(0xABC7, 32))])

def test_lb(self):
"""Test LB executon"""
"""Test LB execution"""

# LB Rn,(Rm)
exec_instruction("LB R1, (R2)",
Expand Down

0 comments on commit 1ba37c3

Please sign in to comment.