stm32/mbedtls: Use core-provided tracked alloc instead of custom funcs.

Signed-off-by: Damien George <damien@micropython.org>

3 files changed, 5 insertions, 66 deletions

diff --git a/ports/stm32/mbedtls/mbedtls_config.h b/ports/stm32/mbedtls/mbedtls_config.h
index 3fbf36126..2e0cb7651 100644
--- a/ports/stm32/mbedtls/mbedtls_config.h
+++ b/ports/stm32/mbedtls/mbedtls_config.h
@@ -89,10 +89,10 @@
 // Memory allocation hooks
 #include <stdlib.h>
 #include <stdio.h>
-void *m_calloc_mbedtls(size_t nmemb, size_t size);
-void m_free_mbedtls(void *ptr);
-#define MBEDTLS_PLATFORM_STD_CALLOC m_calloc_mbedtls
-#define MBEDTLS_PLATFORM_STD_FREE m_free_mbedtls
+void *m_tracked_calloc(size_t nmemb, size_t size);
+void m_tracked_free(void *ptr);
+#define MBEDTLS_PLATFORM_STD_CALLOC m_tracked_calloc
+#define MBEDTLS_PLATFORM_STD_FREE m_tracked_free
 #define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
 
 #include "mbedtls/check_config.h"
diff --git a/ports/stm32/mbedtls/mbedtls_port.c b/ports/stm32/mbedtls/mbedtls_port.c
index 324abb7a6..5c4f8d0f9 100644
--- a/ports/stm32/mbedtls/mbedtls_port.c
+++ b/ports/stm32/mbedtls/mbedtls_port.c
@@ -24,64 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "py/gc.h"
 #include "rng.h"
 #include "mbedtls_config.h"
 
-#define DEBUG (0)
-
-#if DEBUG
-static size_t count_links(uint32_t *nb) {
-    void **p = MP_STATE_PORT(mbedtls_memory);
-    size_t n = 0;
-    *nb = 0;
-    while (p != NULL) {
-        ++n;
-        *nb += gc_nbytes(p);
-        p = (void **)p[1];
-    }
-    return n;
-}
-#endif
-
-void *m_calloc_mbedtls(size_t nmemb, size_t size) {
-    void **ptr = m_malloc0(nmemb * size + 2 * sizeof(uintptr_t));
-    #if DEBUG
-    uint32_t nb;
-    size_t n = count_links(&nb);
-    printf("mbed_alloc(%u, %u) -> (%u;%u) %p\n", nmemb, size, n, (uint)nb, ptr);
-    #endif
-    if (MP_STATE_PORT(mbedtls_memory) != NULL) {
-        MP_STATE_PORT(mbedtls_memory)[0] = ptr;
-    }
-    ptr[0] = NULL;
-    ptr[1] = MP_STATE_PORT(mbedtls_memory);
-    MP_STATE_PORT(mbedtls_memory) = ptr;
-    return &ptr[2];
-}
-
-void m_free_mbedtls(void *ptr_in) {
-    if (ptr_in == NULL) {
-        return;
-    }
-    void **ptr = &((void **)ptr_in)[-2];
-    #if DEBUG
-    uint32_t nb;
-    size_t n = count_links(&nb);
-    printf("mbed_free(%p, [%p, %p], nbytes=%u, links=%u;%u)\n", ptr, ptr[0], ptr[1], gc_nbytes(ptr), n, (uint)nb);
-    #endif
-    if (ptr[1] != NULL) {
-        ((void **)ptr[1])[0] = ptr[0];
-    }
-    if (ptr[0] != NULL) {
-        ((void **)ptr[0])[1] = ptr[1];
-    } else {
-        MP_STATE_PORT(mbedtls_memory) = ptr[1];
-    }
-    m_free(ptr);
-}
-
 int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
     uint32_t val = 0;
     int n = 0;
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index b1bf6da22..1b6ebf92a 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -65,6 +65,7 @@
 #endif
 
 // Python internal features
+#define MICROPY_TRACKED_ALLOC       (MICROPY_SSL_MBEDTLS)
 #define MICROPY_READER_VFS          (1)
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
@@ -293,12 +294,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#if MICROPY_SSL_MBEDTLS
-#define MICROPY_PORT_ROOT_POINTER_MBEDTLS void **mbedtls_memory;
-#else
-#define MICROPY_PORT_ROOT_POINTER_MBEDTLS
-#endif
-
 #if MICROPY_BLUETOOTH_NIMBLE
 struct _mp_bluetooth_nimble_root_pointers_t;
 struct _mp_bluetooth_nimble_malloc_t;
@@ -354,7 +349,6 @@ struct _mp_bluetooth_btstack_root_pointers_t;
     mp_obj_list_t mod_network_nic_list; \
     \
     /* root pointers for sub-systems */ \
-    MICROPY_PORT_ROOT_POINTER_MBEDTLS \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH_BTSTACK \
     \