diff options
Diffstat (limited to 'ports')
| -rwxr-xr-x | ports/atmel-samd/Makefile | 3 | ||||
| -rwxr-xr-x | ports/atmel-samd/supervisor/memory.c | 112 | ||||
| -rwxr-xr-x | ports/nrf/Makefile | 1 | ||||
| -rwxr-xr-x | ports/nrf/supervisor/memory.c | 112 |
4 files changed, 3 insertions, 225 deletions
diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile index 249f003f9..06585ec67 100755 --- a/ports/atmel-samd/Makefile +++ b/ports/atmel-samd/Makefile @@ -288,7 +288,8 @@ SRC_C = \ lib/libc/string0.c \ lib/mp-readline/readline.c \ $(BUILD)/autogen_usb_descriptor.c \ - freetouch/adafruit_ptc.c + freetouch/adafruit_ptc.c \ + supervisor/shared/memory.c # Choose which flash filesystem impl to use. # (Right now INTERNAL_FLASH_FILESYSTEM and SPI_FLASH_FILESYSTEM are mutually exclusive. diff --git a/ports/atmel-samd/supervisor/memory.c b/ports/atmel-samd/supervisor/memory.c deleted file mode 100755 index 4ec0fa86d..000000000 --- a/ports/atmel-samd/supervisor/memory.c +++ /dev/null @@ -1,112 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "supervisor/memory.h" - -#include <stddef.h> - -#define CIRCUITPY_SUPERVISOR_ALLOC_COUNT 8 - -static supervisor_allocation allocations[CIRCUITPY_SUPERVISOR_ALLOC_COUNT]; -// We use uint32_t* to ensure word (4 byte) alignment. -uint32_t* low_address; -uint32_t* high_address; -extern uint32_t _ebss; -extern uint32_t _estack; - -void memory_init(void) { - low_address = &_ebss; - high_address = &_estack; -} - -void free_memory(supervisor_allocation* allocation) { - uint8_t index = 0; - bool found = false; - for (index = 0; index < CIRCUITPY_SUPERVISOR_ALLOC_COUNT; index++) { - found = allocation == &allocations[index]; - if (found) { - break; - } - } - if (allocation->ptr == high_address) { - high_address += allocation->length / 4; - for (index++; index < CIRCUITPY_SUPERVISOR_ALLOC_COUNT; index++) { - if (allocations[index].ptr != NULL) { - break; - } - high_address += allocations[index].length / 4; - } - } else if (allocation->ptr + allocation->length / 4 == low_address) { - low_address = allocation->ptr; - for (index--; index >= 0; index--) { - if (allocations[index].ptr != NULL) { - break; - } - low_address -= allocations[index].length / 4; - } - } else { - // Freed memory isn't in the middle so skip updating bounds. The memory will be added to the - // middle when the memory to the inside is freed. - } - allocation->ptr = NULL; -} - -supervisor_allocation* allocate_remaining_memory(void) { - if (low_address == high_address) { - return NULL; - } - return allocate_memory((high_address - low_address) * 4, false); -} - -supervisor_allocation* allocate_memory(uint32_t length, bool high) { - if ((high_address - low_address) * 4 < (int32_t) length) { - return NULL; - } - uint8_t index = 0; - int8_t direction = 1; - if (high) { - index = CIRCUITPY_SUPERVISOR_ALLOC_COUNT - 1; - direction = -1; - } - for (; index < CIRCUITPY_SUPERVISOR_ALLOC_COUNT; index += direction) { - if (allocations[index].ptr == NULL) { - break; - } - } - if (index >= CIRCUITPY_SUPERVISOR_ALLOC_COUNT) { - return NULL; - } - supervisor_allocation* alloc = &allocations[index]; - if (high) { - high_address -= length / 4; - alloc->ptr = high_address; - } else { - alloc->ptr = low_address; - low_address += length / 4; - } - alloc->length = length; - return alloc; -} diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index 0057bdc24..8a96b1009 100755 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -118,6 +118,7 @@ SRC_C += \ lib/utils/stdout_helpers.c \ lib/libc/string0.c \ lib/mp-readline/readline.c \ + supervisor/shared/memory.c ifeq ($(MCU_SUB_VARIANT),nrf52840) diff --git a/ports/nrf/supervisor/memory.c b/ports/nrf/supervisor/memory.c deleted file mode 100755 index 4ec0fa86d..000000000 --- a/ports/nrf/supervisor/memory.c +++ /dev/null @@ -1,112 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Scott Shawcroft for Adafruit Industries - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "supervisor/memory.h" - -#include <stddef.h> - -#define CIRCUITPY_SUPERVISOR_ALLOC_COUNT 8 - -static supervisor_allocation allocations[CIRCUITPY_SUPERVISOR_ALLOC_COUNT]; -// We use uint32_t* to ensure word (4 byte) alignment. -uint32_t* low_address; -uint32_t* high_address; -extern uint32_t _ebss; -extern uint32_t _estack; - -void memory_init(void) { - low_address = &_ebss; - high_address = &_estack; -} - -void free_memory(supervisor_allocation* allocation) { - uint8_t index = 0; - bool found = false; - for (index = 0; index < CIRCUITPY_SUPERVISOR_ALLOC_COUNT; index++) { - found = allocation == &allocations[index]; - if (found) { - break; - } - } - if (allocation->ptr == high_address) { - high_address += allocation->length / 4; - for (index++; index < CIRCUITPY_SUPERVISOR_ALLOC_COUNT; index++) { - if (allocations[index].ptr != NULL) { - break; - } - high_address += allocations[index].length / 4; - } - } else if (allocation->ptr + allocation->length / 4 == low_address) { - low_address = allocation->ptr; - for (index--; index >= 0; index--) { - if (allocations[index].ptr != NULL) { - break; - } - low_address -= allocations[index].length / 4; - } - } else { - // Freed memory isn't in the middle so skip updating bounds. The memory will be added to the - // middle when the memory to the inside is freed. - } - allocation->ptr = NULL; -} - -supervisor_allocation* allocate_remaining_memory(void) { - if (low_address == high_address) { - return NULL; - } - return allocate_memory((high_address - low_address) * 4, false); -} - -supervisor_allocation* allocate_memory(uint32_t length, bool high) { - if ((high_address - low_address) * 4 < (int32_t) length) { - return NULL; - } - uint8_t index = 0; - int8_t direction = 1; - if (high) { - index = CIRCUITPY_SUPERVISOR_ALLOC_COUNT - 1; - direction = -1; - } - for (; index < CIRCUITPY_SUPERVISOR_ALLOC_COUNT; index += direction) { - if (allocations[index].ptr == NULL) { - break; - } - } - if (index >= CIRCUITPY_SUPERVISOR_ALLOC_COUNT) { - return NULL; - } - supervisor_allocation* alloc = &allocations[index]; - if (high) { - high_address -= length / 4; - alloc->ptr = high_address; - } else { - alloc->ptr = low_address; - low_address += length / 4; - } - alloc->length = length; - return alloc; -} |