mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 23:27:35 +00:00
Kernel+LibC: Clean up how assertions work in the kernel and LibC
This also brings LibC's abort() function closer to the spec.
This commit is contained in:
parent
33a9b2a3c3
commit
f033416893
13 changed files with 36 additions and 73 deletions
|
@ -48,13 +48,12 @@ void __assertion_failed(const char* msg)
|
|||
{ msg, strlen(msg) },
|
||||
};
|
||||
syscall(SC_set_coredump_metadata, ¶ms);
|
||||
syscall(SC_abort);
|
||||
for (;;) { }
|
||||
abort();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void __crash()
|
||||
void _abort()
|
||||
{
|
||||
asm volatile("ud2");
|
||||
__builtin_unreachable();
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
__BEGIN_DECLS
|
||||
|
||||
#ifdef DEBUG
|
||||
__attribute__((noreturn)) void __assertion_failed(const char* msg);
|
||||
[[noreturn]] void __assertion_failed(const char* msg);
|
||||
# define __stringify_helper(x) # x
|
||||
# define __stringify(x) __stringify_helper(x)
|
||||
# define assert(expr) \
|
||||
|
@ -42,12 +42,11 @@ __attribute__((noreturn)) void __assertion_failed(const char* msg);
|
|||
# define VERIFY_NOT_REACHED() assert(false)
|
||||
#else
|
||||
# define assert(expr) ((void)(0))
|
||||
# define VERIFY_NOT_REACHED() CRASH()
|
||||
# define VERIFY_NOT_REACHED() _abort()
|
||||
#endif
|
||||
|
||||
__attribute__((noreturn)) void __crash();
|
||||
[[noreturn]] void _abort();
|
||||
|
||||
#define CRASH() __crash()
|
||||
#define VERIFY assert
|
||||
#define TODO VERIFY_NOT_REACHED
|
||||
|
||||
|
|
|
@ -249,8 +249,12 @@ void abort()
|
|||
// For starters, send ourselves a SIGABRT.
|
||||
raise(SIGABRT);
|
||||
// If that didn't kill us, try harder.
|
||||
raise(SIGKILL);
|
||||
_exit(127);
|
||||
sigset_t set;
|
||||
sigemptyset(&set);
|
||||
sigaddset(&set, SIGABRT);
|
||||
sigprocmask(SIG_UNBLOCK, &set, nullptr);
|
||||
raise(SIGABRT);
|
||||
_abort();
|
||||
}
|
||||
|
||||
static HashTable<const char*> s_malloced_environment_variables;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue