diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2022-03-07 14:14:07 +0100 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2022-03-07 14:14:07 +0100 |
| commit | 622baec9529bb261cd250c2c2b9768b75ee0530f (patch) | |
| tree | 45c313608b2e02fbe570a92b4113a855de25be27 /src/libtools | |
| parent | a326c821580ed2cd6665312a6d78696c5f6afcca (diff) | |
| download | box64-622baec9529bb261cd250c2c2b9768b75ee0530f.tar.gz box64-622baec9529bb261cd250c2c2b9768b75ee0530f.zip | |
Fix some special case on mmap64 wrapping
Diffstat (limited to 'src/libtools')
| -rwxr-xr-x | src/libtools/signals.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libtools/signals.c b/src/libtools/signals.c index a98b570a..e0410b1c 100755 --- a/src/libtools/signals.c +++ b/src/libtools/signals.c @@ -505,7 +505,7 @@ void my_sigactionhandler_oldcode(int32_t sig, int simple, siginfo_t* info, void sigcontext->uc_mcontext.gregs[X64_RBP] = R_RBP; sigcontext->uc_mcontext.gregs[X64_RSP] = R_RSP; sigcontext->uc_mcontext.gregs[X64_RBX] = R_RBX; - sigcontext->uc_mcontext.gregs[X64_RIP] = R_RIP;//emu->old_ip; // old_ip should be more accurate as the "current" IP, but it's not always up-to-date + sigcontext->uc_mcontext.gregs[X64_RIP] = emu->old_ip; // flags sigcontext->uc_mcontext.gregs[X64_EFL] = emu->eflags.x64; // get segments @@ -934,10 +934,7 @@ exit(-1); const char* x64name = NULL; const char* elfname = NULL; x64emu_t* emu = thread_get_emu(); - // Adjust RIP for special case of NULL function run - if(sig==SIGSEGV && R_RIP==0x1 && (uintptr_t)info->si_addr==0x0) - R_RIP = 0x0; - x64pc = R_RIP; + x64pc = emu->old_ip; rsp = (void*)R_RSP; #if defined(DYNAREC) #if defined(ARM64) |