diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2021-05-18 11:13:18 +0200 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2021-05-18 11:13:18 +0200 |
| commit | e35b25015bc457428cc27b5bfeec5c16a4dd9b22 (patch) | |
| tree | 811ebe98fcd88b2edb21c94c65d8dd4309cbd103 /src/libtools | |
| parent | 422844f84260b34d1f5da8aa99ff0d2d5247bcee (diff) | |
| download | box64-e35b25015bc457428cc27b5bfeec5c16a4dd9b22.tar.gz box64-e35b25015bc457428cc27b5bfeec5c16a4dd9b22.zip | |
Added signal mask handling in setjmp/longjmp functions
Diffstat (limited to 'src/libtools')
| -rwxr-xr-x | src/libtools/signals.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libtools/signals.c b/src/libtools/signals.c index fd5f643e..a540f282 100755 --- a/src/libtools/signals.c +++ b/src/libtools/signals.c @@ -643,13 +643,13 @@ void my_sigactionhandler_oldcode(int32_t sig, siginfo_t* info, void * ucntx, int seg = (sigcontext->uc_mcontext.gregs[X64_CSGSFS] >> 32)&0xffff; GO(FS); #undef GO - printf_log(LOG_DEBUG, "Context has been changed in Sigactionhanlder, doing longjmp to resume emu\n"); + printf_log(LOG_DEBUG, "Context has been changed in Sigactionhanlder, doing siglongjmp to resume emu\n"); if(old_code) *old_code = -1; // re-init the value to allow another segfault at the same place if(used_stack) // release stack new_ss->ss_flags = 0; relockMutex(Locks); - longjmp(ejb->jmpbuf, 1); + siglongjmp(ejb->jmpbuf, 1); } printf_log(LOG_INFO, "Warning, context has been changed in Sigactionhanlder%s\n", (sigcontext->uc_mcontext.gregs[X64_RIP]!=sigcontext_copy.uc_mcontext.gregs[X64_RIP])?" (EIP changed)":""); } @@ -753,7 +753,7 @@ void my_box64signalhandler(int32_t sig, siginfo_t* info, void * ucntx) ejb->emu->eflags.x64 = p->uc_mcontext.regs[26]; dynarec_log(LOG_DEBUG, "Auto-SMC detected, getting out of current Dynablock!\n"); relockMutex(Locks); - longjmp(ejb->jmpbuf, 2); + siglongjmp(ejb->jmpbuf, 2); } dynarec_log(LOG_INFO, "Warning, Auto-SMC (%p for db %p/%p) detected, but jmpbuffer not ready!\n", (void*)addr, db, (void*)db->x64_addr); } |