mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-16 11:21:18 +03:00
Heap addendum to handle changes in NON-OS SDK 3.0.x (#8746)
## WPA2 Enterprise connections
References - merged PRs:
* https://github.com/esp8266/Arduino/pull/8529
* https://github.com/esp8266/Arduino/pull/8566 - these occurred with connect/disconnect with WPA-Enterprise
* https://github.com/esp8266/Arduino/pull/8736#issue-1470774550
The NON-OS SDK 3.0.x has breaking changes to the [`pvPortMalloc`](bf890b22e5/include/mem.h (L42)
) function. They added a new `bool` argument for selecting a heap.
```cpp
void *pvPortMalloc (size_t sz, const char *, unsigned, bool);
```
To avoid breaking the build, I added a new thin wrapper function `sdk3_pvPortMalloc` to `heap.cpp`.
Edited new SDK LIBs to call `pvPortMalloc`'s replacement `sdk3_pvPortMalloc`.
They also added `pvPortZallocIram` and `pvPortCallocIram`, which are not a problem to support. Support added to `heap.cpp`.
Issues with WPA2 Enterprise in new SDKs:
* v3.0.0 and v3.0.1 - have the same memory leak and duplicate free bugs from before
* v3.0.2 through v3.0.5 - have the same memory leak; however, _no_ duplicate free crash.
* memory leak can be seen by cycling through setup, connect, disconnect, and clear setup - repeatedly.
Updated `wpa2_eap_patch.cpp` and binary patch scripts to handle v3.0.0 through v3.0.5.
Patched SDKs v3.0.0 through v3.0.5
## Duplicate Non-32-bit exception handler
Issue: At v3.0.0 and above `libmain.a` supplies a built-in exception handler (`load_non_32_wide_handler`) for non-32-bit access. Our non-32-bit access handler (`non32xfer_exception_handler`) overrides it.
Solution: Add "weak" attribute to symbol `load_non_32_wide_handler`. Adjust the build to default to the SDK's built-in non-32-bit handler. If there is a need to use our non-32-bit handler, make the selection from the Arduino IDE Tools menu `Non-32-Bit Access: "Byte/Word access to IRAM/PROGMEM (very slow)"`.
With SDKs v3.0.0 and above a "non-32-bit exception handler" is always present.
This commit is contained in:
@ -1,6 +1,13 @@
|
||||
#!/bin/bash
|
||||
# set -e
|
||||
|
||||
single_sdk="${2}"
|
||||
if [[ -n "$single_sdk" ]]; then
|
||||
if [[ "NONOSDK" != "${single_sdk:0:7}" ]]; then
|
||||
single_sdk=""
|
||||
fi
|
||||
fi
|
||||
|
||||
add_path_ifexist() {
|
||||
if [[ -d $1 ]]; then
|
||||
export PATH=$( realpath $1 ):$PATH
|
||||
@ -24,6 +31,10 @@ EOF
|
||||
}
|
||||
|
||||
list_sdks() {
|
||||
if [[ -n "$single_sdk" ]]; then
|
||||
echo -e "$single_sdk"
|
||||
return
|
||||
fi
|
||||
cat <<EOF
|
||||
NONOSDK22x_190313
|
||||
NONOSDK22x_190703
|
||||
@ -68,7 +79,7 @@ analyze() {
|
||||
done
|
||||
echo ""
|
||||
|
||||
find . -name eap.o -exec md5sum {} \; | sort
|
||||
find . -name eap.o -exec md5sum {} \; | sort -k2
|
||||
echo ""
|
||||
|
||||
unset prev_sdk
|
||||
|
Reference in New Issue
Block a user