From f3d071ca69190d3793b6256ffe9418861f00d917 Mon Sep 17 00:00:00 2001
From: CTCaer <ctcaer@gmail.com>
Date: Wed, 28 Aug 2019 02:08:12 +0300
Subject: [PATCH] mem: Remove memalign

It doesn't do what it should anyway.
---
 bootloader/ianos/ianos.c  | 2 +-
 bootloader/mem/heap.c     | 9 ++-------
 bootloader/mem/heap.h     | 1 -
 nyx/nyx_gui/ianos/ianos.c | 2 +-
 nyx/nyx_gui/mem/heap.c    | 9 ++-------
 nyx/nyx_gui/mem/heap.h    | 1 -
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/bootloader/ianos/ianos.c b/bootloader/ianos/ianos.c
index fe973a6..039cdc5 100644
--- a/bootloader/ianos/ianos.c
+++ b/bootloader/ianos/ianos.c
@@ -132,7 +132,7 @@ uintptr_t ianos_loader(bool sdmount, char *path, elfType_t type, void *moduleCon
 		sd_unmount();
 		break;
 	default:
-		elfBuf = memalign(ctx.align, ctx.memsz);
+		elfBuf = malloc(ctx.memsz); // Aligned to 0x10 by default.
 	}
 
 	if (!elfBuf)
diff --git a/bootloader/mem/heap.c b/bootloader/mem/heap.c
index e637dd2..4971d8a 100644
--- a/bootloader/mem/heap.c
+++ b/bootloader/mem/heap.c
@@ -107,17 +107,12 @@ void heap_init(u32 base)
 
 void *malloc(u32 size)
 {
-	return (void *)_heap_alloc(&_heap, size, 0x10);
-}
-
-void *memalign(u32 align, u32 size)
-{
-	return (void *)_heap_alloc(&_heap, size, align);
+	return (void *)_heap_alloc(&_heap, size, sizeof(hnode_t));
 }
 
 void *calloc(u32 num, u32 size)
 {
-	void *res = (void *)_heap_alloc(&_heap, num * size, 0x10);
+	void *res = (void *)_heap_alloc(&_heap, num * size, sizeof(hnode_t));
 	memset(res, 0, num * size);
 	return res;
 }
diff --git a/bootloader/mem/heap.h b/bootloader/mem/heap.h
index ad0783c..24cb64e 100644
--- a/bootloader/mem/heap.h
+++ b/bootloader/mem/heap.h
@@ -23,6 +23,5 @@ void heap_init(u32 base);
 void *malloc(u32 size);
 void *calloc(u32 num, u32 size);
 void free(void *buf);
-void *memalign(u32 align, u32 size);
 
 #endif
diff --git a/nyx/nyx_gui/ianos/ianos.c b/nyx/nyx_gui/ianos/ianos.c
index a1fd29e..eec79b6 100644
--- a/nyx/nyx_gui/ianos/ianos.c
+++ b/nyx/nyx_gui/ianos/ianos.c
@@ -100,7 +100,7 @@ uintptr_t ianos_loader(bool sdmount, char *path, elfType_t type, void *moduleCon
 		sd_unmount(true);
 		break;
 	default:
-		elfBuf = memalign(ctx.align, ctx.memsz);
+		elfBuf = malloc(ctx.memsz); // Aligned to 0x10 by default.
 	}
 
 	if (!elfBuf)
diff --git a/nyx/nyx_gui/mem/heap.c b/nyx/nyx_gui/mem/heap.c
index 27f443c..4ccd4f8 100644
--- a/nyx/nyx_gui/mem/heap.c
+++ b/nyx/nyx_gui/mem/heap.c
@@ -107,17 +107,12 @@ void heap_init(u32 base)
 
 void *malloc(u32 size)
 {
-	return (void *)_heap_alloc(&_heap, size, 0x10);
-}
-
-void *memalign(u32 align, u32 size)
-{
-	return (void *)_heap_alloc(&_heap, size, align);
+	return (void *)_heap_alloc(&_heap, size, sizeof(hnode_t));
 }
 
 void *calloc(u32 num, u32 size)
 {
-	void *res = (void *)_heap_alloc(&_heap, num * size, 0x10);
+	void *res = (void *)_heap_alloc(&_heap, num * size, sizeof(hnode_t));
 	memset(res, 0, num * size);
 	return res;
 }
diff --git a/nyx/nyx_gui/mem/heap.h b/nyx/nyx_gui/mem/heap.h
index ad0783c..24cb64e 100644
--- a/nyx/nyx_gui/mem/heap.h
+++ b/nyx/nyx_gui/mem/heap.h
@@ -23,6 +23,5 @@ void heap_init(u32 base);
 void *malloc(u32 size);
 void *calloc(u32 num, u32 size);
 void free(void *buf);
-void *memalign(u32 align, u32 size);
 
 #endif