Skip to content

Commit

Permalink
tuning values for rimi generation/execution
Browse files Browse the repository at this point in the history
  • Loading branch information
QDucasse committed Feb 7, 2024
1 parent e535c38 commit 2dd39a5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
1 change: 0 additions & 1 deletion tests/rimi/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,6 @@ def trace_reg(self, uc_emul, *args, **kwargs):

@pytest.fixture
def rimi_disasm_setup():
# FIXME: Merging dicts with the RIMI info first
disassembler = Disassembler(RIMI_INSTRUCTIONS_INFO | INSTRUCTIONS_INFO)
return disassembler

Expand Down
7 changes: 3 additions & 4 deletions tests/rimi/test_rimi_generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
[
(50, 5, 0, 0.2, 0.1, 0.2, 0.01, 1),
(200, 10, 0.2, 0.4, 0.2, 0.05, 0.2, 2),
(10000, 500, 0.5, 0.5, 0.2, 0.1, 0.02, 3),
(1000, 50, 0.5, 0.5, 0.2, 0.1, 0.02, 3),
],
)
def test_execute_shadow_stack_trampoline_generated_binaries(
Expand Down Expand Up @@ -103,7 +103,7 @@ def test_execute_shadow_stack_trampoline_generated_binaries(
[
(50, 5, 0, 0.2, 0.1, 0.2, 0.01, 1),
(200, 10, 0.2, 0.4, 0.2, 0.05, 0.2, 2),
(10000, 500, 0.5, 0.5, 0.2, 0.1, 0.02, 3),
(1000, 50, 0.5, 0.5, 0.2, 0.1, 0.02, 3),
],
)
def test_execute_full_trampoline_generated_binaries(
Expand Down Expand Up @@ -170,8 +170,7 @@ def test_execute_full_trampoline_generated_binaries(
rimi_handler.hook_exception_tracer(uc_emul)
rimi_handler.hook_handler(uc_emul)

# TODO: Rework with new trampolines!
start_address = INTERPRETER_START_ADDRESS
end_address = RET_ADDRESS

start_resumable_emulation(uc_emul, start_address, end_address) # noqa: F821
start_resumable_emulation(uc_emul, start_address, end_address)
1 change: 0 additions & 1 deletion tests/rot/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ def handle_rori(self, uc_emul, pc, instr):

@pytest.fixture
def fixer_disasm_setup():
# FIXME: Merging dicts with the ROT info first
disassembler = Disassembler(ROT_INSTRUCTIONS_INFO | INSTRUCTIONS_INFO)
return disassembler

Expand Down

0 comments on commit 2dd39a5

Please sign in to comment.