wacked/hook_tests
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify _loop so that the "prologe" is shorter and the jump is back into

Browse Source 
the first < 5 bytes
This commit is contained in:
aaaaaa aaaaaaa
2018-01-03 21:35:00 +01:00
parent 8989abafd2
commit 2048bdb6e1
10 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test_cases/backwards.asm
View File

@@ -6,16 +6,13 @@ use64
public _loop public _loop
_loop: _loop:
xor eax, eax mov rax, rcx
inc eax @loop_loop:
mov rbx, rdx ; RDX is overwritten by mul
@again:
cmp rbx, 0
je @loop_end
mul rcx mul rcx
dec rbx nop
jmp @again nop
@loop_end: nop
loop @loop_loop ; lol
ret ret
public _tail_recursion public _tail_recursion

5
test_cases/backwards.h
View File

@@ -1,12 +1,11 @@
#pragma once #pragma once
extern "C" { extern "C" {
/** /**
* Raises @num @cnt times * $$ x*x * (x-1)! $$
* *
* @param num
* @param cnt * @param cnt
*/ */
uint32_t _loop(uint32_t num, uint32_t cnt); uint32_t _loop(uint32_t x);
/** /**
* Computes factorial * Computes factorial

8
test_cases/main.cpp
View File

@@ -32,10 +32,10 @@ TEST_CASE("Advanced instruction functions work as expected, unhokked") {
} }
TEST_CASE("Loops & tail recursion work as expected, unhook") { TEST_CASE("Loops & tail recursion work as expected, unhook") {
REQUIRE(_loop(2, 3) == 8); REQUIRE(_loop(1) == 1);
REQUIRE(_loop(5, 3) == 125); REQUIRE(_loop(2) == 4);
REQUIRE(_loop(5, 0) == 1); REQUIRE(_loop(3) == 18);
REQUIRE(_loop(5, 1) == 5); REQUIRE(_loop(5) == 25*24);
REQUIRE(_tail_recursion(0) == 1); REQUIRE(_tail_recursion(0) == 1);
REQUIRE(_tail_recursion(1) == 1); REQUIRE(_tail_recursion(1) == 1);

4
tester/mhook.cpp
View File

@@ -49,10 +49,10 @@ uint32_t MHook_Hooks::hookRDRAND(void) {
return trueRDRAND(); return trueRDRAND();
} }
uint32_t MHook_Hooks::hookLoop(uint32_t num, uint32_t cnt) { uint32_t MHook_Hooks::hookLoop(uint32_t x) {
g_mhook->loop = true; g_mhook->loop = true;
return trueLoop(num, cnt); return trueLoop(x);
} }
uint32_t MHook_Hooks::hookTail_recursion(uint32_t x) { uint32_t MHook_Hooks::hookTail_recursion(uint32_t x) {

4
tester/mhook.h
View File

@@ -6,7 +6,7 @@ namespace MHook_Hooks {
uint64_t hookRip_relative(void); uint64_t hookRip_relative(void);
void hookAVX(float num, void* res); void hookAVX(float num, void* res);
uint32_t hookRDRAND(void); uint32_t hookRDRAND(void);
uint32_t hookLoop(uint32_t num, uint32_t cnt); uint32_t hookLoop(uint32_t x);
uint32_t hookTail_recursion(uint32_t x); uint32_t hookTail_recursion(uint32_t x);
}; };
@@ -25,6 +25,6 @@ public:
friend void MHook_Hooks::hookAVX(float num, void* res); friend void MHook_Hooks::hookAVX(float num, void* res);
friend uint32_t MHook_Hooks::hookRDRAND(void); friend uint32_t MHook_Hooks::hookRDRAND(void);
friend uint32_t MHook_Hooks::hookLoop(uint32_t num, uint32_t cnt); friend uint32_t MHook_Hooks::hookLoop(uint32_t x);
friend uint32_t MHook_Hooks::hookTail_recursion(uint32_t x); friend uint32_t MHook_Hooks::hookTail_recursion(uint32_t x);
}; };

4
tester/minhook.cpp
View File

@@ -50,10 +50,10 @@ uint32_t MinHook_Hooks::hookRDRAND(void) {
return trueRDRAND(); return trueRDRAND();
} }
uint32_t MinHook_Hooks::hookLoop(uint32_t num, uint32_t cnt) { uint32_t MinHook_Hooks::hookLoop(uint32_t x) {
g_MinHook->loop = true; g_MinHook->loop = true;
return trueLoop(num, cnt); return trueLoop(x);
} }
uint32_t MinHook_Hooks::hookTail_recursion(uint32_t x) { uint32_t MinHook_Hooks::hookTail_recursion(uint32_t x) {

4
tester/minhook.h
View File

@@ -6,7 +6,7 @@ namespace MinHook_Hooks {
uint64_t hookRip_relative(void); uint64_t hookRip_relative(void);
void hookAVX(float num, void* res); void hookAVX(float num, void* res);
uint32_t hookRDRAND(void); uint32_t hookRDRAND(void);
uint32_t hookLoop(uint32_t num, uint32_t cnt); uint32_t hookLoop(uint32_t x);
uint32_t hookTail_recursion(uint32_t x); uint32_t hookTail_recursion(uint32_t x);
}; };
@@ -28,6 +28,6 @@ public:
friend void MinHook_Hooks::hookAVX(float num, void* res); friend void MinHook_Hooks::hookAVX(float num, void* res);
friend uint32_t MinHook_Hooks::hookRDRAND(void); friend uint32_t MinHook_Hooks::hookRDRAND(void);
friend uint32_t MinHook_Hooks::hookLoop(uint32_t num, uint32_t cnt); friend uint32_t MinHook_Hooks::hookLoop(uint32_t x);
friend uint32_t MinHook_Hooks::hookTail_recursion(uint32_t x); friend uint32_t MinHook_Hooks::hookTail_recursion(uint32_t x);
}; };

4
tester/polyhook.cpp
View File

@@ -49,10 +49,10 @@ uint32_t PolyHook_Hooks::hookRDRAND(void) {
return trueRDRAND(); return trueRDRAND();
} }
uint32_t PolyHook_Hooks::hookLoop(uint32_t num, uint32_t cnt) { uint32_t PolyHook_Hooks::hookLoop(uint32_t x) {
g_PolyHook->loop = true; g_PolyHook->loop = true;
return trueLoop(num, cnt); return trueLoop(x);
} }
uint32_t PolyHook_Hooks::hookTail_recursion(uint32_t x) { uint32_t PolyHook_Hooks::hookTail_recursion(uint32_t x) {

4
tester/polyhook.h
View File

@@ -6,7 +6,7 @@ namespace PolyHook_Hooks {
uint64_t hookRip_relative(void); uint64_t hookRip_relative(void);
void hookAVX(float num, void* res); void hookAVX(float num, void* res);
uint32_t hookRDRAND(void); uint32_t hookRDRAND(void);
uint32_t hookLoop(uint32_t num, uint32_t cnt); uint32_t hookLoop(uint32_t x);
uint32_t hookTail_recursion(uint32_t x); uint32_t hookTail_recursion(uint32_t x);
}; };
@@ -58,6 +58,6 @@ public:
friend void PolyHook_Hooks::hookAVX(float num, void* res); friend void PolyHook_Hooks::hookAVX(float num, void* res);
friend uint32_t PolyHook_Hooks::hookRDRAND(void); friend uint32_t PolyHook_Hooks::hookRDRAND(void);
friend uint32_t PolyHook_Hooks::hookLoop(uint32_t num, uint32_t cnt); friend uint32_t PolyHook_Hooks::hookLoop(uint32_t num);
friend uint32_t PolyHook_Hooks::hookTail_recursion(uint32_t x); friend uint32_t PolyHook_Hooks::hookTail_recursion(uint32_t x);
}; };

2
tester/typedefs.h
View File

@@ -11,6 +11,6 @@ typedef void (*TypeAVX)(float num, void* res);
typedef uint32_t (*TypeRDRAND)(void); typedef uint32_t (*TypeRDRAND)(void);
typedef uint32_t (*TypeLoop)(uint32_t num, uint32_t cnt); typedef uint32_t (*TypeLoop)(uint32_t num);
typedef uint32_t (*TypeTailRecursion)(uint32_t x); typedef uint32_t (*TypeTailRecursion)(uint32_t x);