Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

operator new / new[] exception #8717

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

operator new / new[] exception #8717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions cores/esp8266/abi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,61 +24,9 @@
using __cxxabiv1::__guard;

// Debugging helper, last allocation which returned NULL
extern void *umm_last_fail_alloc_addr;
extern int umm_last_fail_alloc_size;

extern "C" void __cxa_pure_virtual(void) __attribute__ ((__noreturn__));
extern "C" void __cxa_deleted_virtual(void) __attribute__ ((__noreturn__));


#if !defined(__cpp_exceptions)

// overwrite weak operators new/new[] definitions

void* operator new(size_t size)
{
void *ret = malloc(size);
if (0 != size && 0 == ret) {
umm_last_fail_alloc_addr = __builtin_return_address(0);
umm_last_fail_alloc_size = size;
__unhandled_exception(PSTR("OOM"));
}
return ret;
}

void* operator new[](size_t size)
{
void *ret = malloc(size);
if (0 != size && 0 == ret) {
umm_last_fail_alloc_addr = __builtin_return_address(0);
umm_last_fail_alloc_size = size;
__unhandled_exception(PSTR("OOM"));
}
return ret;
}

void* operator new (size_t size, const std::nothrow_t&)
{
void *ret = malloc(size);
if (0 != size && 0 == ret) {
umm_last_fail_alloc_addr = __builtin_return_address(0);
umm_last_fail_alloc_size = size;
}
return ret;
}

void* operator new[] (size_t size, const std::nothrow_t&)
{
void *ret = malloc(size);
if (0 != size && 0 == ret) {
umm_last_fail_alloc_addr = __builtin_return_address(0);
umm_last_fail_alloc_size = size;
}
return ret;
}

#endif // !defined(__cpp_exceptions)

void __cxa_pure_virtual(void)
{
panic();
Expand Down
11 changes: 11 additions & 0 deletions cores/esp8266/core_esp8266_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,20 @@ static void __unhandled_exception_cpp()
}
}

extern void *umm_last_fail_alloc_addr;
extern int umm_last_fail_alloc_size;

static void __new_handler() {
umm_last_fail_alloc_addr = __builtin_return_address(0);
umm_last_fail_alloc_size = 0;
std::set_new_handler(nullptr);
__unhandled_exception(PSTR("OOM"));
}

void init_done() {
system_set_os_print(1);
gdb_init();
std::set_new_handler(__new_handler);
std::set_terminate(__unhandled_exception_cpp);
do_global_ctors();
esp_schedule();
Expand Down