apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

libc: Actually implement sigsetjmp() and siglongjmp()

Browse Source
This commit is contained in:
apio 2023-07-24 19:39:22 +02:00
parent c6d91c89cd
commit 905e71527e
Signed by: apio
GPG Key ID: B8A7D06E42258954
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libc/include/bits/setjmp-types.h
View File

@ -5,6 +5,7 @@
#include <bits/fixed-size-types.h> #include <bits/fixed-size-types.h>
#include <bits/platform.h> #include <bits/platform.h>
#include <bits/signal.h>
#ifndef _SETJMP_H #ifndef _SETJMP_H
#error "Never use bits/setjmp-types.h directly; include setjmp.h instead." #error "Never use bits/setjmp-types.h directly; include setjmp.h instead."
@ -12,7 +13,13 @@
#ifdef __libc_arch_x86_64 #ifdef __libc_arch_x86_64
typedef __u64_t jmp_buf[8]; typedef __u64_t jmp_buf[8];
typedef __u64_t sigjmp_buf[8]; typedef struct
{
jmp_buf buf;
sigset_t set;
int saved;
} __sigjmp_buf_tag;
typedef __sigjmp_buf_tag sigjmp_buf[1];
#else #else
#error "Unsupported architecture." #error "Unsupported architecture."
#endif #endif

4
libc/include/setjmp.h
View File

@ -14,13 +14,13 @@ extern "C"
/* Saves the current execution state in env. */ /* Saves the current execution state in env. */
int setjmp(jmp_buf env); int setjmp(jmp_buf env);
/* Right now, does the exact same thing as setjmp() (savesigs is ignored), since signals are not implemented. */ /* Saves the current execution state (and optionally, the current signal mask) in env. */
int sigsetjmp(sigjmp_buf env, int savesigs); int sigsetjmp(sigjmp_buf env, int savesigs);
/* Restores the execution state saved in env by a setjmp() call. */ /* Restores the execution state saved in env by a setjmp() call. */
__noreturn void longjmp(jmp_buf env, int val); __noreturn void longjmp(jmp_buf env, int val);
/* Right now, does the exact same as longjmp(), since signals are not implemented. */ /* Restores the execution state saved in env by a sigsetjmp() call. */
__noreturn void siglongjmp(sigjmp_buf env, int val); __noreturn void siglongjmp(sigjmp_buf env, int val);
#ifdef __cplusplus #ifdef __cplusplus

9
libc/src/setjmp.cpp
View File

@ -1,14 +1,17 @@
#include <setjmp.h> #include <setjmp.h>
#include <signal.h>
extern "C" extern "C"
{ {
int sigsetjmp(sigjmp_buf env, int) int sigsetjmp(sigjmp_buf env, int savesigs)
{ {
return setjmp(env); if (savesigs) env->saved = 1, sigprocmask(0, nullptr, &env->set);
return setjmp(env->buf);
} }
__noreturn void siglongjmp(sigjmp_buf env, int val) __noreturn void siglongjmp(sigjmp_buf env, int val)
{ {
longjmp(env, val); if (env->saved) sigprocmask(SIG_SETMASK, &env->set, nullptr);
longjmp(env->buf, val);
} }
} }