[heap] Fix allocator default by ram sizes

Author: salkinium

ext/tlsf/module.lb

@@ -59,9 +59,11 @@ def prepare(module, options):
     return True
 
 def build(env):
+    env.collect(":build:path.include", "modm/ext")
     env.outbasepath = "modm/ext/tlsf"
-    env.copy("tlsf.h")
-    env.template("tlsf.c.in", substitutions={
+    env.substitutions = {
         "sl_index_count_log2": math.ceil(math.log2(env["subdivisions"])),
         "fl_index_max": math.ceil(math.log2(env["minimum_pool_size"]))
-        })
+    }
+    env.copy("tlsf.h")
+    env.template("tlsf.c.in")

src/modm/platform/heap/cortex/heap_block.cpp

@@ -72,7 +72,7 @@ void* __wrap__calloc_r(struct _reent *r, size_t size)
 	return ptr;
 }
 
-void* __wrap__realloc_r(struct _reent *r, void *, size_t size)
+void* __wrap__realloc_r(struct _reent *r, void *p, size_t size)
 {
 	if (!p) return __wrap__malloc_r(r, size);
 	// NOT IMPLEMENTED!

src/modm/platform/heap/cortex/module.lb

@@ -13,7 +13,7 @@
 def continuous_ram_sizes(target):
     memories = listify(target.get_driver("core")["memory"])
     rams = ((int(m["start"], 16), int(m["start"], 16) + int(m["size"]))
-            for m in memories if "rw" in m["access"] and "backup" not in m["name"])
+            for m in memories if "rw" in m["access"] and "ram" in m["name"])
     rams = sorted(rams, key=lambda m: m[0])
 
     pools = [rams[0]]
@@ -38,7 +38,7 @@ def prepare(module, options):
 
     ram_sizes = continuous_ram_sizes(options[":target"])
     default_allocator = "newlib"
-    if len(ram_sizes):
+    if len(ram_sizes) > 1:
         default_allocator = "tlsf"
     elif ram_sizes[0] <= 4096:
         default_allocator = "block"