djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When there is not enough free space, but a matching hole on the other side, use it.

This commit is contained in:
Christian Walther 2020-10-02 23:07:07 +02:00
parent 5bdb8c45dd
commit be8092f4d3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
supervisor/shared/memory.c
View File

@ -125,7 +125,7 @@ supervisor_allocation* allocate_memory(uint32_t length, bool high) {
supervisor_allocation* alloc; supervisor_allocation* alloc;
for (; index < CIRCUITPY_SUPERVISOR_ALLOC_COUNT; index += direction) { for (; index < CIRCUITPY_SUPERVISOR_ALLOC_COUNT; index += direction) {
alloc = &allocations[index]; alloc = &allocations[index];
if (alloc->length == FREE) { if (alloc->length == FREE && (high_address - low_address) * 4 >= (int32_t) length) {
break; break;
} }
// If a hole matches in length exactly, we can reuse it. // If a hole matches in length exactly, we can reuse it.
@ -134,7 +134,7 @@ supervisor_allocation* allocate_memory(uint32_t length, bool high) {
return alloc; return alloc;
} }
} }
if (index >= CIRCUITPY_SUPERVISOR_ALLOC_COUNT || (high_address - low_address) * 4 < (int32_t) length) { if (index >= CIRCUITPY_SUPERVISOR_ALLOC_COUNT) {
return NULL; return NULL;
} }
if (high) { if (high) {