Let's gooo!

5 files changed, 18 insertions, 4 deletions

diff --git a/libc/alloc.c b/libc/alloc.c
index 11639a6..f621c4e 100644
--- a/libc/alloc.c
+++ b/libc/alloc.c
@@ -303,6 +303,9 @@ static void _free(void *ptr)
 
 void *zalloc(u32 size)
 {
+#ifdef userspace
+	panic("AAH!\n");
+#endif
 	void *ret = malloc(size);
 	memset(ret, 0, size);
 	return ret;
@@ -311,6 +314,9 @@ void *zalloc(u32 size)
 // Naive realloc implementation - TODO!
 void *realloc(void *ptr, u32 size)
 {
+#ifdef userspace
+	panic("AAH!\n");
+#endif
 	if (!ptr)
 		return malloc(size);
 
@@ -330,6 +336,9 @@ void *realloc(void *ptr, u32 size)
 
 void *malloc_debug(u32 size, const char *file, int line, const char *func, const char *inp)
 {
+#ifdef userspace
+	panic("AAH!\n");
+#endif
 	assert(size < (100 << 20)); // Don't brag with memory pls
 	void *ret = _malloc(size);
 
@@ -343,6 +352,9 @@ void *malloc_debug(u32 size, const char *file, int line, const char *func, const
 
 void free_debug(void *ptr, const char *file, int line, const char *func, const char *inp)
 {
+#ifdef userspace
+	panic("AAH!\n");
+#endif
 	if (ptr)
 		_free(ptr);
 
diff --git a/libc/inc/def.h b/libc/inc/def.h
index 945ccb0..db1c95e 100644
--- a/libc/inc/def.h
+++ b/libc/inc/def.h
@@ -25,6 +25,7 @@ typedef unsigned long long u64;
 
 #define UNUSED(a) ((void)(a))
 
+#define NORETURN __attribute__((noreturn))
 #define NO_SANITIZE __attribute__((no_sanitize("undefined")))
 #define PACKED __attribute__((packed))
 #define ALIGNED(align) __attribute__((aligned(align)))
diff --git a/libc/inc/print.h b/libc/inc/print.h
index 110ba4c..58b5dc6 100644
--- a/libc/inc/print.h
+++ b/libc/inc/print.h
@@ -4,13 +4,14 @@
 #define PRINT_H
 
 #include "arg.h"
+#include <def.h>
 
 int printf(const char *format, ...);
 int vprintf(const char *format, va_list ap);
 int sprintf(char *str, const char *format, ...);
 int vsprintf(char *str, const char *format, va_list ap);
 int print(const char *str);
-void panic(const char *format, ...);
+NORETURN void panic(const char *format, ...);
 
 #ifdef userspace
 int vfprintf(const char *path, const char *format, va_list ap);
diff --git a/libc/print.c b/libc/print.c
index ca2ab98..173e117 100644
--- a/libc/print.c
+++ b/libc/print.c
@@ -230,7 +230,7 @@ void print_trace(u32 count)
 
 #endif
 
-void panic(const char *format, ...)
+NORETURN void panic(const char *format, ...)
 {
 	char buf[1024] = { 0 };
 	va_list ap;
diff --git a/libc/sanitize.c b/libc/sanitize.c
index 8cfec49..8514e49 100644
--- a/libc/sanitize.c
+++ b/libc/sanitize.c
@@ -13,13 +13,13 @@
 u32 __stack_chk_guard = STACK_CHK_GUARD;
 
 void __stack_chk_fail(void);
-void __stack_chk_fail(void)
+NORETURN void __stack_chk_fail(void)
 {
 	panic("FATAL: Stack smashing detected\n");
 }
 
 void __stack_chk_fail_local(void);
-void __stack_chk_fail_local(void)
+NORETURN void __stack_chk_fail_local(void)
 {
 	panic("FATAL: Local stack smashing detected\n");
 }