arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-22 08:22:04 +03:00
Code Activity

Fix iostream related issues (#5047)

Browse Source 
* add stubs for more exception throw calls

Fixes https://github.com/esp8266/Arduino/issues/3358

* libc: make putc_r implementation weak

newlib provides its own implementation of _putc_r, which will call
_write_r (possibly after buffering). Make our implementation weak to
allow using the one from newlib.

Fixes https://github.com/esp8266/Arduino/issues/4630

* libc: fix incorrect return value of _write_r call

Should return number of bytes written, actually returned zero. This
resulted in std::cout going into failed state after the first write.

* tests: add test for output to std::cout
This commit is contained in:
Ivan Grokhotkov
2018-08-27 01:47:01 +08:00
committed by Develo
parent 0da54d88a9
commit 0713a01db8
3 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cores/esp8266/abi.cpp
View File

@ -127,7 +127,24 @@ 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;

5
cores/esp8266/libc_replacements.c
View File

@ -84,8 +84,9 @@ int ICACHE_RAM_ATTR _read_r(struct _reent* unused, int file, char *ptr, int len)
int ICACHE_RAM_ATTR _write_r(struct _reent* r, int file, char *ptr, int len) {
(void) r;
int pos = len;
if (file == STDOUT_FILENO) {
while(len--) {
while(pos--) {
ets_putc(*ptr);
++ptr;
}
@ -93,6 +94,8 @@ int ICACHE_RAM_ATTR _write_r(struct _reent* r, int file, char *ptr, int len) {
return len;
}
int ICACHE_RAM_ATTR _putc_r(struct _reent* r, int c, FILE* file) __attribute__((weak));
int ICACHE_RAM_ATTR _putc_r(struct _reent* r, int c, FILE* file) {
(void) r;
if (file->_file == STDOUT_FILENO) {