Added userspace libc and began userspace based shell

24 files changed, 376 insertions, 5 deletions

diff --git a/src/userspace/main.c b/src/userspace/main.c
index f7cd3ba..c85e64d 100644
--- a/src/userspace/main.c
+++ b/src/userspace/main.c
@@ -1,9 +1,15 @@
 #include <syscall.h>
+#include <mlibc/string.h>
 
 void user_main()
 {
-    const char hello[] = "> Successfully to usermode!\n";
-    syscall_write(0, hello, sizeof(hello));
+    char hello[] = "> Successfully switched to usermode!\n";
+    syscall_write(hello);
 
-    while (1) {};
+    while (1) {
+        char *command = (char *) syscall_read();
+        char test[1024];
+        strcpy(test, command);
+        syscall_write(command);
+    };
 }
\ No newline at end of file
diff --git a/src/userspace/mlibc/math.h b/src/userspace/mlibc/math.h
new file mode 100644
index 0000000..c9abf7d
--- /dev/null
+++ b/src/userspace/mlibc/math.h
@@ -0,0 +1,6 @@
+#ifndef MELVIX_MATH_H
+#define MELVIX_MATH_H
+
+int pow(int base, int exp);
+
+#endif
diff --git a/src/userspace/mlibc/math/pow.c b/src/userspace/mlibc/math/pow.c
new file mode 100644
index 0000000..24670a0
--- /dev/null
+++ b/src/userspace/mlibc/math/pow.c
@@ -0,0 +1,10 @@
+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/mlibc/stdio.h b/src/userspace/mlibc/stdio.h
new file mode 100644
index 0000000..d102dd6
--- /dev/null
+++ b/src/userspace/mlibc/stdio.h
@@ -0,0 +1,16 @@
+#ifndef MELVIX_STDIO_H
+#define MELVIX_STDIO_H
+
+#include <stdarg.h>
+
+char getch();
+
+char *readline();
+
+void writec(char c);
+
+void vprintf(const char *format, va_list args);
+
+void printf(const char *format, ...);
+
+#endif
diff --git a/src/userspace/mlibc/stdio/getch.c b/src/userspace/mlibc/stdio/getch.c
new file mode 100644
index 0000000..114b6e0
--- /dev/null
+++ b/src/userspace/mlibc/stdio/getch.c
@@ -0,0 +1,7 @@
+// #include <syscall.h>
+
+char getch()
+{
+    // return ((char *) syscall_read())[0];
+    return 0;
+}
\ No newline at end of file
diff --git a/src/userspace/mlibc/stdio/printf.c b/src/userspace/mlibc/stdio/printf.c
new file mode 100644
index 0000000..5617d03
--- /dev/null
+++ b/src/userspace/mlibc/stdio/printf.c
@@ -0,0 +1,10 @@
+#include <stdarg.h>
+#include <mlibc/stdio.h>
+
+void printf(const 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/mlibc/stdio/readline.c b/src/userspace/mlibc/stdio/readline.c
new file mode 100644
index 0000000..a7082e6
--- /dev/null
+++ b/src/userspace/mlibc/stdio/readline.c
@@ -0,0 +1,7 @@
+// #include <syscall.h>
+
+char *readline()
+{
+    // return (char *) syscall_read();
+    return "0";
+}
\ No newline at end of file
diff --git a/src/userspace/mlibc/stdio/vprintf.c b/src/userspace/mlibc/stdio/vprintf.c
new file mode 100644
index 0000000..92999b6
--- /dev/null
+++ b/src/userspace/mlibc/stdio/vprintf.c
@@ -0,0 +1,53 @@
+#include <stdarg.h>
+#include <stdint.h>
+#include <mlibc/stdio.h>
+#include <mlibc/string.h>
+#include <mlibc/stdlib.h>
+#include <mlibc/stdlib.h>
+
+void __writes(const char *data)
+{
+    for (size_t i = 0; i < strlen(data); i++) writec(data[i]);
+}
+
+void vprintf(const char *fmt, va_list args)
+{
+    uint8_t readyToFormat = 0;
+
+    char buff = 0;
+
+    for (; *fmt; fmt++) {
+        if (readyToFormat) {
+            if (*fmt == '%') {
+                writec('%');
+                readyToFormat = 0;
+                continue;
+            }
+
+            buff = *fmt;
+            if (buff == 's') {
+                const char *str = va_arg(args, const char*);
+                __writes(str);
+                readyToFormat = 0;
+            } else if (buff == 'x') {
+                char *p = htoa((uint32_t) va_arg(args, int));
+                __writes(p);
+                // kfree(p);
+                readyToFormat = 0;
+            } else if (buff == 'd') {
+                char *p = itoa(va_arg(args, int));
+                __writes(p);
+                // kfree(p);
+                readyToFormat = 0;
+            } else if (buff == 'c') {
+                writec((char) va_arg(args, int));
+                readyToFormat = 0;
+            }
+        } else {
+            if (*fmt == '%')
+                readyToFormat = 1;
+            else
+                writec(*fmt);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/userspace/mlibc/stdio/writec.c b/src/userspace/mlibc/stdio/writec.c
new file mode 100644
index 0000000..9ffb1a1
--- /dev/null
+++ b/src/userspace/mlibc/stdio/writec.c
@@ -0,0 +1,4 @@
+void writec(char c)
+{
+    //
+}
\ No newline at end of file
diff --git a/src/userspace/mlibc/stdlib.h b/src/userspace/mlibc/stdlib.h
new file mode 100644
index 0000000..ff8603c
--- /dev/null
+++ b/src/userspace/mlibc/stdlib.h
@@ -0,0 +1,20 @@
+#ifndef MELVIX_STDLIB_H
+#define MELVIX_STDLIB_H
+
+#include <stdint.h>
+
+#ifndef MELVIX_STRING_H
+
+#include <mlibc/string.h>
+
+#endif
+
+char *itoa(int n);
+
+int atoi(char *str);
+
+char *htoa(uint32_t n);
+
+int htoi(char *str);
+
+#endif
diff --git a/src/userspace/mlibc/stdlib/atoi.c b/src/userspace/mlibc/stdlib/atoi.c
new file mode 100644
index 0000000..0643372
--- /dev/null
+++ b/src/userspace/mlibc/stdlib/atoi.c
@@ -0,0 +1,24 @@
+#include <mlibc/math.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <mlibc/string.h>
+
+int atoi(char *str)
+{
+    size_t s_str = strlen(str);
+    if (!s_str) return 0;
+
+    uint8_t negative = 0;
+    if (str[0] == '-') negative = 1;
+
+    size_t i = 0;
+    if (negative) i++;
+
+    int ret = 0;
+    for (; i < s_str; i++) {
+        ret += (str[i] - '0') * pow(10, (s_str - i) - 1);
+    }
+
+    if (negative) ret *= -1;
+    return ret;
+}
\ No newline at end of file
diff --git a/src/userspace/mlibc/stdlib/htoa.c b/src/userspace/mlibc/stdlib/htoa.c
new file mode 100644
index 0000000..098e1c8
--- /dev/null
+++ b/src/userspace/mlibc/stdlib/htoa.c
@@ -0,0 +1,31 @@
+#include <stdint.h>
+#include <mlibc/string.h>
+#include <mlibc/stdlib.h>
+
+static const char __HTOA_TABLE[] = "0123456789ABCDEF";
+
+char *htoa(uint32_t n)
+{
+    char *ret = 0;
+    //kmalloc(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);
+    // kfree(ret);
+    ret = aux;
+
+    strinv(ret);
+    return ret;
+}
\ No newline at end of file
diff --git a/src/userspace/mlibc/stdlib/htoi.c b/src/userspace/mlibc/stdlib/htoi.c
new file mode 100644
index 0000000..489e5c0
--- /dev/null
+++ b/src/userspace/mlibc/stdlib/htoi.c
@@ -0,0 +1,23 @@
+#include <stddef.h>
+#include <mlibc/math.h>
+#include <mlibc/string.h>
+
+int htoi(char *str)
+{
+    size_t s_str = strlen(str);
+
+    size_t 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, (s_str - i) - 1);
+    }
+
+    return ret;
+}
\ No newline at end of file
diff --git a/src/userspace/mlibc/stdlib/itoa.c b/src/userspace/mlibc/stdlib/itoa.c
new file mode 100644
index 0000000..55c1383
--- /dev/null
+++ b/src/userspace/mlibc/stdlib/itoa.c
@@ -0,0 +1,47 @@
+#include <stdint.h>
+#include <mlibc/math.h>
+#include <mlibc/string.h>
+#include <mlibc/stdlib.h>
+
+static const char __ITOA_TABLE[] = "0123456789";
+
+char *itoa(int n)
+{
+    //if (paging_enabled == 0)
+    //    return "0"; // kmalloc isn't available
+
+    if (!n) {
+        char *ret = 0;
+        //kmalloc(2);
+        ret[0] = '0';
+        ret[1] = 0;
+        return ret;
+    }
+    uint8_t negative = (uint8_t) (n < 0);
+    if (negative) n *= -1;
+
+    int sz;
+    for (sz = 0; n % pow(10, sz) != n; sz++) {}
+
+    char *ret = 0;
+    //kmalloc(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 = 0;
+        //kmalloc(sz + 2);
+        strcpy(aux, ret);
+        aux[sz] = '-';
+        aux[sz + 1] = 0;
+        // kfree(ret);
+        ret = aux;
+    }
+
+    strinv(ret);
+    return ret;
+}
\ No newline at end of file
diff --git a/src/userspace/mlibc/string.h b/src/userspace/mlibc/string.h
new file mode 100644
index 0000000..fe925cb
--- /dev/null
+++ b/src/userspace/mlibc/string.h
@@ -0,0 +1,22 @@
+#ifndef MELVIX_STRING_H
+#define MELVIX_STRING_H
+
+#include <stddef.h>
+
+size_t strlen(const char *str);
+
+void strcpy(char *dest, const char *orig);
+
+void strdisp(char *str, int n);
+
+void strcat(char *dest, const char *orig);
+
+void strcati(char *dest, const char *orig);
+
+char strcmp(const char *a, const char *b);
+
+char *strdup(const char *orig);
+
+void strinv(char *str);
+
+#endif
diff --git a/src/userspace/mlibc/string/strcat.c b/src/userspace/mlibc/string/strcat.c
new file mode 100644
index 0000000..0448430
--- /dev/null
+++ b/src/userspace/mlibc/string/strcat.c
@@ -0,0 +1,10 @@
+#include <mlibc/string.h>
+
+void strcat(char *dest, const char *orig)
+{
+    size_t s_dest = strlen(dest);
+    size_t s_orig = strlen(orig);
+
+    for (size_t 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/mlibc/string/strcati.c b/src/userspace/mlibc/string/strcati.c
new file mode 100644
index 0000000..8fdcc1a
--- /dev/null
+++ b/src/userspace/mlibc/string/strcati.c
@@ -0,0 +1,8 @@
+#include <mlibc/string.h>
+
+void strcati(char *dest, const char *orig)
+{
+    size_t s_orig = strlen(orig);
+    strdisp(dest, (int) s_orig);
+    for (size_t i = 0; i < s_orig; i++) dest[i] = orig[i];
+}
\ No newline at end of file
diff --git a/src/userspace/mlibc/string/strcmp.c b/src/userspace/mlibc/string/strcmp.c
new file mode 100644
index 0000000..be6c17a
--- /dev/null
+++ b/src/userspace/mlibc/string/strcmp.c
@@ -0,0 +1,10 @@
+#include <mlibc/string.h>
+
+char strcmp(const char *a, const char *b)
+{
+    if (strlen(a) != strlen(b)) return 1;
+
+    for (size_t 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/mlibc/string/strcpy.c b/src/userspace/mlibc/string/strcpy.c
new file mode 100644
index 0000000..8dfa65f
--- /dev/null
+++ b/src/userspace/mlibc/string/strcpy.c
@@ -0,0 +1,9 @@
+#include <mlibc/string.h>
+
+void strcpy(char *dest, const char *orig)
+{
+    size_t s_orig = strlen(orig);
+
+    for (size_t 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/mlibc/string/strdisp.c b/src/userspace/mlibc/string/strdisp.c
new file mode 100644
index 0000000..d793718
--- /dev/null
+++ b/src/userspace/mlibc/string/strdisp.c
@@ -0,0 +1,12 @@
+#include <mlibc/string.h>
+
+void strdisponce(char *str)
+{
+    for (size_t 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/mlibc/string/strdup.c b/src/userspace/mlibc/string/strdup.c
new file mode 100644
index 0000000..bb3597d
--- /dev/null
+++ b/src/userspace/mlibc/string/strdup.c
@@ -0,0 +1,11 @@
+#include <mlibc/string.h>
+#include <mlibc/stdlib.h>
+
+char *strdup(const char *orig)
+{
+    // size_t s_orig = strlen(orig);
+    char *ret = 0;
+    // kmalloc(s_orig + 1);
+    strcpy(ret, orig);
+    return ret;
+}
\ No newline at end of file
diff --git a/src/userspace/mlibc/string/strinv.c b/src/userspace/mlibc/string/strinv.c
new file mode 100644
index 0000000..71f3355
--- /dev/null
+++ b/src/userspace/mlibc/string/strinv.c
@@ -0,0 +1,13 @@
+#include <mlibc/string.h>
+
+void strinv(char *str)
+{
+    size_t 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/mlibc/string/strlen.c b/src/userspace/mlibc/string/strlen.c
new file mode 100644
index 0000000..133ee3d
--- /dev/null
+++ b/src/userspace/mlibc/string/strlen.c
@@ -0,0 +1,8 @@
+#include <mlibc/string.h>
+
+size_t strlen(const char *str)
+{
+    size_t len = 0;
+    while (str[len]) len++;
+    return len;
+}
\ No newline at end of file
diff --git a/src/userspace/syscall.h b/src/userspace/syscall.h
index 162b219..6750093 100644
--- a/src/userspace/syscall.h
+++ b/src/userspace/syscall.h
@@ -62,11 +62,15 @@
 /**
  * DECLARATIONS
  */
-DECL_SYSCALL3(write, int, const char *, int);
+DECL_SYSCALL1(write, char *);
+
+DECL_SYSCALL0(read);
 
 /**
  * DEFINITIONS
  */
-DEFN_SYSCALL3(write, 1, int, const char *, int);
+DEFN_SYSCALL1(write, 1, char *);
+
+DEFN_SYSCALL0(read, 2);
 
 #endif