1 files changed, 13 insertions, 7 deletions
diff --git a/libc/inc/mem.h b/libc/inc/mem.h
index 15505fd..e35ee62 100644
--- a/libc/inc/mem.h
+++ b/libc/inc/mem.h
@@ -5,16 +5,21 @@
 
 #include <def.h>
 
-// Huh
+int malloc_allocated;
+
+void *malloc_debug(u32 size, const char *file, int line, const char *func, const char *inp);
+void free_debug(void *ptr, const char *file, int line, const char *func, const char *inp);
+#define malloc(size) malloc_debug(size, __FILE__, __LINE__, __func__, #size)
+#define free(ptr) free_debug(ptr, __FILE__, __LINE__, __func__, #ptr)
+
+/* void *_malloc(u32 size); */
+/* void _free(void *ptr); */
+/* #define malloc(size) _malloc(size) */
+/* #define free(ptr) _free(ptr) */
+
 #ifdef kernel
-#define HEAP_SIZE 0x10000
-#define HEAP_MAGIC 0x42
 void heap_init(u32 start);
-void *malloc(u32 size);
-void free(void *ptr);
 #elif defined(userspace)
-void *malloc(u32 size);
-void free(void *ptr);
 #else
 #error "No lib target specified. Please use -Dkernel or -Duserspace"
 #endif
@@ -23,5 +28,6 @@ void *memcpy(void *dest, const void *src, u32 n);
 void *memset(void *dest, int val, u32 n);
 void *memchr(void *src, int c, u32 n);
 int memcmp(const void *s1, const void *s2, u32 n);
+int mememp(const u8 *buf, u32 n);
 
 #endif