ports/rp2: HACK: Bring up modbtree with tracked heap.

Author: Gadgetoid

extmod/extmod.cmake

@@ -135,6 +135,13 @@ if(MICROPY_PY_BTREE)
         ${MICROPY_LIB_BERKELEY_DIR}/include
     )
 
+    target_link_options(micropy_extmod_btree PRIVATE
+        -Wl,--wrap=malloc
+        -Wl,--wrap=free
+        -Wl,--wrap=realloc
+        -Wl,--wrap=calloc
+    )
+
     if(NOT BERKELEY_DB_CONFIG_FILE)
         set(BERKELEY_DB_CONFIG_FILE "${MICROPY_DIR}/extmod/berkeley-db/berkeley_db_config_port.h")
     endif()
@@ -152,11 +159,28 @@ if(MICROPY_PY_BTREE)
 
     list(APPEND MICROPY_DEF_CORE
         MICROPY_PY_BTREE=1
+        MICROPY_STREAMS_POSIX_API # Required for mp_stream_posix_ functions if !MICROPY_ENABLE_DYNRUNTIME
         BERKELEY_DB_CONFIG_FILE="${BERKELEY_DB_CONFIG_FILE}"
     )
 
     list(APPEND MICROPY_SOURCE_EXTMOD
         ${MICROPY_EXTMOD_DIR}/modbtree.c
+        ${MICROPY_EXTMOD_DIR}/modbtree_malloc.c
+
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_close.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_conv.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_debug.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_delete.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_get.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_open.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_overflow.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_page.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_put.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_search.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_seq.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_split.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_utils.c
+        ${MICROPY_LIB_BERKELEY_DIR}/mpool/mpool.c
     )
 endif()
 

extmod/modbtree_malloc.c

@@ -0,0 +1,39 @@
+#include "py/runtime.h"
+#include <string.h>
+
+void *__wrap_malloc(size_t size) {
+    // Allocate an extra sizeof(size_t) bytes
+    size_t *addr = (size_t *)m_tracked_calloc(sizeof(uint8_t), size + sizeof(size_t));
+    // Tag our memory with its allocated size
+    *addr = size;
+    // Skip past the size_t size
+    addr++;
+
+    mp_printf(&mp_plat_print, "malloc %lu %p : %p\n", size, addr, (uint8_t *)addr + size);
+
+    return (void *)addr;
+}
+
+void __wrap_free(void *p) {
+    size_t *pp = (size_t *)p;   // Convert our void pointer to size_t* so we can read the size marker
+    pp--;                       // Skip back to get our real start
+    size_t size = *pp;
+    m_tracked_free((void *)pp);
+
+    mp_printf(&mp_plat_print, "free %p (size %d)\n", p, size);
+}
+
+void *__wrap_realloc(void *p, size_t size) {
+    void *addr = __wrap_malloc(size);
+    size_t old_size = *((size_t *)p - 1);
+    memcpy(addr, p, old_size < size ? old_size : size);
+    __wrap_free(p);
+
+    mp_printf(&mp_plat_print, "realloc %lu -> %lu, %p -> %p : %p\n", old_size, size, p, addr, (uint8_t *)addr + size);
+
+    return addr;
+}
+
+void *__wrap_calloc(size_t nitems, size_t size) {
+    return __wrap_malloc(size * nitems);
+}

ports/rp2/CMakeLists.txt

@@ -69,6 +69,7 @@ endif()
 # Enable extmod components that will be configured by extmod.cmake.
 # A board may also have enabled additional components.
 set(MICROPY_SSL_MBEDTLS ON)
+set(MICROPY_PY_BTREE ON)
 
 # Use the local cyw43_driver instead of the one in pico-sdk
 if (MICROPY_PY_NETWORK_CYW43)
@@ -87,6 +88,8 @@ include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
 # Define the top-level project
 project(${MICROPY_TARGET})
 
+set(SKIP_PICO_MALLOC 1)
+
 pico_sdk_init()
 
 include(${MICROPY_DIR}/py/usermod.cmake)
@@ -508,6 +511,8 @@ target_link_libraries(${MICROPY_TARGET} micropy_lib_mbedtls)
 
 target_link_libraries(${MICROPY_TARGET} usermod)
 
+#target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree)
+
 target_include_directories(${MICROPY_TARGET} PRIVATE
     ${MICROPY_INC_CORE}
     ${MICROPY_INC_USERMOD}
@@ -526,6 +531,11 @@ target_link_options(${MICROPY_TARGET} PRIVATE
     -Wl,--defsym=__micropy_c_heap_size__=${MICROPY_C_HEAP_SIZE}
     -Wl,--wrap=dcd_event_handler
     -Wl,--wrap=runtime_init_clocks
+
+    -Wl,--wrap=malloc
+    -Wl,--wrap=free
+    -Wl,--wrap=realloc
+    -Wl,--wrap=calloc
 )
 
 if(PICO_RP2350)
@@ -558,6 +568,7 @@ set_source_files_properties(
 )
 
 target_compile_definitions(${MICROPY_TARGET} PRIVATE
+    ${MICROPY_DEF_CORE} # Required for btree module definitions
     ${MICROPY_DEF_BOARD}
     FFCONF_H=\"${MICROPY_OOFATFS_DIR}/ffconf.h\"
     LFS1_NO_MALLOC LFS1_NO_DEBUG LFS1_NO_WARN LFS1_NO_ERROR LFS1_NO_ASSERT