diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2021-04-09 18:19:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-09 18:19:42 +0200 |
| commit | 0a37f1cc30f9d31b1cc4b3cae353d134a66a1ffc (patch) | |
| tree | acea39fed7c69642c71a6ba0db7928d4c31044f5 /src/libtools | |
| parent | 0e0f1e203747a3b7a625d1d57d47036c796bc7f7 (diff) | |
| parent | 70018a774bf7411ef7550aa4fb3eb153d17dcfd6 (diff) | |
| download | box64-0a37f1cc30f9d31b1cc4b3cae353d134a66a1ffc.tar.gz box64-0a37f1cc30f9d31b1cc4b3cae353d134a66a1ffc.zip | |
Merge pull request #3 from rajdakin/exitFix
box64 exit fix
Diffstat (limited to 'src/libtools')
| -rwxr-xr-x | src/libtools/signals.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libtools/signals.c b/src/libtools/signals.c index 6b936f18..a0126748 100755 --- a/src/libtools/signals.c +++ b/src/libtools/signals.c @@ -267,7 +267,7 @@ static void sigstack_key_alloc() { uint64_t RunFunctionHandler(int* exit, uintptr_t fnc, int nargs, ...) { if(fnc==0 || fnc==1) { - printf_log(LOG_NONE, "BOX86: Warning, calling Signal function handler %s\n", fnc?"SIG_DFL":"SIG_IGN"); + printf_log(LOG_NONE, "BOX64: Warning, calling Signal function handler %s\n", fnc?"SIG_DFL":"SIG_IGN"); return 0; } #ifdef HAVE_TRACE @@ -561,7 +561,7 @@ void my_sigactionhandler_oldcode(int32_t sig, siginfo_t* info, void * ucntx, int } else { sigcontext->uc_mcontext.gregs[X64_TRAPNO] = (info->si_code == SEGV_ACCERR)?13:14; //X64_ERR seems to be INT:8 CODE:8. So for write access segfault it's 0x0002 For a read it's 0x0004 (and 8 for exec). For an int 2d it could be 0x2D01 for example - sigcontext->uc_mcontext.gregs[X64_ERR] = 0x0004; // read error? there is no execute control in box86 anyway + sigcontext->uc_mcontext.gregs[X64_ERR] = 0x0004; // read error? there is no execute control in box64 anyway } if(info->si_code == SEGV_ACCERR && old_code) *old_code = -1; |