diff options
| author | Yang Liu <liuyang22@iscas.ac.cn> | 2025-04-03 21:48:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-03 15:48:04 +0200 |
| commit | 8cba915bca8d48a7ac4d9571004975320f71a7ff (patch) | |
| tree | 259c7742564658696da8f75f421e29c1ceb9bf7e /src/tools | |
| parent | cd3163a78585c35d41a18f248cb9575c46ffab38 (diff) | |
| download | box64-8cba915bca8d48a7ac4d9571004975320f71a7ff.tar.gz box64-8cba915bca8d48a7ac4d9571004975320f71a7ff.zip | |
Moved more functions to os.h (#2497)
* Removed some unused function declarations * Moved more functions to os.h * review
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/box32stack.c | 1 | ||||
| -rw-r--r-- | src/tools/box64stack.c | 1 | ||||
| -rw-r--r-- | src/tools/bridge.c | 6 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/tools/box32stack.c b/src/tools/box32stack.c index 903996c7..188b4a11 100644 --- a/src/tools/box32stack.c +++ b/src/tools/box32stack.c @@ -9,7 +9,6 @@ #include "elfloader.h" #include "debug.h" #include "emu/x64emu_private.h" -#include "emu/x64run_private.h" #include "auxval.h" #include "custommem.h" #include "box32.h" diff --git a/src/tools/box64stack.c b/src/tools/box64stack.c index ce8888e5..4db5653e 100644 --- a/src/tools/box64stack.c +++ b/src/tools/box64stack.c @@ -10,7 +10,6 @@ #include "elfloader.h" #include "debug.h" #include "emu/x64emu_private.h" -#include "emu/x64run_private.h" #include "auxval.h" #include "custommem.h" diff --git a/src/tools/bridge.c b/src/tools/bridge.c index 73ea5a7b..0c7ed4d7 100644 --- a/src/tools/bridge.c +++ b/src/tools/bridge.c @@ -239,7 +239,7 @@ const char* getBridgeName(void* addr) if(!(getProtection((uintptr_t)addr)&PROT_READ)) return NULL; onebridge_t* one = (onebridge_t*)(((uintptr_t)addr&~(sizeof(onebridge_t)-1))); // align to start of bridge - if(one->C3==0xC3 && one->S=='S' && one->C=='C') { + if (one->C3 == 0xC3 && IsBridgeSignature(one->S, one->C)) { if(one->w==NULL) return "ExitEmulation"; else @@ -302,7 +302,7 @@ void fini_bridge_helper() cleanAlternate(); } -int isNativeCall(uintptr_t addr, int is32bits, uintptr_t* calladdress, uint16_t* retn) +int isNativeCallInternal(uintptr_t addr, int is32bits, uintptr_t* calladdress, uint16_t* retn) { if (is32bits) addr &= 0xFFFFFFFFLL; @@ -319,7 +319,7 @@ int isNativeCall(uintptr_t addr, int is32bits, uintptr_t* calladdress, uint16_t* if (!addr || !getProtection(addr)) return 0; onebridge_t* b = (onebridge_t*)(addr); - if (b->CC == 0xCC && b->S == 'S' && b->C == 'C' && b->w != (wrapper_t)0 && b->f != (uintptr_t)PltResolver64) { + if (b->CC == 0xCC && IsBridgeSignature(b->S, b->C) && b->w != (wrapper_t)0 && b->f != (uintptr_t)PltResolver64) { // found ! if (retn) *retn = (b->C3 == 0xC2) ? b->N : 0; if (calladdress) *calladdress = addr + 1; |