Improved entire building chain (especially debugging)

5 files changed, 83 insertions, 45 deletions

diff --git a/libs/libc/alloc.c b/libs/libc/alloc.c
index 4913479..73fdf8b 100644
--- a/libs/libc/alloc.c
+++ b/libs/libc/alloc.c
@@ -382,16 +382,38 @@ static void *_realloc(void *ptr, u32 size)
 #define FUNC log
 #endif
 
-void *zalloc(u32 size)
+void *realloc_debug(void *ptr, u32 size, const char *file, int line, const char *func,
+		    const char *inp)
 {
-	void *ret = malloc(size);
-	memset(ret, 0, size);
+	assert(size < (100 << 20)); // Don't brag with memory pls
+	void *ret = _realloc(ptr, size);
+
+#if DEBUG_ALLOC
+	FUNC(PREFIX "REALLOC\t%s:%d: %s: 0x%x %dB (%s)\n", file, line, func, ret, size, inp);
+#else
+	UNUSED(file);
+	UNUSED(line);
+	UNUSED(func);
+	UNUSED(inp);
+#endif
 	return ret;
 }
 
-void *realloc(void *ptr, u32 size)
+void *zalloc_debug(u32 size, const char *file, int line, const char *func, const char *inp)
 {
-	return _realloc(ptr, size);
+	assert(size < (100 << 20)); // Don't brag with memory pls
+	void *ret = _malloc(size);
+	memset(ret, 0, size);
+
+#if DEBUG_ALLOC
+	FUNC(PREFIX "ZALLOC\t%s:%d: %s: 0x%x %dB (%s)\n", file, line, func, ret, size, inp);
+#else
+	UNUSED(file);
+	UNUSED(line);
+	UNUSED(func);
+	UNUSED(inp);
+#endif
+	return ret;
 }
 
 void *malloc_debug(u32 size, const char *file, int line, const char *func, const char *inp)
@@ -399,13 +421,14 @@ void *malloc_debug(u32 size, const char *file, int line, const char *func, const
 	assert(size < (100 << 20)); // Don't brag with memory pls
 	void *ret = _malloc(size);
 
-	(void)file;
-	(void)line;
-	(void)func;
-	(void)inp;
-	/* #ifdef KERNEL */
-	/* 	FUNC(PREFIX "MALLOC\t%s:%d: %s: 0x%x %dB (%s)\n", file, line, func, ret, size, inp); */
-	/* #endif */
+#if DEBUG_ALLOC
+	FUNC(PREFIX "MALLOC\t%s:%d: %s: 0x%x %dB (%s)\n", file, line, func, ret, size, inp);
+#else
+	UNUSED(file);
+	UNUSED(line);
+	UNUSED(func);
+	UNUSED(inp);
+#endif
 	return ret;
 }
 
@@ -413,11 +436,12 @@ void free_debug(void *ptr, const char *file, int line, const char *func, const c
 {
 	_free(ptr);
 
-	(void)file;
-	(void)line;
-	(void)func;
-	(void)inp;
-	/* #ifdef KERNEL */
-	/* 	FUNC(PREFIX "FREE\t%s:%d: %s: 0x%x (%s)\n", file, line, func, ptr, inp); */
-	/* #endif */
+#if DEBUG_ALLOC
+	FUNC(PREFIX "FREE\t%s:%d: %s: 0x%x (%s)\n", file, line, func, ptr, inp);
+#else
+	UNUSED(file);
+	UNUSED(line);
+	UNUSED(func);
+	UNUSED(inp);
+#endif
 }
diff --git a/libs/libc/inc/crypto.h b/libs/libc/inc/crypto.h
index b672c50..a67bb97 100644
--- a/libs/libc/inc/crypto.h
+++ b/libs/libc/inc/crypto.h
@@ -9,7 +9,7 @@ void md5(const void *initial_msg, u32 initial_len, u8 digest[16]) NONNULL;
 u32 crc32(u32 crc, const void *buf, u32 size) NONNULL;
 
 #ifdef KERNEL
-u32 crc32_user(u32 crc, const void *buf, u32 size) NONNULL;
+INLINE u32 crc32_user(u32 crc, const void *buf, u32 size) NONNULL;
 #endif
 
 #endif
diff --git a/libs/libc/inc/def.h b/libs/libc/inc/def.h
index 191a818..7338242 100644
--- a/libs/libc/inc/def.h
+++ b/libs/libc/inc/def.h
@@ -47,6 +47,7 @@ typedef unsigned long long u64;
 
 #define ATTR __attribute__
 #define NORETURN ATTR((noreturn))
+#define INLINE ATTR((gnu_inline)) inline
 #define NOINLINE ATTR((noinline))
 #define DEPRECATED ATTR((deprecated))
 #define NONNULL ATTR((nonnull))
diff --git a/libs/libc/inc/mem.h b/libs/libc/inc/mem.h
index 75174c9..a25feaf 100644
--- a/libs/libc/inc/mem.h
+++ b/libs/libc/inc/mem.h
@@ -5,22 +5,35 @@
 
 #include <def.h>
 
+// malloc
 ATTR((malloc))
 ATTR((alloc_size(1)))
-RET_NONNULL void *malloc_debug(u32 size, const char *file, int line, const char *func,
-			       const char *inp) NONNULL;
-ATTR((malloc)) ATTR((alloc_size(2))) RET_NONNULL void *realloc(void *ptr, u32 size);
-ATTR((malloc)) ATTR((alloc_size(1))) RET_NONNULL void *zalloc(u32 size);
-void free_debug(void *ptr, const char *file, int line, const char *func, const char *inp) NONNULL;
+INLINE RET_NONNULL void *malloc_debug(u32 size, const char *file, int line, const char *func,
+				      const char *inp) NONNULL;
 
+// realloc
+ATTR((malloc))
+ATTR((alloc_size(2)))
+INLINE RET_NONNULL void *realloc_debug(void *ptr, u32 size, const char *file, int line,
+				       const char *func, const char *inp);
+
+// zalloc
+ATTR((malloc))
+ATTR((alloc_size(1)))
+RET_NONNULL
+INLINE void *zalloc_debug(u32 size, const char *file, int line, const char *func, const char *inp);
+
+// free
+INLINE void free_debug(void *ptr, const char *file, int line, const char *func,
+		       const char *inp) NONNULL;
+
+// Debug wrappers
+#define realloc(ptr, size)                                                                         \
+	realloc_debug((void *)ptr, (u32)(size), __FILE__, __LINE__, __func__, #size)
+#define zalloc(size) zalloc_debug((u32)(size), __FILE__, __LINE__, __func__, #size)
 #define malloc(size) malloc_debug((u32)(size), __FILE__, __LINE__, __func__, #size)
 #define free(ptr) free_debug((void *)(ptr), __FILE__, __LINE__, __func__, #ptr)
 
-#ifdef KERNEL
-#define STACK_SIZE (1 << 20) // 1MiB
-#elif defined(USER)
-#endif
-
 void *memcpy(void *dest, const void *src, u32 n) NONNULL;
 void *memset(void *dest, u32 val, u32 n) NONNULL;
 void *memchr(void *src, char c, u32 n) NONNULL;
@@ -28,11 +41,11 @@ s32 memcmp(const void *s1, const void *s2, u32 n) NONNULL;
 u8 mememp(const u8 *buf, u32 n) NONNULL;
 
 #ifdef KERNEL
-void *memcpy_user(void *dest, const void *src, u32 n) NONNULL;
-void *memset_user(void *dest, u32 val, u32 n) NONNULL;
-void *memchr_user(void *src, char c, u32 n) NONNULL;
-s32 memcmp_user(const void *s1, const void *s2, u32 n) NONNULL;
-u8 mememp_user(const u8 *buf, u32 n) NONNULL;
+INLINE void *memcpy_user(void *dest, const void *src, u32 n) NONNULL;
+INLINE void *memset_user(void *dest, u32 val, u32 n) NONNULL;
+INLINE void *memchr_user(void *src, char c, u32 n) NONNULL;
+INLINE s32 memcmp_user(const void *s1, const void *s2, u32 n) NONNULL;
+INLINE u8 mememp_user(const u8 *buf, u32 n) NONNULL;
 #endif
 
 #endif
diff --git a/libs/libc/inc/str.h b/libs/libc/inc/str.h
index f024aaa..d4c197e 100644
--- a/libs/libc/inc/str.h
+++ b/libs/libc/inc/str.h
@@ -18,16 +18,16 @@ ATTR((malloc)) char *strdup(const char *s) NONNULL;
 
 #ifdef KERNEL
 
-PURE u32 strlen_user(const char *s) NONNULL;
-PURE u32 strnlen_user(const char *s, u32 max) NONNULL;
-u32 strlcpy_user(char *dst, const char *src, u32 size) NONNULL;
-PURE char *strchr_user(char *s, char c) NONNULL;
-PURE char *strrchr_user(char *s, char c) NONNULL;
-u32 strlcat_user(char *dst, const char *src, u32 size) NONNULL;
-s32 strcmp_user(const char *s1, const char *s2) NONNULL;
-s32 strncmp_user(const char *s1, const char *s2, u32 n) NONNULL;
-char *strinv_user(char *s) NONNULL;
-ATTR((malloc)) char *strdup_user(const char *s) NONNULL;
+INLINE PURE u32 strlen_user(const char *s) NONNULL;
+INLINE PURE u32 strnlen_user(const char *s, u32 max) NONNULL;
+INLINE u32 strlcpy_user(char *dst, const char *src, u32 size) NONNULL;
+INLINE PURE char *strchr_user(char *s, char c) NONNULL;
+INLINE PURE char *strrchr_user(char *s, char c) NONNULL;
+INLINE u32 strlcat_user(char *dst, const char *src, u32 size) NONNULL;
+INLINE s32 strcmp_user(const char *s1, const char *s2) NONNULL;
+INLINE s32 strncmp_user(const char *s1, const char *s2, u32 n) NONNULL;
+INLINE char *strinv_user(char *s) NONNULL;
+INLINE ATTR((malloc)) char *strdup_user(const char *s) NONNULL;
 
 #endif