Print to streams instead of serial console

6 files changed, 132 insertions, 8 deletions

diff --git a/libc/inc/def.h b/libc/inc/def.h
index 2c77203..a6e3210 100644
--- a/libc/inc/def.h
+++ b/libc/inc/def.h
@@ -23,6 +23,7 @@ typedef unsigned long long u64;
  * Macros
  */
 
+#define EOF (-1)
 #define NULL ((void *)0)
 
 #define U8_MAX 255
diff --git a/libc/inc/print.h b/libc/inc/print.h
index 04668b2..575cc5f 100644
--- a/libc/inc/print.h
+++ b/libc/inc/print.h
@@ -11,4 +11,14 @@ int vprintf(const char *format, va_list ap);
 int vsprintf(char *str, const char *format, va_list ap);
 int print(const char *str);
 
+#ifdef userspace
+int vfprintf(const char *path, const char *format, va_list ap);
+int fprintf(const char *path, const char *format, ...);
+int log(const char *format, ...);
+int err(int code, const char *format, ...);
+#else
+#include <proc.h>
+int print_app(enum stream_defaults id, const char *proc_name, const char *str);
+#endif
+
 #endif
diff --git a/libc/inc/sys.h b/libc/inc/sys.h
index 231a0e2..d7e5e3d 100644
--- a/libc/inc/sys.h
+++ b/libc/inc/sys.h
@@ -28,8 +28,6 @@ enum sys {
 	SYS_NET_RECEIVE, // Receive data from socket
 };
 
-enum event_type { EVENT_KEYBOARD, EVENT_MOUSE, EVENT_MAX };
-
 struct message {
 	int src;
 	int type;
@@ -70,7 +68,7 @@ int sys5(enum sys num, int d1, int d2, int d3, int d4, int d5);
 int sysv(enum sys num, ...);
 
 /**
- * Wrappers
+ * Syscall wrappers
  */
 
 #define loop() sys0(SYS_LOOP)
diff --git a/libc/mem.c b/libc/mem.c
index f9eaa3a..50b8cab 100644
--- a/libc/mem.c
+++ b/libc/mem.c
@@ -364,6 +364,11 @@ void _free(void *ptr)
 void *malloc_debug(u32 size, const char *file, int line, const char *func, const char *inp)
 {
 	void *ret = _malloc(size);
+
+	(void)file;
+	(void)line;
+	(void)func;
+	(void)inp;
 	/* #ifdef kernel */
 	/* 	printf("K"); */
 	/* #else */
@@ -375,12 +380,17 @@ 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)
 {
+	if (ptr)
+		_free(ptr);
+
+	(void)file;
+	(void)line;
+	(void)func;
+	(void)inp;
 	/* #ifdef kernel */
 	/* 	printf("K"); */
 	/* #else */
 	/* 	printf("U"); */
 	/* #endif */
 	/* 	printf("FREE\t%s:%d: %s: 0x%x (%s)\n", file, line, func, ptr, inp); */
-	if (ptr)
-		_free(ptr);
 }
diff --git a/libc/print.c b/libc/print.c
index e98fca6..a66692e 100644
--- a/libc/print.c
+++ b/libc/print.c
@@ -63,6 +63,8 @@ int vsprintf(char *str, const char *format, va_list ap)
 			} else if (buf == 'c') {
 				str[i] = (char)va_arg(ap, int);
 				i++;
+			} else {
+				assert(0);
 			}
 		} else {
 			if (*format == '%')
@@ -79,15 +81,35 @@ int vsprintf(char *str, const char *format, va_list ap)
 	return strlen(str);
 }
 
-int vprintf(const char *format, va_list ap)
+#ifdef userspace
+
+#include <sys.h>
+#define PATH_OUT "/proc/self/io/out"
+#define PATH_LOG "/proc/self/io/log"
+#define PATH_ERR "/proc/self/io/err"
+
+int vfprintf(const char *path, const char *format, va_list ap)
 {
 	char buf[1024] = { 0 };
 	int len = vsprintf(buf, format, ap);
-	serial_print(buf); // TODO: Remove temporary serial print
+	return write(path, buf, 0, len);
+}
+
+int vprintf(const char *format, va_list ap)
+{
+	return vfprintf(PATH_OUT, format, ap);
+}
+
+int fprintf(const char *path, const char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	int len = vfprintf(path, format, ap);
+	va_end(ap);
+
 	return len;
 }
 
-// TODO: Fix printf for *very* large strings (serial works)
 int printf(const char *format, ...)
 {
 	va_list ap;
@@ -98,8 +120,87 @@ int printf(const char *format, ...)
 	return len;
 }
 
+int log(const char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	int len = vfprintf(PATH_LOG, format, ap);
+	va_end(ap);
+
+	return len;
+}
+
+int err(int code, const char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	vfprintf(PATH_ERR, format, ap);
+	va_end(ap);
+	exit(code);
+}
+
 int print(const char *str)
 {
+	return write(PATH_OUT, str, 0, strlen(str));
+}
+
+#else
+
+// The kernel prints everything into the serial console
+#include <proc.h>
+
+#define RED "\x1B[1;31m"
+#define GRN "\x1B[1;32m"
+#define YEL "\x1B[1;33m"
+#define BLU "\x1B[1;34m"
+#define MAG "\x1B[1;35m"
+#define CYN "\x1B[1;36m"
+#define WHT "\x1B[1;37m"
+#define RES "\x1B[0m"
+
+void print_kernel(const char *str)
+{
+	serial_print(RED);
+	serial_print("[KER] ");
+	serial_print(str);
+	serial_print(RES);
+}
+
+int vprintf(const char *format, va_list ap)
+{
+	char buf[1024] = { 0 };
+	int len = vsprintf(buf, format, ap);
+	print_kernel(buf);
+	return len;
+}
+
+int printf(const char *format, ...)
+{
+	va_list ap;
+	va_start(ap, format);
+	int len = vprintf(format, ap);
+	va_end(ap);
+
+	return len;
+}
+
+int print_app(enum stream_defaults id, const char *proc_name, const char *str)
+{
+	if (id == STREAM_LOG)
+		serial_print(CYN "[LOG] to ");
+	else if (id == STREAM_ERR)
+		serial_print(YEL "[ERR] to ");
+	serial_print(proc_name);
+	serial_print(": ");
 	serial_print(str);
+	serial_print(RES);
+	return 1;
+}
+
+int print(const char *str)
+{
+	print_kernel(str);
 	return strlen(str);
 }
+
+#endif
diff --git a/libc/sys.c b/libc/sys.c
index bfc7a22..83f385b 100644
--- a/libc/sys.c
+++ b/libc/sys.c
@@ -4,6 +4,8 @@
 #include <arg.h>
 #include <sys.h>
 
+#if defined(userspace)
+
 /**
  * Definitions
  */
@@ -69,3 +71,5 @@ int sysv(enum sys num, ...)
 
 	return sys5(num, args[0], args[1], args[2], args[3], args[4]);
 }
+
+#endif