esp8266 · earlephilhower · Jul 7, 2020 · Jul 13, 2019 · Jul 13, 2019 · Jul 13, 2019
diff --git a/boards.txt b/boards.txt
diff --git a/bootloaders/eboot/Makefile b/bootloaders/eboot/Makefile
@@ -23,7 +23,7 @@ INC += -I../../tools/sdk/include -I../../tools/sdk/uzlib/src
 
 CFLAGS += -std=gnu99
 
-CFLAGS += -Os -g -Wall -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mno-text-section-literals -ffunction-sections -fdata-sections
+CFLAGS += -Os -fcommon -g -Wall -Wpointer-arith -Wno-implicit-function-declaration -Wl,-EL -fno-inline-functions -nostdlib -mlongcalls -mno-text-section-literals -ffunction-sections -fdata-sections
 
 CFLAGS += $(INC)
 

diff --git a/bootloaders/eboot/eboot.elf b/bootloaders/eboot/eboot.elf
diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h
@@ -127,14 +127,8 @@ void timer0_isr_init(void);
 void timer0_attachInterrupt(timercallback userFunc);
 void timer0_detachInterrupt(void);
 
-// undefine stdlib's abs if encountered
-#ifdef abs
-#undef abs
-#endif
-
-#define abs(x) ((x)>0?(x):-(x))
+// Use stdlib abs() and round() to avoid issues with the C++ libraries
 #define constrain(amt,low,high) ((amt)<(low)?(low):((amt)>(high)?(high):(amt)))
-#define round(x)     ((x)>=0?(long)((x)+0.5):(long)((x)-0.5))
 #define radians(deg) ((deg)*DEG_TO_RAD)
 #define degrees(rad) ((rad)*RAD_TO_DEG)
 #define sq(x) ((x)*(x))
@@ -249,6 +243,7 @@ const int TIM_DIV265 __attribute__((deprecated, weak)) = TIM_DIV256;
 
 using std::min;
 using std::max;
+using std::round;
 using std::isinf;
 using std::isnan;
 

diff --git a/cores/esp8266/StackThunk.h b/cores/esp8266/StackThunk.h
@@ -51,7 +51,7 @@ extern uint32_t stack_thunk_refcnt;
 
 // Thunking macro
 #define make_stack_thunk(fcnToThunk) \
-__asm("\n\
+__asm__ ("\n\
 .text\n\
 .literal_position\n\
 .literal .LC_STACK_VALUE"#fcnToThunk", 0xdeadbeef\n\

diff --git a/cores/esp8266/core_esp8266_features.cpp b/cores/esp8266/core_esp8266_features.cpp
@@ -37,8 +37,9 @@ void precache(void *f, uint32_t bytes) {
   // page (ie 1 word in 8) for this to work.
   #define CACHE_PAGE_SIZE 32
 
-  register uint32_t a0 asm("a0");
-  register uint32_t lines = (bytes/CACHE_PAGE_SIZE)+2;
+  uint32_t a0;
+  __asm__("mov.n %0, a0" : "=r"(a0));
+  uint32_t lines = (bytes/CACHE_PAGE_SIZE)+2;
   volatile uint32_t *p = (uint32_t*)((f ? (uint32_t)f : a0) & ~0x03);
   uint32_t x;
   for (uint32_t i=0; i<lines; i++, p+=CACHE_PAGE_SIZE/sizeof(uint32_t)) x=*p;

diff --git a/cores/esp8266/core_esp8266_main.cpp b/cores/esp8266/core_esp8266_main.cpp
@@ -172,7 +172,7 @@ extern "C" bool ets_post_rom(uint8 prio, ETSSignal sig, ETSParam par);
 
 extern "C" bool IRAM_ATTR ets_post(uint8 prio, ETSSignal sig, ETSParam par) {
   uint32_t saved;
-  asm volatile ("rsr %0,ps":"=a" (saved));
+  __asm__ __volatile__ ("rsr %0,ps":"=a" (saved));
   bool rc=ets_post_rom(prio, sig, par);
   xt_wsr_ps(saved);
   return rc;

diff --git a/cores/esp8266/core_esp8266_postmortem.cpp b/cores/esp8266/core_esp8266_postmortem.cpp
@@ -45,6 +45,8 @@ static const char* s_panic_what = 0;
 static bool s_abort_called = false;
 static const char* s_unhandled_exception = NULL;
 
+static uint32_t s_stacksmash_addr = 0;
+
 void abort() __attribute__((noreturn));
 static void uart_write_char_d(char c);
 static void uart0_write_char_d(char c);
@@ -54,6 +56,7 @@ static void print_stack(uint32_t start, uint32_t end);
 // using numbers different from "REASON_" in user_interface.h (=0..6)
 enum rst_reason_sw
 {
+    REASON_USER_STACK_SMASH = 253,
     REASON_USER_SWEXCEPTION_RST = 254
 };
 static int s_user_reset_reason = REASON_DEFAULT_RST;
@@ -147,6 +150,11 @@ void __wrap_system_restart_local() {
     else if (rst_info.reason == REASON_SOFT_WDT_RST) {
         ets_printf_P(PSTR("\nSoft WDT reset\n"));
     }
+    else if (rst_info.reason == REASON_USER_STACK_SMASH) {
+        ets_printf_P(PSTR("\nStack overflow detected.\n"));
+        ets_printf_P(PSTR("\nException (%d):\nepc1=0x%08x epc2=0x%08x epc3=0x%08x excvaddr=0x%08x depc=0x%08x\n"),
+            5 /* Alloca exception, closest thing to stack fault*/, s_stacksmash_addr, 0, 0, 0, 0);
+   }
     else {
         ets_printf_P(PSTR("\nGeneric Reset\n"));
     }
@@ -290,4 +298,20 @@ void __panic_func(const char* file, int line, const char* func) {
     raise_exception();
 }
 
+uintptr_t __stack_chk_guard = 0x08675309 ^ RANDOM_REG32;
+void __stack_chk_fail(void) {
+    s_user_reset_reason = REASON_USER_STACK_SMASH;
+    ets_printf_P(PSTR("\nPANIC: Stack overrun"));
+
+    s_stacksmash_addr = (uint32_t)__builtin_return_address(0);
+
+    if (gdb_present())
+        __asm__ __volatile__ ("syscall"); // triggers GDB when enabled
+
+    __wrap_system_restart_local();
+
+    while (1); // never reached, needed to satisfy "noreturn" attribute
+}
+
+
 };
diff --git a/cores/esp8266/core_esp8266_si2c.cpp b/cores/esp8266/core_esp8266_si2c.cpp
@@ -234,7 +234,7 @@ void ICACHE_RAM_ATTR Twi::busywait(unsigned int v)
     unsigned int i;
     for (i = 0; i < v; i++)  // loop time is 5 machine cycles: 31.25ns @ 160MHz, 62.5ns @ 80MHz
     {
-        asm("nop"); // minimum element to keep GCC from optimizing this function out.
+        __asm__ __volatile__("nop"); // minimum element to keep GCC from optimizing this function out.
     }
 }
 

diff --git a/cores/esp8266/core_esp8266_timer.cpp b/cores/esp8266/core_esp8266_timer.cpp
@@ -31,8 +31,9 @@ extern "C" {
 
 static volatile timercallback timer1_user_cb = NULL;
 
-void ICACHE_RAM_ATTR timer1_isr_handler(void *para){
+void ICACHE_RAM_ATTR timer1_isr_handler(void *para, void *frame) {
     (void) para;
+    (void) frame;
     if ((T1C & ((1 << TCAR) | (1 << TCIT))) == 0) TEIE &= ~TEIE1;//edge int disable
     T1I = 0;
     if (timer1_user_cb) {
@@ -79,8 +80,9 @@ void ICACHE_RAM_ATTR timer1_disable(){
 
 static volatile timercallback timer0_user_cb = NULL;
 
-void ICACHE_RAM_ATTR timer0_isr_handler(void* para){
+void ICACHE_RAM_ATTR timer0_isr_handler(void *para, void *frame) {
     (void) para;
+    (void) frame;
     if (timer0_user_cb) {
         // to make ISR compatible to Arduino AVR model where interrupts are disabled
         // we disable them before we call the client ISR

diff --git a/cores/esp8266/core_esp8266_wiring_digital.cpp b/cores/esp8266/core_esp8266_wiring_digital.cpp
@@ -130,8 +130,10 @@ typedef struct {
 static interrupt_handler_t interrupt_handlers[16] = { {0, 0, 0, 0}, };
 static uint32_t interrupt_reg = 0;
 
-void ICACHE_RAM_ATTR interrupt_handler(void*)
+void ICACHE_RAM_ATTR interrupt_handler(void *arg, void *frame)
 {
+  (void) arg;
+  (void) frame;
   uint32_t status = GPIE;
   GPIEC = status;//clear them interrupts
   uint32_t levels = GPI;

diff --git a/cores/esp8266/gdb_hooks.cpp b/cores/esp8266/gdb_hooks.cpp
@@ -31,6 +31,11 @@ static bool ICACHE_RAM_ATTR __gdb_no_op()
     return false;
 }
 
+// To save space, don't create a dummy no-op for each GCC, just point to the no-op
+// Need to turn off GCC's checking of parameter types or we'll get many warnings
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wattribute-alias"
+#pragma GCC diagnostic ignored "-Wmissing-attributes"
 void gdb_init(void) __attribute__ ((weak, alias("__gdb_no_op")));
 void gdb_do_break(void) __attribute__ ((weak, alias("__gdb_no_op")));
 bool gdb_present(void) __attribute__ ((weak, alias("__gdb_no_op")));
@@ -40,5 +45,6 @@ bool gdbstub_has_uart_isr_control(void) __attribute__ ((weak, alias("__gdb_no_op
 void gdbstub_set_uart_isr_callback(void (*func)(void*, uint8_t), void* arg) __attribute__ ((weak, alias("__gdb_no_op")));
 void gdbstub_write_char(char c) __attribute__ ((weak, alias("__gdb_no_op")));
 void gdbstub_write(const char* buf, size_t size) __attribute__ ((weak, alias("__gdb_no_op")));
+#pragma GCC diagnostic pop
 
 };
diff --git a/cores/esp8266/uart.cpp b/cores/esp8266/uart.cpp
@@ -371,8 +371,9 @@ uart_get_rx_buffer_size(uart_t* uart)
 
 // The default ISR handler called when GDB is not enabled
 void ICACHE_RAM_ATTR
-uart_isr(void * arg)
+uart_isr(void * arg, void * frame)
 {
+    (void) frame;
     uart_t* uart = (uart_t*)arg;
     uint32_t usis = USIS(uart->uart_nr);
 

diff --git a/...ries/GDBStub/examples/gdbstub_example.ino → ...mples/gdbstub_example/gdbstub_example.ino b/...ries/GDBStub/examples/gdbstub_example.ino → ...mples/gdbstub_example/gdbstub_example.ino
diff --git a/libraries/GDBStub/src/internal/gdbstub.c b/libraries/GDBStub/src/internal/gdbstub.c
@@ -445,7 +445,7 @@ static inline int gdbHandleCommand() {
 					writeByte(i, gdbGetHexVal(&data, 8));
 				}
 				//Make sure caches are up-to-date. Procedure according to Xtensa ISA document, ISYNC inst desc.
-				asm volatile("ISYNC\nISYNC\n");
+				__asm__ __volatile__ ("ISYNC\nISYNC\n");
 				gdbSendPacketOK();
 			} else {
 				//Trying to do a software breakpoint on a flash proc, perhaps?

diff --git a/libraries/SPISlave/src/hspi_slave.c b/libraries/SPISlave/src/hspi_slave.c
@@ -28,8 +28,9 @@ static void (*_hspi_slave_rx_status_cb)(void * arg, uint32_t data) = NULL;
 static void (*_hspi_slave_tx_status_cb)(void * arg) = NULL;
 static uint8_t _hspi_slave_buffer[33];
 
-void ICACHE_RAM_ATTR _hspi_slave_isr_handler(void *arg)
+void ICACHE_RAM_ATTR _hspi_slave_isr_handler(void *arg, void *frame)
 {
+    (void) frame;
     uint32_t status;
     uint32_t istatus;
 

diff --git a/libraries/Ticker/src/Ticker.h b/libraries/Ticker/src/Ticker.h
@@ -74,16 +74,22 @@ class Ticker
     template<typename TArg>
     void attach(float seconds, void (*callback)(TArg), TArg arg)
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-function-type"
         static_assert(sizeof(TArg) <= sizeof(void*), "attach() callback argument size must be <= sizeof(void*)");
         _attach_ms(1000UL * seconds, true, reinterpret_cast<callback_with_arg_t>(callback), reinterpret_cast<void*>(arg));
+#pragma GCC diagnostic pop
     }
 
     // callback will be called in SYS ctx when ticker fires
     template<typename TArg>
     void attach_ms(uint32_t milliseconds, void (*callback)(TArg), TArg arg)
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-function-type"
         static_assert(sizeof(TArg) <= sizeof(void*), "attach() callback argument size must be <= sizeof(void*)");
         _attach_ms(milliseconds, true, reinterpret_cast<callback_with_arg_t>(callback), reinterpret_cast<void*>(arg));
+#pragma GCC diagnostic pop
     }
 
     // callback will be called at following loop() after ticker fires