Enable exceptions, update to optimized newlib, migrate to new toolchain

cores/esp8266/abi.cpp

@@ -28,36 +28,6 @@ using __cxxabiv1::__guard;
 extern void *umm_last_fail_alloc_addr;
 extern int umm_last_fail_alloc_size;
 
-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;
-    }
-    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;
-    }
-    return ret;
-}
-
-void operator delete(void * ptr)
-{
-    free(ptr);
-}
-
-void operator delete[](void * ptr)
-{
-    free(ptr);
-}
-
 extern "C" void __cxa_pure_virtual(void) __attribute__ ((__noreturn__));
 extern "C" void __cxa_deleted_virtual(void) __attribute__ ((__noreturn__));
 
@@ -98,53 +68,5 @@ extern "C" void __cxa_guard_abort(__guard* pg)
     xt_wsr_ps(reinterpret_cast<guard_t*>(pg)->ps);
 }
 
-
-namespace std
-{
-void __throw_bad_function_call()
-{
-    panic();
-}
-
-void __throw_length_error(char const*)
-{
-    panic();
-}
-
-void __throw_bad_alloc()
-{
-    panic();
-}
-
-void __throw_logic_error(const char* str)
-{
-    (void) str;
-    panic();
-}
-
-void __throw_out_of_range(const char* str)
-{
-    (void) str;
-    panic();
-}
-
-void __throw_bad_cast(void)
-{
-    panic();
-}
-
-void __throw_ios_failure(const char* str)
-{
-    (void) str;
-    panic();
-}
-
-void __throw_runtime_error(const char* str)
-{
-    (void) str;
-    panic();
-}
-} // namespace std
-
 // TODO: rebuild windows toolchain to make this unnecessary:
 void* __dso_handle;

cores/esp8266/core_esp8266_main.cpp

@@ -134,13 +134,27 @@ static void loop_task(os_event_t *events) {
         panic();
     }
 }
+extern "C" {
+
+struct object { long placeholder[ 10 ]; };
+void __register_frame_info (const void *begin, struct object *ob);
+extern char __eh_frame[];
+}
 
 static void do_global_ctors(void) {
+    static struct object ob;
+    __register_frame_info( __eh_frame, &ob );
+
     void (**p)(void) = &__init_array_end;
     while (p != &__init_array_start)
         (*--p)();
 }
 
+void __gnu_cxx::__verbose_terminate_handler ()
+{
+      panic();
+}
+
 void init_done() {
     system_set_os_print(1);
     gdb_init();

cores/esp8266/libc_replacements.c

@@ -124,8 +124,3 @@ void _exit(int status) {
     (void) status;
     abort();
 }
-
-int atexit(void (*func)()) {
-    (void) func;
-    return 0;
-}

platform.txt

@@ -43,7 +43,7 @@ compiler.c.elf.cmd=xtensa-lx106-elf-gcc
 compiler.c.elf.libs=-lhal -lphy -lpp -lnet80211 {build.lwip_lib} -lwpa -lcrypto -lmain -lwps -lbearssl -laxtls -lespnow -lsmartconfig -lairkiss -lwpa2 -lstdc++ -lm -lc -lgcc
 
 compiler.cpp.cmd=xtensa-lx106-elf-g++
-compiler.cpp.flags=-c {compiler.warning_flags} -Os -g -mlongcalls -mtext-section-literals -fno-exceptions -fno-rtti -falign-functions=4 -std=c++11 -MMD -ffunction-sections -fdata-sections
+compiler.cpp.flags=-c {compiler.warning_flags} -Os -g -mlongcalls -mtext-section-literals -fno-rtti -falign-functions=4 -std=c++11 -MMD -ffunction-sections -fdata-sections
 
 compiler.as.cmd=xtensa-lx106-elf-as
 

tools/platformio-build.py

@@ -75,7 +75,6 @@ def scons_patched_match_splitext(path, suffixes=None):
 
     CXXFLAGS=[
         "-fno-rtti",
-        "-fno-exceptions",
         "-std=c++11"
     ],
 

tools/sdk/ld/eagle.app.v6.common.ld.h

@@ -102,12 +102,23 @@ SECTIONS
 #ifdef VTABLES_IN_FLASH
     *(.rodata._ZTV*) /* C++ vtables */
 #endif
+    /* Exception stuff */
+    *(.rodata._ZTIN*)
+    *(.rodata._ZTSN*)
+    *(.rodata._ZZSt*)
+    *(.rodata._ZTISt*)
+    *(.rodata._ZTIN*)
+    *(.rodata._ZTSSt*)
+
+    *libgcc.a:unwind-dw2.o(.literal .text .rodata .literal.* .text.* .rodata.*)
+    *libgcc.a:unwind-dw2-fde.o(.literal .text .rodata .literal.* .text.* .rodata.*)
+
     *libc.a:(.literal .text .literal.* .text.*)
     *libm.a:(.literal .text .literal.* .text.*)
     *libgcc.a:_umoddi3.o(.literal .text)
     *libgcc.a:_udivdi3.o(.literal .text)
+    *libstdc++.a:( .literal .text .literal.* .text.*)
     *libsmartconfig.a:(.literal .text .literal.* .text.*)
-    *libstdc++.a:(.literal .text .literal.* .text.*)
     *liblwip_gcc.a:(.literal .text .literal.* .text.*)
     *liblwip_src.a:(.literal .text .literal.* .text.*)
     *liblwip2-536.a:(.literal .text .literal.* .text.*)
@@ -130,6 +141,14 @@ SECTIONS
     *libwpa2.a:(.literal.* .text.*)
     *libwps.a:(.literal.* .text.*)
     *(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom0.text.* .irom.text .irom.text.*)
+
+    . = ALIGN(4);
+    *(.gcc_except_table .gcc_except_table.*)
+    . = ALIGN(4);
+    __eh_frame = ABSOLUTE(.);
+    KEEP(*(.eh_frame))
+    . = (. + 7) & ~ 3;  /* Add a 0 entry to terminate the list */
+
     _irom0_text_end = ABSOLUTE(.);
     _flash_code_end = ABSOLUTE(.);
   } >irom0_0_seg :irom0_0_phdr