X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=common%2Fmalloc_simple.c;h=eabbb70128b375286691489fe2248bb94b1296f1;hb=7787330200526023f49b4d60869a1c91e908132a;hp=9bf1fedd51687a8acd2fbd238ff4c5a5b417d0d5;hpb=e8d124fae0f3dff87348c989aa65ecf9b6eadc14;p=oweals%2Fu-boot.git

diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index 9bf1fedd51..eabbb70128 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -1,11 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Simple malloc implementation
  *
  * Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier:	GPL-2.0+
  */
 
+#define LOG_CATEGORY LOGC_ALLOC
+
 #include <common.h>
 #include <malloc.h>
 #include <mapmem.h>
@@ -13,30 +14,48 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void *malloc_simple(size_t bytes)
+static void *alloc_simple(size_t bytes, int align)
 {
-	ulong new_ptr;
+	ulong addr, new_ptr;
 	void *ptr;
 
-	new_ptr = gd->malloc_ptr + bytes;
-	if (new_ptr > gd->malloc_limit)
+	addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align);
+	new_ptr = addr + bytes - gd->malloc_base;
+	log_debug("size=%zx, ptr=%lx, limit=%lx: ", bytes, new_ptr,
+		  gd->malloc_limit);
+	if (new_ptr > gd->malloc_limit) {
+		log_err("alloc space exhausted\n");
 		return NULL;
-	ptr = map_sysmem(gd->malloc_base + gd->malloc_ptr, bytes);
+	}
+
+	ptr = map_sysmem(addr, bytes);
 	gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr));
+
+	return ptr;
+}
+
+void *malloc_simple(size_t bytes)
+{
+	void *ptr;
+
+	ptr = alloc_simple(bytes, 1);
+	if (!ptr)
+		return ptr;
+
+	log_debug("%lx\n", (ulong)ptr);
+
 	return ptr;
 }
 
 void *memalign_simple(size_t align, size_t bytes)
 {
-	ulong addr, new_ptr;
 	void *ptr;
 
-	addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align);
-	new_ptr = addr + bytes - gd->malloc_base;
-	if (new_ptr > gd->malloc_limit)
-		return NULL;
-	ptr = map_sysmem(addr, bytes);
-	gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr));
+	ptr = alloc_simple(bytes, align);
+	if (!ptr)
+		return ptr;
+	log_debug("aligned to %lx\n", (ulong)ptr);
+
 	return ptr;
 }
 
@@ -47,8 +66,16 @@ void *calloc(size_t nmemb, size_t elem_size)
 	void *ptr;
 
 	ptr = malloc(size);
+	if (!ptr)
+		return ptr;
 	memset(ptr, '\0', size);
 
 	return ptr;
 }
 #endif
+
+void malloc_simple_info(void)
+{
+	log_info("malloc_simple: %lx bytes used, %lx remain\n", gd->malloc_ptr,
+		 CONFIG_VAL(SYS_MALLOC_F_LEN) - gd->malloc_ptr);
+}