Merge pull request #7 from esp8266/esp8266

pull master

Author: me-no-dev

hardware/esp8266com/esp8266/cores/esp8266/cont_util.c

@@ -25,20 +25,20 @@
 
 #define CONT_STACKGUARD 0xfeefeffe
 
-void cont_init(cont_t* cont) {
+void ICACHE_RAM_ATTR cont_init(cont_t* cont) {
     cont->stack_guard1 = CONT_STACKGUARD;
     cont->stack_guard2 = CONT_STACKGUARD;
     cont->stack_end = cont->stack + (sizeof(cont->stack) / 4);
     cont->struct_start = (unsigned*) cont;
 }
 
-int cont_check(cont_t* cont) {
+int ICACHE_RAM_ATTR cont_check(cont_t* cont) {
     if(cont->stack_guard1 != CONT_STACKGUARD || cont->stack_guard2 != CONT_STACKGUARD) return 1;
 
     return 0;
 }
 
-bool cont_can_yield(cont_t* cont) {
+bool ICACHE_RAM_ATTR cont_can_yield(cont_t* cont) {
     return !ETS_INTR_WITHINISR() &&
            cont->pc_ret != 0 && cont->pc_yield == 0;
 }

hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_main.cpp

@@ -129,8 +129,12 @@ static void do_global_ctors(void) {
         (*p)();
 }
 
+extern "C" void __gdb_init() {}
+extern "C" void gdb_init(void) __attribute__ ((weak, alias("__gdb_init")));
+
 void init_done() {
     system_set_os_print(1);
+    gdb_init();
     do_global_ctors();
     esp_schedule();
 }

hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_postmortem.c

@@ -31,7 +31,7 @@ extern void __real_system_restart_local();
 extern cont_t g_cont;
 
 
-static void uart_write_char_d(char c);
+void uart_write_char_d(char c);
 static void uart0_write_char_d(char c);
 static void uart1_write_char_d(char c);
 static void print_stack(uint32_t start, uint32_t end);
@@ -133,16 +133,16 @@ void uart_write_char_d(char c) {
     uart1_write_char_d(c);
 }
 
-void uart0_write_char_d(char c) {
-    while (((USS(0) >> USTXC) & 0xff) >= 0x7e) { }
+static void uart0_write_char_d(char c) {
+    while (((USS(0) >> USTXC) & 0xff)) { }
 
     if (c == '\n') {
         USF(0) = '\r';
     }
     USF(0) = c;
 }
 
-void uart1_write_char_d(char c) {
+static void uart1_write_char_d(char c) {
     while (((USS(1) >> USTXC) & 0xff) >= 0x7e) { }
 
     if (c == '\n') {

hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_timer.c

@@ -1,9 +1,9 @@
-/* 
+/*
   timer.c - Timer1 library for esp8266
 
   Copyright (c) 2015 Hristo Gochkov. All rights reserved.
   This file is part of the esp8266 core for Arduino environment.
- 
+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
@@ -29,13 +29,13 @@
 
 static volatile timercallback timer1_user_cb = NULL;
 
-void timer1_isr_handler(void *para){
+void ICACHE_RAM_ATTR timer1_isr_handler(void *para){
     if ((T1C & ((1 << TCAR) | (1 << TCIT))) == 0) TEIE &= ~TEIE1;//edge int disable
     T1I = 0;
     if (timer1_user_cb) {
         // to make ISR compatible to Arduino AVR model where interrupts are disabled
         // we disable them before we call the client ISR
-        uint32_t savedPS = xt_rsil(15); // stop other interrupts 
+        uint32_t savedPS = xt_rsil(15); // stop other interrupts
         timer1_user_cb();
         xt_wsr_ps(savedPS);
     }
@@ -61,7 +61,7 @@ void timer1_enable(uint8_t divider, uint8_t int_type, uint8_t reload){
     T1I = 0;
 }
 
-void timer1_write(uint32_t ticks){
+void ICACHE_RAM_ATTR timer1_write(uint32_t ticks){
     T1L = ((ticks)& 0x7FFFFF);
     if ((T1C & (1 << TCIT)) == 0) TEIE |= TEIE1;//edge int enable
 }
@@ -76,7 +76,7 @@ void timer1_disable(){
 
 static volatile timercallback timer0_user_cb = NULL;
 
-void timer0_isr_handler(void* para){
+void ICACHE_RAM_ATTR timer0_isr_handler(void* para){
     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
@@ -99,6 +99,3 @@ void timer0_detachInterrupt() {
     timer0_user_cb = NULL;
     ETS_CCOMPARE0_DISABLE();
 }
-
-
-

hardware/esp8266com/esp8266/cores/esp8266/core_esp8266_wiring_pwm.c

@@ -1,9 +1,9 @@
-/* 
+/*
   pwm.c - analogWrite implementation for esp8266
 
   Copyright (c) 2015 Hristo Gochkov. All rights reserved.
   This file is part of the esp8266 core for Arduino environment.
- 
+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
@@ -88,7 +88,7 @@ void prep_pwm_steps(){
 	ETS_FRC1_INTR_ENABLE();
 }
 
-void pwm_timer_isr(){
+void ICACHE_RAM_ATTR pwm_timer_isr(){
 	static uint8_t current_step = 0;
 	static uint8_t stepcount = 0;
 	static uint16_t steps[17];