diff --git a/Libraries/LibC/Makefile b/Libraries/LibC/Makefile index ee3996b7ba..718ca90db5 100644 --- a/Libraries/LibC/Makefile +++ b/Libraries/LibC/Makefile @@ -53,7 +53,8 @@ LIBC_OBJS = \ libgen.o \ wchar.o \ serenity.o \ - syslog.o + syslog.o \ + cxxabi.o OBJS = $(AK_OBJS) $(LIBC_OBJS) diff --git a/Libraries/LibC/crt0.cpp b/Libraries/LibC/crt0.cpp index 5d03ca9ca7..f3f31ec653 100644 --- a/Libraries/LibC/crt0.cpp +++ b/Libraries/LibC/crt0.cpp @@ -3,8 +3,6 @@ #include #include -//#define GLOBAL_DTORS_DEBUG - extern "C" { int main(int, char**, char**); @@ -51,58 +49,6 @@ int _start(int argc, char** argv, char** env) ASSERT_NOT_REACHED(); } -typedef void (*AtExitFunction)(void *); - -struct __exit_entry -{ - AtExitFunction method; - void* parameter; - void* dso_handle; - bool has_been_called; -}; - -static __exit_entry __exit_entries[1024]{}; -static int __exit_entry_count = 0; - -int __cxa_atexit(AtExitFunction exit_function, void *parameter, void *dso_handle) -{ - if (__exit_entry_count >= 1024) - return -1; - - __exit_entries[__exit_entry_count++] = { exit_function, parameter, dso_handle, false}; - - return 0; -} - -void __cxa_finalize(void* dso_handle) -{ - // From the itanium abi, https://itanium-cxx-abi.github.io/cxx-abi/abi.html#dso-dtor-runtime-api - // - // When __cxa_finalize(d) is called, it should walk the termination function list, calling each in turn - // if d matches __dso_handle for the termination function entry. If d == NULL, it should call all of them. - // Multiple calls to __cxa_finalize shall not result in calling termination function entries multiple times; - // the implementation may either remove entries or mark them finished. - - int entry_index = __exit_entry_count; - -#ifdef GLOBAL_DTORS_DEBUG - dbgprintf("__cxa_finalize: %d entries in the finalizer list\n", entry_index); -#endif - - while (--entry_index >= 0) - { - auto& exit_entry = __exit_entries[entry_index]; - bool needs_calling = !exit_entry.has_been_called && (!dso_handle || dso_handle == exit_entry.dso_handle); - if (needs_calling) { -#ifdef GLOBAL_DTORS_DEBUG - dbgprintf("__cxa_finalize: calling entry[%d] %p(%p) dso: %p\n", entry_index, exit_entry.method, exit_entry.parameter, exit_entry.dso_handle); -#endif - exit_entry.method(exit_entry.parameter); - exit_entry.has_been_called = true; - } - } -} - extern u32 __stack_chk_guard; u32 __stack_chk_guard = (u32)0xc0000c13; diff --git a/Libraries/LibC/cxxabi.cpp b/Libraries/LibC/cxxabi.cpp new file mode 100644 index 0000000000..64553ff301 --- /dev/null +++ b/Libraries/LibC/cxxabi.cpp @@ -0,0 +1,60 @@ +#include +#include +#include +#include + +//#define GLOBAL_DTORS_DEBUG + +extern "C" { + +typedef void (*AtExitFunction)(void*); + +struct __exit_entry { + AtExitFunction method; + void* parameter; + void* dso_handle; + bool has_been_called; +}; + +static __exit_entry __exit_entries[1024] {}; +static int __exit_entry_count = 0; + +int __cxa_atexit(AtExitFunction exit_function, void* parameter, void* dso_handle) +{ + if (__exit_entry_count >= 1024) + return -1; + + __exit_entries[__exit_entry_count++] = { exit_function, parameter, dso_handle, false }; + + return 0; +} + +void __cxa_finalize(void* dso_handle) +{ + // From the itanium abi, https://itanium-cxx-abi.github.io/cxx-abi/abi.html#dso-dtor-runtime-api + // + // When __cxa_finalize(d) is called, it should walk the termination function list, calling each in turn + // if d matches __dso_handle for the termination function entry. If d == NULL, it should call all of them. + // Multiple calls to __cxa_finalize shall not result in calling termination function entries multiple times; + // the implementation may either remove entries or mark them finished. + + int entry_index = __exit_entry_count; + +#ifdef GLOBAL_DTORS_DEBUG + dbgprintf("__cxa_finalize: %d entries in the finalizer list\n", entry_index); +#endif + + while (--entry_index >= 0) { + auto& exit_entry = __exit_entries[entry_index]; + bool needs_calling = !exit_entry.has_been_called && (!dso_handle || dso_handle == exit_entry.dso_handle); + if (needs_calling) { +#ifdef GLOBAL_DTORS_DEBUG + dbgprintf("__cxa_finalize: calling entry[%d] %p(%p) dso: %p\n", entry_index, exit_entry.method, exit_entry.parameter, exit_entry.dso_handle); +#endif + exit_entry.method(exit_entry.parameter); + exit_entry.has_been_called = true; + } + } +} + +} // extern "C"