Skip to content

Commit 840e55a

Browse files
mhightower83mhightower83
committed
Merge branch 'master' into pr-heap-refactor3
2 parents 4c96365 + 65579d2 commit 840e55a

File tree

80 files changed

+1438
-851
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1438
-851
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Arduino core for ESP8266 WiFi chip
33

44
# Quick links
55

6-
- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/3.1.1/)
6+
- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/3.1.2/)
77
- [Current "git version" documentation](https://arduino-esp8266.readthedocs.io/en/latest/)
88
- [Install git version](https://arduino-esp8266.readthedocs.io/en/latest/installing.html#using-git-version) ([sources](doc/installing.rst#using-git-version))
99

@@ -36,7 +36,7 @@ Starting with 1.6.4, Arduino allows installation of third-party platform package
3636
#### Latest release [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/)
3737
Boards manager link: `https://arduino.esp8266.com/stable/package_esp8266com_index.json`
3838

39-
Documentation: [https://arduino-esp8266.readthedocs.io/en/3.1.1/](https://arduino-esp8266.readthedocs.io/en/3.1.1/)
39+
Documentation: [https://arduino-esp8266.readthedocs.io/en/3.1.2/](https://arduino-esp8266.readthedocs.io/en/3.1.2/)
4040

4141
### Using git version
4242

‎boards.txt

Lines changed: 267 additions & 0 deletions
Large diffs are not rendered by default.

‎bootloaders/eboot/eboot.elf

84 Bytes
Binary file not shown.

‎cores/esp8266/Stream.h

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,25 +167,49 @@ class Stream: public Print {
167167
// When result is 0 or less than requested maxLen, Print::getLastSend()
168168
// contains an error reason.
169169

170+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
171+
172+
// transfers already buffered / immediately available data (no timeout)
173+
// returns number of transferred bytes
174+
[[deprecated]] size_t sendAvailable (Print* to) { return sendGeneric(to, -1, -1, oneShotMs::alwaysExpired); }
175+
[[deprecated]] size_t sendAvailable (Print& to) { return sendAvailable(&to); }
176+
177+
// transfers data until timeout
178+
// returns number of transferred bytes
179+
[[deprecated]] size_t sendAll (Print* to, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendGeneric(to, -1, -1, timeoutMs); }
180+
[[deprecated]] size_t sendAll (Print& to, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendAll(&to, timeoutMs); }
181+
182+
// transfers data until a char is encountered (the char is swallowed but not transferred) with timeout
183+
// returns number of transferred bytes
184+
[[deprecated]] size_t sendUntil (Print* to, const int readUntilChar, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendGeneric(to, -1, readUntilChar, timeoutMs); }
185+
[[deprecated]] size_t sendUntil (Print& to, const int readUntilChar, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendUntil(&to, readUntilChar, timeoutMs); }
186+
187+
// transfers data until requested size or timeout
188+
// returns number of transferred bytes
189+
[[deprecated]] size_t sendSize (Print* to, const ssize_t maxLen, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendGeneric(to, maxLen, -1, timeoutMs); }
190+
[[deprecated]] size_t sendSize (Print& to, const ssize_t maxLen, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendSize(&to, maxLen, timeoutMs); }
191+
192+
#pragma GCC diagnostic pop
193+
170194
// transfers already buffered / immediately available data (no timeout)
171195
// returns number of transferred bytes
172-
size_t sendAvailable (Print* to) { return sendGeneric(to, -1, -1, oneShotMs::alwaysExpired); }
173-
size_t sendAvailable (Print& to) { return sendAvailable(&to); }
196+
size_t sendAvailable (Stream* to) { return sendGeneric(to, -1, -1, oneShotMs::alwaysExpired); }
197+
size_t sendAvailable (Stream& to) { return sendAvailable(&to); }
174198

175199
// transfers data until timeout
176200
// returns number of transferred bytes
177-
size_t sendAll (Print* to, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendGeneric(to, -1, -1, timeoutMs); }
178-
size_t sendAll (Print& to, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendAll(&to, timeoutMs); }
201+
size_t sendAll (Stream* to, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendGeneric(to, -1, -1, timeoutMs); }
202+
size_t sendAll (Stream& to, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendAll(&to, timeoutMs); }
179203

180204
// transfers data until a char is encountered (the char is swallowed but not transferred) with timeout
181205
// returns number of transferred bytes
182-
size_t sendUntil (Print* to, const int readUntilChar, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendGeneric(to, -1, readUntilChar, timeoutMs); }
183-
size_t sendUntil (Print& to, const int readUntilChar, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendUntil(&to, readUntilChar, timeoutMs); }
206+
size_t sendUntil (Stream* to, const int readUntilChar, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendGeneric(to, -1, readUntilChar, timeoutMs); }
207+
size_t sendUntil (Stream& to, const int readUntilChar, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendUntil(&to, readUntilChar, timeoutMs); }
184208

185209
// transfers data until requested size or timeout
186210
// returns number of transferred bytes
187-
size_t sendSize (Print* to, const ssize_t maxLen, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendGeneric(to, maxLen, -1, timeoutMs); }
188-
size_t sendSize (Print& to, const ssize_t maxLen, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendSize(&to, maxLen, timeoutMs); }
211+
size_t sendSize (Stream* to, const ssize_t maxLen, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendGeneric(to, maxLen, -1, timeoutMs); }
212+
size_t sendSize (Stream& to, const ssize_t maxLen, const oneShotMs::timeType timeoutMs = oneShotMs::neverExpires) { return sendSize(&to, maxLen, timeoutMs); }
189213

190214
// remaining size (-1 by default = unknown)
191215
virtual ssize_t streamRemaining () { return -1; }
@@ -202,11 +226,17 @@ class Stream: public Print {
202226
Report getLastSendReport () const { return _sendReport; }
203227

204228
protected:
229+
[[deprecated]]
205230
size_t sendGeneric (Print* to,
206231
const ssize_t len = -1,
207232
const int readUntilChar = -1,
208233
oneShotMs::timeType timeoutMs = oneShotMs::neverExpires /* neverExpires=>getTimeout() */);
209234

235+
size_t sendGeneric (Stream* to,
236+
const ssize_t len = -1,
237+
const int readUntilChar = -1,
238+
oneShotMs::timeType timeoutMs = oneShotMs::neverExpires /* neverExpires=>getTimeout() */);
239+
210240
size_t SendGenericPeekBuffer(Print* to, const ssize_t len, const int readUntilChar, const oneShotMs::timeType timeoutMs);
211241
size_t SendGenericRegularUntil(Print* to, const ssize_t len, const int readUntilChar, const oneShotMs::timeType timeoutMs);
212242
size_t SendGenericRegular(Print* to, const ssize_t len, const oneShotMs::timeType timeoutMs);

‎cores/esp8266/StreamSend.cpp

Lines changed: 54 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,54 @@
2222
#include <Arduino.h>
2323
#include <StreamDev.h>
2424

25+
size_t Stream::sendGeneric(Stream* to, const ssize_t len, const int readUntilChar,
26+
const esp8266::polledTimeout::oneShotFastMs::timeType timeoutMs)
27+
{
28+
// "neverExpires (default, impossible)" is translated to default timeout
29+
esp8266::polledTimeout::oneShotFastMs::timeType inputTimeoutMs
30+
= timeoutMs >= esp8266::polledTimeout::oneShotFastMs::neverExpires ? getTimeout()
31+
: timeoutMs;
32+
33+
esp8266::polledTimeout::oneShotFastMs::timeType mainTimeoutMs = std::max(
34+
inputTimeoutMs, (esp8266::polledTimeout::oneShotFastMs::timeType)to->getTimeout());
35+
36+
setReport(Report::Success);
37+
38+
if (len == 0)
39+
{
40+
return 0; // conveniently avoids timeout for no requested data
41+
}
42+
43+
// There are two timeouts:
44+
// - read (network, serial, ...)
45+
// - write (network, serial, ...)
46+
// However
47+
// - getTimeout() is for reading only
48+
// - there is no getOutputTimeout() api
49+
// So we use getTimeout() for both,
50+
// (also when inputCanTimeout() is false)
51+
52+
if (hasPeekBufferAPI())
53+
{
54+
return SendGenericPeekBuffer(to, len, readUntilChar, mainTimeoutMs);
55+
}
56+
57+
if (readUntilChar >= 0)
58+
{
59+
return SendGenericRegularUntil(to, len, readUntilChar, mainTimeoutMs);
60+
}
61+
62+
return SendGenericRegular(to, len, mainTimeoutMs);
63+
}
64+
2565
size_t Stream::sendGeneric(Print* to, const ssize_t len, const int readUntilChar,
2666
const esp8266::polledTimeout::oneShotFastMs::timeType timeoutMs)
2767
{
68+
// "neverExpires (default, impossible)" is translated to default timeout
69+
esp8266::polledTimeout::oneShotFastMs::timeType inputTimeoutMs
70+
= timeoutMs >= esp8266::polledTimeout::oneShotFastMs::neverExpires ? getTimeout()
71+
: timeoutMs;
72+
2873
setReport(Report::Success);
2974

3075
if (len == 0)
@@ -43,25 +88,23 @@ size_t Stream::sendGeneric(Print* to, const ssize_t len, const int readUntilChar
4388

4489
if (hasPeekBufferAPI())
4590
{
46-
return SendGenericPeekBuffer(to, len, readUntilChar, timeoutMs);
91+
return SendGenericPeekBuffer(to, len, readUntilChar, inputTimeoutMs);
4792
}
4893

4994
if (readUntilChar >= 0)
5095
{
51-
return SendGenericRegularUntil(to, len, readUntilChar, timeoutMs);
96+
return SendGenericRegularUntil(to, len, readUntilChar, inputTimeoutMs);
5297
}
5398

54-
return SendGenericRegular(to, len, timeoutMs);
99+
return SendGenericRegular(to, len, inputTimeoutMs);
55100
}
56101

57102
size_t
58103
Stream::SendGenericPeekBuffer(Print* to, const ssize_t len, const int readUntilChar,
59104
const esp8266::polledTimeout::oneShotFastMs::timeType timeoutMs)
60105
{
61-
// "neverExpires (default, impossible)" is translated to default timeout
62-
esp8266::polledTimeout::oneShotFastMs timedOut(
63-
timeoutMs >= esp8266::polledTimeout::oneShotFastMs::neverExpires ? getTimeout()
64-
: timeoutMs);
106+
esp8266::polledTimeout::oneShotFastMs timedOut(timeoutMs);
107+
65108
// len==-1 => maxLen=0 <=> until starvation
66109
const size_t maxLen = std::max((ssize_t)0, len);
67110
size_t written = 0;
@@ -152,10 +195,8 @@ Stream::SendGenericRegularUntil(Print* to, const ssize_t len, const int readUnti
152195
// regular Stream API
153196
// no other choice than reading byte by byte
154197

155-
// "neverExpires (default, impossible)" is translated to default timeout
156-
esp8266::polledTimeout::oneShotFastMs timedOut(
157-
timeoutMs >= esp8266::polledTimeout::oneShotFastMs::neverExpires ? getTimeout()
158-
: timeoutMs);
198+
esp8266::polledTimeout::oneShotFastMs timedOut(timeoutMs);
199+
159200
// len==-1 => maxLen=0 <=> until starvation
160201
const size_t maxLen = std::max((ssize_t)0, len);
161202
size_t written = 0;
@@ -231,10 +272,8 @@ size_t Stream::SendGenericRegular(Print* to, const ssize_t len,
231272
// regular Stream API
232273
// use an intermediary buffer
233274

234-
// "neverExpires (default, impossible)" is translated to default timeout
235-
esp8266::polledTimeout::oneShotFastMs timedOut(
236-
timeoutMs >= esp8266::polledTimeout::oneShotFastMs::neverExpires ? getTimeout()
237-
: timeoutMs);
275+
esp8266::polledTimeout::oneShotFastMs timedOut(timeoutMs);
276+
238277
// len==-1 => maxLen=0 <=> until starvation
239278
const size_t maxLen = std::max((ssize_t)0, len);
240279
size_t written = 0;

‎cores/esp8266/TZ.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
// autogenerated from https://raw.githubusercontent.com/nayarsystems/posix_tz_db/master/zones.csv
33
// by script <esp8266 arduino core>/tools/TZupdate.sh
4-
// Sat Jan 14 10:17:27 PM UTC 2023
4+
// Mon Mar 20 22:00:17 UTC 2023
55
//
66
// This database is autogenerated from IANA timezone database
77
// https://raw.githubusercontent.com/nayarsystems/posix_tz_db/master/zones.csv
@@ -85,7 +85,7 @@
8585
#define TZ_America_Asuncion PSTR("<-04>4<-03>,M10.1.0/0,M3.4.0/0")
8686
#define TZ_America_Atikokan PSTR("EST5")
8787
#define TZ_America_Bahia PSTR("<-03>3")
88-
#define TZ_America_Bahia_Banderas PSTR("CST6CDT,M4.1.0,M10.5.0")
88+
#define TZ_America_Bahia_Banderas PSTR("CST6")
8989
#define TZ_America_Barbados PSTR("AST4")
9090
#define TZ_America_Belem PSTR("<-03>3")
9191
#define TZ_America_Belize PSTR("CST6")
@@ -100,7 +100,7 @@
100100
#define TZ_America_Cayenne PSTR("<-03>3")
101101
#define TZ_America_Cayman PSTR("EST5")
102102
#define TZ_America_Chicago PSTR("CST6CDT,M3.2.0,M11.1.0")
103-
#define TZ_America_Chihuahua PSTR("MST7MDT,M4.1.0,M10.5.0")
103+
#define TZ_America_Chihuahua PSTR("CST6")
104104
#define TZ_America_Costa_Rica PSTR("CST6")
105105
#define TZ_America_Creston PSTR("MST7")
106106
#define TZ_America_Cuiaba PSTR("<-04>4")
@@ -117,7 +117,7 @@
117117
#define TZ_America_Fortaleza PSTR("<-03>3")
118118
#define TZ_America_Fort_Nelson PSTR("MST7")
119119
#define TZ_America_Glace_Bay PSTR("AST4ADT,M3.2.0,M11.1.0")
120-
#define TZ_America_Godthab PSTR("<-03>3<-02>,M3.5.0/-2,M10.5.0/-1")
120+
#define TZ_America_Godthab PSTR("<-02>2")
121121
#define TZ_America_Goose_Bay PSTR("AST4ADT,M3.2.0,M11.1.0")
122122
#define TZ_America_Grand_Turk PSTR("EST5EDT,M3.2.0,M11.1.0")
123123
#define TZ_America_Grenada PSTR("AST4")
@@ -153,14 +153,14 @@
153153
#define TZ_America_Marigot PSTR("AST4")
154154
#define TZ_America_Martinique PSTR("AST4")
155155
#define TZ_America_Matamoros PSTR("CST6CDT,M3.2.0,M11.1.0")
156-
#define TZ_America_Mazatlan PSTR("MST7MDT,M4.1.0,M10.5.0")
156+
#define TZ_America_Mazatlan PSTR("MST7")
157157
#define TZ_America_Menominee PSTR("CST6CDT,M3.2.0,M11.1.0")
158-
#define TZ_America_Merida PSTR("CST6CDT,M4.1.0,M10.5.0")
158+
#define TZ_America_Merida PSTR("CST6")
159159
#define TZ_America_Metlakatla PSTR("AKST9AKDT,M3.2.0,M11.1.0")
160-
#define TZ_America_Mexico_City PSTR("CST6CDT,M4.1.0,M10.5.0")
160+
#define TZ_America_Mexico_City PSTR("CST6")
161161
#define TZ_America_Miquelon PSTR("<-03>3<-02>,M3.2.0,M11.1.0")
162162
#define TZ_America_Moncton PSTR("AST4ADT,M3.2.0,M11.1.0")
163-
#define TZ_America_Monterrey PSTR("CST6CDT,M4.1.0,M10.5.0")
163+
#define TZ_America_Monterrey PSTR("CST6")
164164
#define TZ_America_Montevideo PSTR("<-03>3")
165165
#define TZ_America_Montreal PSTR("EST5EDT,M3.2.0,M11.1.0")
166166
#define TZ_America_Montserrat PSTR("AST4")
@@ -172,8 +172,8 @@
172172
#define TZ_America_North_Dakota_Beulah PSTR("CST6CDT,M3.2.0,M11.1.0")
173173
#define TZ_America_North_Dakota_Center PSTR("CST6CDT,M3.2.0,M11.1.0")
174174
#define TZ_America_North_Dakota_New_Salem PSTR("CST6CDT,M3.2.0,M11.1.0")
175-
#define TZ_America_Nuuk PSTR("<-03>3<-02>,M3.5.0/-2,M10.5.0/-1")
176-
#define TZ_America_Ojinaga PSTR("MST7MDT,M3.2.0,M11.1.0")
175+
#define TZ_America_Nuuk PSTR("<-02>2")
176+
#define TZ_America_Ojinaga PSTR("CST6CDT,M3.2.0,M11.1.0")
177177
#define TZ_America_Panama PSTR("EST5")
178178
#define TZ_America_Pangnirtung PSTR("EST5EDT,M3.2.0,M11.1.0")
179179
#define TZ_America_Paramaribo PSTR("<-03>3")
@@ -227,7 +227,7 @@
227227
#define TZ_Arctic_Longyearbyen PSTR("CET-1CEST,M3.5.0,M10.5.0/3")
228228
#define TZ_Asia_Aden PSTR("<+03>-3")
229229
#define TZ_Asia_Almaty PSTR("<+06>-6")
230-
#define TZ_Asia_Amman PSTR("EET-2EEST,M2.5.4/24,M10.5.5/1")
230+
#define TZ_Asia_Amman PSTR("<+03>-3")
231231
#define TZ_Asia_Anadyr PSTR("<+12>-12")
232232
#define TZ_Asia_Aqtau PSTR("<+05>-5")
233233
#define TZ_Asia_Aqtobe PSTR("<+05>-5")
@@ -244,14 +244,14 @@
244244
#define TZ_Asia_Chita PSTR("<+09>-9")
245245
#define TZ_Asia_Choibalsan PSTR("<+08>-8")
246246
#define TZ_Asia_Colombo PSTR("<+0530>-5:30")
247-
#define TZ_Asia_Damascus PSTR("EET-2EEST,M3.5.5/0,M10.5.5/0")
247+
#define TZ_Asia_Damascus PSTR("<+03>-3")
248248
#define TZ_Asia_Dhaka PSTR("<+06>-6")
249249
#define TZ_Asia_Dili PSTR("<+09>-9")
250250
#define TZ_Asia_Dubai PSTR("<+04>-4")
251251
#define TZ_Asia_Dushanbe PSTR("<+05>-5")
252252
#define TZ_Asia_Famagusta PSTR("EET-2EEST,M3.5.0/3,M10.5.0/4")
253-
#define TZ_Asia_Gaza PSTR("EET-2EEST,M3.4.4/48,M10.5.5/1")
254-
#define TZ_Asia_Hebron PSTR("EET-2EEST,M3.4.4/48,M10.5.5/1")
253+
#define TZ_Asia_Gaza PSTR("EET-2EEST,M3.4.4/50,M10.4.4/50")
254+
#define TZ_Asia_Hebron PSTR("EET-2EEST,M3.4.4/50,M10.4.4/50")
255255
#define TZ_Asia_Ho_Chi_Minh PSTR("<+07>-7")
256256
#define TZ_Asia_Hong_Kong PSTR("HKT-8")
257257
#define TZ_Asia_Hovd PSTR("<+07>-7")
@@ -294,7 +294,7 @@
294294
#define TZ_Asia_Taipei PSTR("CST-8")
295295
#define TZ_Asia_Tashkent PSTR("<+05>-5")
296296
#define TZ_Asia_Tbilisi PSTR("<+04>-4")
297-
#define TZ_Asia_Tehran PSTR("<+0330>-3:30<+0430>,J79/24,J263/24")
297+
#define TZ_Asia_Tehran PSTR("<+0330>-3:30")
298298
#define TZ_Asia_Thimphu PSTR("<+06>-6")
299299
#define TZ_Asia_Tokyo PSTR("JST-9")
300300
#define TZ_Asia_Tomsk PSTR("<+07>-7")
@@ -409,7 +409,7 @@
409409
#define TZ_Pacific_Efate PSTR("<+11>-11")
410410
#define TZ_Pacific_Enderbury PSTR("<+13>-13")
411411
#define TZ_Pacific_Fakaofo PSTR("<+13>-13")
412-
#define TZ_Pacific_Fiji PSTR("<+12>-12<+13>,M11.2.0,M1.2.3/99")
412+
#define TZ_Pacific_Fiji PSTR("<+12>-12")
413413
#define TZ_Pacific_Funafuti PSTR("<+12>-12")
414414
#define TZ_Pacific_Galapagos PSTR("<-06>6")
415415
#define TZ_Pacific_Gambier PSTR("<-09>9")

‎cores/esp8266/WString.cpp

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,15 @@ bool String::reserve(unsigned int size) {
197197
return false;
198198
}
199199

200+
#ifdef DEBUG_ESP_PORT
201+
static void identifyString (const String& badOne)
202+
{
203+
DEBUG_ESP_PORT.printf("[String] '%." STR(OOM_STRING_BORDER_DISPLAY) "s ... %." STR(OOM_STRING_BORDER_DISPLAY) "s': ",
204+
badOne.c_str(),
205+
badOne.length() > OOM_STRING_BORDER_DISPLAY? badOne.c_str() + std::max((int)badOne.length() - OOM_STRING_BORDER_DISPLAY, OOM_STRING_BORDER_DISPLAY): "");
206+
}
207+
#endif
208+
200209
bool String::changeBuffer(unsigned int maxStrLen) {
201210
// Can we use SSO here to avoid allocation?
202211
if (maxStrLen < sizeof(sso.buff) - 1) {
@@ -218,16 +227,19 @@ bool String::changeBuffer(unsigned int maxStrLen) {
218227
}
219228
// Fallthrough to normal allocator
220229
size_t newSize = (maxStrLen + 16) & (~0xf);
221-
#ifdef DEBUG_ESP_OOM
230+
#ifdef DEBUG_ESP_PORT
222231
if (!isSSO() && capacity() >= OOM_STRING_THRESHOLD_REALLOC_WARN && maxStrLen > capacity()) {
223232
// warn when badly re-allocating
224-
DEBUGV("[String] Reallocating large String(%d -> %d bytes) '%." STR(OOM_STRING_BORDER_DISPLAY) "s ... %." STR(OOM_STRING_BORDER_DISPLAY) "s'\n",
225-
len(), maxStrLen, c_str(),
226-
len() > OOM_STRING_BORDER_DISPLAY? c_str() + std::max((int)len() - OOM_STRING_BORDER_DISPLAY, OOM_STRING_BORDER_DISPLAY): "");
233+
identifyString(*this);
234+
DEBUG_ESP_PORT.printf("Reallocating large String(%d -> %d bytes)\n", len(), maxStrLen);
227235
}
228236
#endif
229237
// Make sure we can fit newsize in the buffer
230238
if (newSize > CAPACITY_MAX) {
239+
#ifdef DEBUG_ESP_PORT
240+
identifyString(*this);
241+
DEBUG_ESP_PORT.printf("Maximum capacity reached (" STR(CAPACITY_MAX) ")\n");
242+
#endif
231243
return false;
232244
}
233245
uint16_t oldLen = len();
@@ -247,6 +259,10 @@ bool String::changeBuffer(unsigned int maxStrLen) {
247259
setBuffer(newbuffer);
248260
return true;
249261
}
262+
#ifdef DEBUG_ESP_PORT
263+
identifyString(*this);
264+
DEBUG_ESP_PORT.printf("OOM: %d -> %zu bytes\n", isSSO() ? 0: capacity(), newSize);
265+
#endif
250266
return false;
251267
}
252268

@@ -804,7 +820,7 @@ void String::replace(const String &find, const String &replace) {
804820
if (size == len())
805821
return;
806822
if (size > capacity() && !changeBuffer(size))
807-
return; // XXX: tell user!
823+
return;
808824
int index = len() - 1;
809825
while (index >= 0 && (index = lastIndexOf(find, index)) >= 0) {
810826
readFrom = wbuffer() + index + find.len();

‎cores/esp8266/core_esp8266_features.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ void precache(void *f, uint32_t bytes) {
3838
// page (ie 1 word in 8) for this to work.
3939
#define CACHE_PAGE_SIZE 32
4040

41-
uint32_t a0;
42-
__asm__("mov.n %0, a0" : "=r"(a0));
43-
uint32_t lines = (bytes/CACHE_PAGE_SIZE)+2;
44-
volatile uint32_t *p = (uint32_t*)((f ? (uint32_t)f : a0) & ~0x03);
45-
uint32_t x;
46-
for (uint32_t i=0; i<lines; i++, p+=CACHE_PAGE_SIZE/sizeof(uint32_t)) x=*p;
47-
(void)x;
41+
uint32_t lines = (bytes / CACHE_PAGE_SIZE) + 2;
42+
uint32_t *p = (uint32_t*)((uint32_t)(f ? f : __builtin_return_address(0)) & ~0x03);
43+
do {
44+
__asm__ volatile ("" : : "r"(*p)); // guarantee that the value of *p will be in some register (forced load)
45+
p += CACHE_PAGE_SIZE / sizeof(uint32_t);
46+
} while (--lines);
47+
__sync_synchronize(); // full memory barrier, mapped to MEMW in Xtensa
4848
}
4949

5050
/** based on efuse data, we could determine what type of chip this is

0 commit comments

Comments
 (0)