MUCH work in libc

Also cleaned up some syscalls etc

32 files changed, 521 insertions, 8 deletions

diff --git a/src/userspace/libc/math.h b/src/userspace/libc/math.h
index a2010c9..0ecde4e 100644
--- a/src/userspace/libc/math.h
+++ b/src/userspace/libc/math.h
@@ -8,6 +8,7 @@
 // Exponential and logarithmic
 
 // Power
+int pow(int base, int exp);
 
 // Error and gamma
 
diff --git a/src/userspace/libc/math/pow.c b/src/userspace/libc/math/pow.c
new file mode 100644
index 0000000..5cdcfa5
--- /dev/null
+++ b/src/userspace/libc/math/pow.c
@@ -0,0 +1,13 @@
+int pow(int base, int exp)
+{
+	if (exp < 0)
+		return 0;
+
+	if (!exp)
+		return 1;
+
+	int ret = base;
+	for (int i = 1; i < exp; i++)
+		ret *= base;
+	return ret;
+}
\ No newline at end of file
diff --git a/src/userspace/libc/stdarg.h b/src/userspace/libc/stdarg.h
index 9442742..2f45f23 100644
--- a/src/userspace/libc/stdarg.h
+++ b/src/userspace/libc/stdarg.h
@@ -1,6 +1,9 @@
 #ifndef MELVIX_STDARG_H
 #define MELVIX_STDARG_H
 
-// va_{list,start,arg,end,copy}
+typedef __builtin_va_list va_list;
+#define va_start __builtin_va_start
+#define va_end __builtin_va_end
+#define va_arg __builtin_va_arg
 
 #endif
\ No newline at end of file
diff --git a/src/userspace/libc/stdio.h b/src/userspace/libc/stdio.h
index 13ab933..d6779dd 100644
--- a/src/userspace/libc/stdio.h
+++ b/src/userspace/libc/stdio.h
@@ -1,8 +1,16 @@
 #ifndef MELVIX_STDIO_H
 #define MELVIX_STDIO_H
 
+#include <stdarg.h>
+
 // File operations
 
 // Character input/output
+char getch();
+void putch(char ch);
+void puts(char *data);
+
+void printf(char *fmt, ...);
+void vprintf(char *fmt, va_list args);
 
 #endif
\ No newline at end of file
diff --git a/src/userspace/libc/stdio/getch.c b/src/userspace/libc/stdio/getch.c
new file mode 100644
index 0000000..93d3d00
--- /dev/null
+++ b/src/userspace/libc/stdio/getch.c
@@ -0,0 +1,74 @@
+#include <stdint.h>
+#include <syscall.h>
+
+// TODO: Move keymaps somewhere more appropriate
+char keymap[128] = {
+	0 /*E*/,   27,	     '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-',	  '=',
+	'\b',	   '\t',     'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[',	  ']',
+	'\n',	   17 /*C*/, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'',	  '`',
+	14 /*LS*/, '\\',     'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 14 /*RS*/, '*',
+	0, // Alt key
+	' ', // Space bar
+	15, // Caps lock
+	0,	   0,	     0,	  0,   0,   0,	 0,   0,   0,	0, // F keys
+	0, // Num lock
+	0, // Scroll lock
+	0, // Home key
+	0, // Up arrow
+	0, // Page up
+	'-',
+	0, // Left arrow
+	0,
+	0, // Right arrow
+	'+',
+	0, // End key
+	0, // Down arrow
+	0, // Page down
+	0, // Insert key
+	0, // Delete key
+	0,	   0,	     0,
+	0, // F11
+	0, // F12
+	0, // Other keys
+};
+
+char shift_keymap[128] = {
+	0 /*E*/,   27,	     '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_',	  '+',
+	'\b',	   '\t',     'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{',	  '}',
+	'\n',	   17 /*C*/, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"',	  '~',
+	14 /*LS*/, '|',	     'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', 14 /*RS*/, '*',
+	0, // Alt key
+	' ', // Space bar
+	15, // Caps lock
+	0,	   0,	     0,	  0,   0,   0,	 0,   0,   0,	0, // F keys
+	0, // Num lock
+	0, // Scroll lock
+	0, // Home key
+	0, // Up arrow
+	0, // Page up
+	'-',
+	0, // Left arrow
+	0,
+	0, // Right arrow
+	'+',
+	0, // End key
+	0, // Down arrow
+	0, // Page down
+	0, // Insert key
+	0, // Delete key
+	0,	   0,	     0,
+	0, // F11
+	0, // F12
+	0, // Other keys
+};
+
+char *getch()
+{
+	// TODO: Add shift support
+	u8 scancode = syscall_scancode();
+	if ((scancode & 0x80) == 0) { // Press
+		return keymap[scancode];
+	} else { // Release
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/src/userspace/libc/stdio/printf.c b/src/userspace/libc/stdio/printf.c
new file mode 100644
index 0000000..3951250
--- /dev/null
+++ b/src/userspace/libc/stdio/printf.c
@@ -0,0 +1,10 @@
+#include <stdarg.h>
+#include <stdio.h>
+
+void printf(char *fmt, ...)
+{
+	va_list args;
+	va_start(args, fmt);
+	vprintf(fmt, args);
+	va_end(args);
+}
\ No newline at end of file
diff --git a/src/userspace/libc/stdio/putch.c b/src/userspace/libc/stdio/putch.c
new file mode 100644
index 0000000..3bc5a2e
--- /dev/null
+++ b/src/userspace/libc/stdio/putch.c
@@ -0,0 +1,7 @@
+#include <syscall.h>
+
+void putch(char ch)
+{
+	if (ch != 0)
+		syscall_putch(ch);
+}
\ No newline at end of file
diff --git a/src/userspace/libc/stdio/puts.c b/src/userspace/libc/stdio/puts.c
new file mode 100644
index 0000000..a4fd3ea
--- /dev/null
+++ b/src/userspace/libc/stdio/puts.c
@@ -0,0 +1,9 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+void puts(char *data)
+{
+	for (u8 i = 0; i < strlen(data); i++)
+		putch(data[i]);
+}
\ No newline at end of file
diff --git a/src/userspace/libc/stdio/vprintf.c b/src/userspace/libc/stdio/vprintf.c
new file mode 100644
index 0000000..dc5ed23
--- /dev/null
+++ b/src/userspace/libc/stdio/vprintf.c
@@ -0,0 +1,46 @@
+#include <stdint.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+void vprintf(char *fmt, va_list args)
+{
+	u8 readyToFormat = 0;
+
+	char buff = 0;
+
+	for (; *fmt; fmt++) {
+		if (readyToFormat) {
+			if (*fmt == '%') {
+				putch('%');
+				readyToFormat = 0;
+				continue;
+			}
+
+			buff = *fmt;
+			if (buff == 's') {
+				char *str = va_arg(args, char *);
+				puts(str);
+				readyToFormat = 0;
+			} else if (buff == 'x') {
+				char *p = htoa((u32)va_arg(args, int));
+				puts(p);
+				free(p);
+				readyToFormat = 0;
+			} else if (buff == 'd') {
+				char *p = itoa(va_arg(args, int));
+				puts(p);
+				free(p);
+				readyToFormat = 0;
+			} else if (buff == 'c') {
+				putch((char)va_arg(args, int));
+				readyToFormat = 0;
+			}
+		} else {
+			if (*fmt == '%')
+				readyToFormat = 1;
+			else
+				putch(*fmt);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/userspace/libc/stdlib.h b/src/userspace/libc/stdlib.h
index dfc97e8..4140c4c 100644
--- a/src/userspace/libc/stdlib.h
+++ b/src/userspace/libc/stdlib.h
@@ -1,10 +1,18 @@
 #ifndef MELVIX_STDLIB_H
 #define MELVIX_STDLIB_H
 
+#include <stdint.h>
+
 // String conversion
+char *itoa(int n);
+int atoi(char *str);
+char *htoa(u32 n);
+int htoi(char *str);
 
 // Exit functions
 
 // Memory management
+void *malloc(u8 size);
+void free(void *addr);
 
 #endif
\ No newline at end of file
diff --git a/src/userspace/libc/stdlib/atoi.c b/src/userspace/libc/stdlib/atoi.c
new file mode 100644
index 0000000..21b6c25
--- /dev/null
+++ b/src/userspace/libc/stdlib/atoi.c
@@ -0,0 +1,28 @@
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+#include <math.h>
+
+int atoi(char *str)
+{
+	u8 s_str = strlen(str);
+	if (!s_str)
+		return 0;
+
+	u8 negative = 0;
+	if (str[0] == '-')
+		negative = 1;
+
+	u8 i = 0;
+	if (negative)
+		i++;
+
+	int ret = 0;
+	for (; i < s_str; i++) {
+		ret += (str[i] - '0') * pow(10, (int)((s_str - i) - 1));
+	}
+
+	if (negative)
+		ret *= -1;
+	return ret;
+}
\ No newline at end of file
diff --git a/src/userspace/libc/stdlib/free.c b/src/userspace/libc/stdlib/free.c
new file mode 100644
index 0000000..65e9769
--- /dev/null
+++ b/src/userspace/libc/stdlib/free.c
@@ -0,0 +1,7 @@
+#include <stdint.h>
+#include <syscall.h>
+
+void free(void *addr)
+{
+	syscall_free((u32)addr);
+}
\ No newline at end of file
diff --git a/src/userspace/libc/stdlib/htoa.c b/src/userspace/libc/stdlib/htoa.c
new file mode 100644
index 0000000..2b7d5c4
--- /dev/null
+++ b/src/userspace/libc/stdlib/htoa.c
@@ -0,0 +1,31 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+static const char HTOA_TABLE[] = "0123456789ABCDEF";
+
+char *htoa(u32 n)
+{
+	char *ret = (char *)malloc(10);
+
+	int i = 0;
+	while (n) {
+		ret[i++] = HTOA_TABLE[n & 0xF];
+		n >>= 4;
+	}
+
+	if (!i) {
+		ret[0] = '0';
+		i++;
+	}
+
+	for (; i <= 9; i++)
+		ret[i] = 0;
+
+	char *aux = strdup(ret);
+	free(ret);
+	ret = aux;
+
+	strinv(ret);
+	return ret;
+}
\ No newline at end of file
diff --git a/src/userspace/libc/stdlib/htoi.c b/src/userspace/libc/stdlib/htoi.c
new file mode 100644
index 0000000..cf79b7a
--- /dev/null
+++ b/src/userspace/libc/stdlib/htoi.c
@@ -0,0 +1,24 @@
+#include <stdint.h>
+#include <stddef.h>
+#include <math.h>
+#include <string.h>
+
+int htoi(char *str)
+{
+	u8 s_str = strlen(str);
+
+	u8 i = 0;
+	int ret = 0;
+	for (; i < s_str; i++) {
+		char c = str[i];
+		int aux = 0;
+		if (c >= '0' && c <= '9')
+			aux = c - '0';
+		else if (c >= 'A' && c <= 'F')
+			aux = (c - 'A') + 10;
+
+		ret += aux * pow(16, (int)((s_str - i) - 1));
+	}
+
+	return ret;
+}
\ No newline at end of file
diff --git a/src/userspace/libc/stdlib/itoa.c b/src/userspace/libc/stdlib/itoa.c
new file mode 100644
index 0000000..8311ad1
--- /dev/null
+++ b/src/userspace/libc/stdlib/itoa.c
@@ -0,0 +1,43 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <math.h>
+#include <string.h>
+
+static const char ITOA_TABLE[] = "0123456789";
+
+char *itoa(int n)
+{
+	if (!n) {
+		char *ret = (char *)malloc(2);
+		ret[0] = '0';
+		ret[1] = 0;
+		return ret;
+	}
+	u8 negative = (u8)(n < 0);
+	if (negative)
+		n *= -1;
+
+	int sz;
+	for (sz = 0; n % pow(10, sz) != n; sz++) {
+	}
+
+	char *ret = (char *)malloc((u32)(sz + 1));
+
+	for (int i = 0; i < sz; i++) {
+		int digit = (n % pow(10, i + 1)) / pow(10, i);
+		ret[i] = ITOA_TABLE[digit];
+	}
+	ret[sz] = 0;
+
+	if (negative) {
+		char *aux = (char *)malloc((u32)(sz + 2));
+		strcpy(aux, ret);
+		aux[sz] = '-';
+		aux[sz + 1] = 0;
+		free(ret);
+		ret = aux;
+	}
+
+	strinv(ret);
+	return ret;
+}
\ No newline at end of file
diff --git a/src/userspace/libc/stdlib/malloc.c b/src/userspace/libc/stdlib/malloc.c
new file mode 100644
index 0000000..b738eed
--- /dev/null
+++ b/src/userspace/libc/stdlib/malloc.c
@@ -0,0 +1,7 @@
+#include <stdint.h>
+#include <syscall.h>
+
+void *malloc(u8 size)
+{
+	return (void *)syscall_malloc(size);
+}
\ No newline at end of file
diff --git a/src/userspace/libc/string.h b/src/userspace/libc/string.h
new file mode 100644
index 0000000..10b7688
--- /dev/null
+++ b/src/userspace/libc/string.h
@@ -0,0 +1,29 @@
+#ifndef MELVIX_STRING_H
+#define MELVIX_STRING_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+u8 strlen(char *str);
+
+void strcpy(char *dest, char *orig);
+
+void strdisp(char *str, int n);
+
+void strcat(char *dest, char *orig);
+
+void strcati(char *dest, char *orig);
+
+char strcmp(char *a, char *b);
+
+int strncmp(char *s1, char *s2, int c);
+
+char *strdup(char *orig);
+
+void strinv(char *str);
+
+char *strstr(char *in, char *str);
+
+char *strsep(char **stringp, char *delim);
+
+#endif
\ No newline at end of file
diff --git a/src/userspace/libc/string/strcat.c b/src/userspace/libc/string/strcat.c
new file mode 100644
index 0000000..f62d6e2
--- /dev/null
+++ b/src/userspace/libc/string/strcat.c
@@ -0,0 +1,12 @@
+#include <stdint.h>
+#include <string.h>
+
+void strcat(char *dest, char *orig)
+{
+	u8 s_dest = strlen(dest);
+	u8 s_orig = strlen(orig);
+
+	for (u8 i = 0; i < s_orig; i++)
+		dest[s_dest + i] = orig[i];
+	dest[s_dest + s_orig] = 0;
+}
\ No newline at end of file
diff --git a/src/userspace/libc/string/strcati.c b/src/userspace/libc/string/strcati.c
new file mode 100644
index 0000000..5da986d
--- /dev/null
+++ b/src/userspace/libc/string/strcati.c
@@ -0,0 +1,10 @@
+#include <stdint.h>
+#include <string.h>
+
+void strcati(char *dest, char *orig)
+{
+	u8 s_orig = strlen(orig);
+	strdisp(dest, (int)s_orig);
+	for (u8 i = 0; i < s_orig; i++)
+		dest[i] = orig[i];
+}
\ No newline at end of file
diff --git a/src/userspace/libc/string/strcmp.c b/src/userspace/libc/string/strcmp.c
new file mode 100644
index 0000000..4282520
--- /dev/null
+++ b/src/userspace/libc/string/strcmp.c
@@ -0,0 +1,14 @@
+#include <stdint.h>
+#include <string.h>
+
+char strcmp(char *a, char *b)
+{
+	if (strlen(a) != strlen(b))
+		return 1;
+
+	for (u8 i = 0; i < strlen(a); i++)
+		if (a[i] != b[i])
+			return 1;
+
+	return 0;
+}
\ No newline at end of file
diff --git a/src/userspace/libc/string/strcpy.c b/src/userspace/libc/string/strcpy.c
new file mode 100644
index 0000000..733f7ba
--- /dev/null
+++ b/src/userspace/libc/string/strcpy.c
@@ -0,0 +1,11 @@
+#include <stdint.h>
+#include <string.h>
+
+void strcpy(char *dest, char *orig)
+{
+	u8 s_orig = strlen(orig);
+
+	for (u8 i = 0; i < s_orig; i++)
+		dest[i] = orig[i];
+	dest[s_orig] = 0;
+}
\ No newline at end of file
diff --git a/src/userspace/libc/string/strdisp.c b/src/userspace/libc/string/strdisp.c
new file mode 100644
index 0000000..7e8c05a
--- /dev/null
+++ b/src/userspace/libc/string/strdisp.c
@@ -0,0 +1,15 @@
+#include <stdint.h>
+#include <string.h>
+
+void strdisponce(char *str)
+{
+	for (u8 i = sizeof(str) + 2; i > 0; i--)
+		str[i] = str[i - 1];
+	str[0] = 0;
+}
+
+void strdisp(char *str, int n)
+{
+	for (int i = 0; i < n; i++)
+		strdisponce(str);
+}
\ No newline at end of file
diff --git a/src/userspace/libc/string/strdup.c b/src/userspace/libc/string/strdup.c
new file mode 100644
index 0000000..f2a7c35
--- /dev/null
+++ b/src/userspace/libc/string/strdup.c
@@ -0,0 +1,12 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+char *strdup(char *orig)
+{
+	u8 s_orig = strlen(orig);
+	char *ret = (char *)malloc(s_orig + 1);
+	strcpy(ret, orig);
+	return ret;
+}
\ No newline at end of file
diff --git a/src/userspace/libc/string/strinv.c b/src/userspace/libc/string/strinv.c
new file mode 100644
index 0000000..38f0b78
--- /dev/null
+++ b/src/userspace/libc/string/strinv.c
@@ -0,0 +1,14 @@
+#include <stdint.h>
+#include <string.h>
+
+void strinv(char *str)
+{
+	u8 s_str = strlen(str);
+
+	int iterations = (int)s_str / 2;
+	for (int i = 0; i < iterations; i++) {
+		char aux = str[i];
+		str[i] = str[(s_str - i) - 1];
+		str[(s_str - i) - 1] = aux;
+	}
+}
\ No newline at end of file
diff --git a/src/userspace/libc/string/strlen.c b/src/userspace/libc/string/strlen.c
new file mode 100644
index 0000000..cc8b804
--- /dev/null
+++ b/src/userspace/libc/string/strlen.c
@@ -0,0 +1,9 @@
+#include <stdint.h>
+
+u8 strlen(char *str)
+{
+	u8 len = 0;
+	while (str[len])
+		len++;
+	return len;
+}
\ No newline at end of file
diff --git a/src/userspace/libc/string/strncmp.c b/src/userspace/libc/string/strncmp.c
new file mode 100644
index 0000000..450fbd8
--- /dev/null
+++ b/src/userspace/libc/string/strncmp.c
@@ -0,0 +1,16 @@
+int strncmp(char *s1, char *s2, int c)
+{
+	int result = 0;
+
+	while (c) {
+		result = *s1 - *s2++;
+
+		if ((result != 0) || (*s1++ == 0)) {
+			break;
+		}
+
+		c--;
+	}
+
+	return result;
+}
\ No newline at end of file
diff --git a/src/userspace/libc/string/strsep.c b/src/userspace/libc/string/strsep.c
new file mode 100644
index 0000000..badbf0f
--- /dev/null
+++ b/src/userspace/libc/string/strsep.c
@@ -0,0 +1,25 @@
+#include <stddef.h>
+
+char *strsep(char **stringp, char *delim)
+{
+	char *s;
+	const char *spanp;
+	int c, sc;
+	char *tok;
+	if ((s = *stringp) == NULL)
+		return (NULL);
+	for (tok = s;;) {
+		c = *s++;
+		spanp = delim;
+		do {
+			if ((sc = *spanp++) == c) {
+				if (c == 0)
+					s = NULL;
+				else
+					s[-1] = 0;
+				*stringp = s;
+				return (tok);
+			}
+		} while (sc != 0);
+	}
+}
\ No newline at end of file
diff --git a/src/userspace/libc/string/strstr.c b/src/userspace/libc/string/strstr.c
new file mode 100644
index 0000000..c87f3fc
--- /dev/null
+++ b/src/userspace/libc/string/strstr.c
@@ -0,0 +1,25 @@
+#include <stdint.h>
+#include <string.h>
+
+char *strstr(char *in, char *str)
+{
+	char c;
+	u32 len;
+
+	c = *str++;
+	if (!c)
+		return (char *)in;
+
+	len = strlen(str);
+	do {
+		char sc;
+
+		do {
+			sc = *in++;
+			if (!sc)
+				return (char *)0;
+		} while (sc != c);
+	} while (strncmp(in, str, len) != 0);
+
+	return (char *)(in - 1);
+}
\ No newline at end of file
diff --git a/src/userspace/libc/syscall.c b/src/userspace/libc/syscall.c
index 9194eef..1741376 100644
--- a/src/userspace/libc/syscall.c
+++ b/src/userspace/libc/syscall.c
@@ -9,7 +9,7 @@ DEFN_SYSCALL1(exec, 1, char *);
 
 DEFN_SYSCALL1(putch, 2, char *);
 
-DEFN_SYSCALL0(getch, 3);
+DEFN_SYSCALL0(scancode, 3);
 
 DEFN_SYSCALL1(malloc, 4, u32);
 
diff --git a/src/userspace/libc/syscall.h b/src/userspace/libc/syscall.h
index 90ebee5..e8ab95a 100644
--- a/src/userspace/libc/syscall.h
+++ b/src/userspace/libc/syscall.h
@@ -74,7 +74,7 @@ DECL_SYSCALL1(exec, char *);
 
 DECL_SYSCALL1(putch, char *);
 
-DECL_SYSCALL0(getch);
+DECL_SYSCALL0(scancode);
 
 DECL_SYSCALL1(malloc, u32);
 
diff --git a/src/userspace/programs/init.c b/src/userspace/programs/init.c
index 91564c0..af4f5f1 100644
--- a/src/userspace/programs/init.c
+++ b/src/userspace/programs/init.c
@@ -1,9 +1,11 @@
+#include <stdio.h>
 #include <syscall.h>
 #include <gui.h>
 
 void main()
 {
-	gui_init();
+	printf("Initializing userspace...\n");
+	//gui_init();
 	syscall_exec("/bin/sh");
 
 	while (1) {
diff --git a/src/userspace/programs/sh.c b/src/userspace/programs/sh.c
index 6dcb206..8da493e 100644
--- a/src/userspace/programs/sh.c
+++ b/src/userspace/programs/sh.c
@@ -1,13 +1,13 @@
 #include <syscall.h>
+#include <stdio.h>
 
 void main()
 {
-	syscall_putch('\n');
-	syscall_putch('>');
-	syscall_putch(' ');
+	printf("Test for printf! %d\n", 42);
+	printf("[~] ");
 
 	while (1) {
-		syscall_putch(syscall_getch());
+		putch(getch());
 	}
 
 	syscall_halt();