Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LibC: merge atexit and __cxa_atexit into common function

This commit is contained in:
Bananymous 2025-04-15 22:20:40 +03:00
parent 4f49d60e4a
commit 066ed7e4a1
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
userspace/libraries/LibC/icxxabi.cpp
View File

@ -1,41 +1,39 @@
#include <BAN/Assert.h>
#include <stdint.h>
#include <stddef.h> #include <stddef.h>
#define ATEXIT_MAX_FUNCS 128 #define ATEXIT_MAX_FUNCS 128
struct atexit_func_entry_t struct atexit_func_entry_t
{ {
void(*func)(void*); void (*func)(void*);
void* arg; void* arg;
void* dso_handle; void* dso_handle;
}; };
static atexit_func_entry_t __atexit_funcs[ATEXIT_MAX_FUNCS]; static atexit_func_entry_t s_atexit_funcs[ATEXIT_MAX_FUNCS];
static size_t __atexit_func_count = 0; static size_t s_atexit_func_count = 0;
extern "C" int __cxa_atexit(void(*func)(void*), void* arg, void* dso_handle) extern "C" int __cxa_atexit(void(*func)(void*), void* arg, void* dso_handle)
{ {
if (__atexit_func_count >= ATEXIT_MAX_FUNCS) if (s_atexit_func_count >= ATEXIT_MAX_FUNCS)
return -1; return -1;
auto& atexit_func = __atexit_funcs[__atexit_func_count++]; s_atexit_funcs[s_atexit_func_count++] = {
atexit_func.func = func; .func = func,
atexit_func.arg = arg; .arg = arg,
atexit_func.dso_handle = dso_handle; .dso_handle = dso_handle,
};
return 0; return 0;
}; };
extern "C" void __cxa_finalize(void* f) extern "C" void __cxa_finalize(void* dso_handle)
{ {
for (size_t i = __atexit_func_count; i > 0; i--) for (size_t i = s_atexit_func_count; i > 0; i--)
{ {
auto& atexit_func = __atexit_funcs[i - 1]; auto& atexit_func = s_atexit_funcs[i - 1];
if (atexit_func.func == nullptr) if (atexit_func.func == nullptr)
continue; continue;
if (f == nullptr || f == atexit_func.func) if (dso_handle && dso_handle != atexit_func.dso_handle)
{ continue;
atexit_func.func(atexit_func.arg); atexit_func.func(atexit_func.arg);
atexit_func.func = nullptr; atexit_func.func = nullptr;
}
} }
}; };

14
userspace/libraries/LibC/stdlib.cpp
View File

@ -25,9 +25,6 @@ static bool s_environ_malloced = false;
extern "C" __attribute__((weak)) void _fini(); extern "C" __attribute__((weak)) void _fini();
static void (*at_exit_funcs[64])();
static uint32_t at_exit_funcs_count = 0;
void abort(void) void abort(void)
{ {
sigset_t set; sigset_t set;
@ -44,8 +41,6 @@ void abort(void)
void exit(int status) void exit(int status)
{ {
for (uint32_t i = at_exit_funcs_count; i > 0; i--)
at_exit_funcs[i - 1]();
fflush(nullptr); fflush(nullptr);
__cxa_finalize(nullptr); __cxa_finalize(nullptr);
if (_fini) _fini(); if (_fini) _fini();
@ -65,13 +60,8 @@ int abs(int val)
int atexit(void (*func)(void)) int atexit(void (*func)(void))
{ {
if (at_exit_funcs_count > sizeof(at_exit_funcs) / sizeof(*at_exit_funcs)) void* func_addr = reinterpret_cast<void*>(func);
{ return __cxa_atexit([](void* func_ptr) { reinterpret_cast<void (*)(void)>(func_ptr)(); }, func_addr, nullptr);
errno = ENOBUFS;
return -1;
}
at_exit_funcs[at_exit_funcs_count++] = func;
return 0;
} }
static constexpr int get_base_digit(char c, int base) static constexpr int get_base_digit(char c, int base)