From d94b024b73aeca06de417e0fd3c502495312a8b2 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 7 Dec 2019 13:40:28 +0100
Subject: Added userspace libc and began userspace based shell

---
 src/userspace/mlibc/stdio/getch.c    |  7 +++++
 src/userspace/mlibc/stdio/printf.c   | 10 +++++++
 src/userspace/mlibc/stdio/readline.c |  7 +++++
 src/userspace/mlibc/stdio/vprintf.c  | 53 ++++++++++++++++++++++++++++++++++++
 src/userspace/mlibc/stdio/writec.c   |  4 +++
 5 files changed, 81 insertions(+)
 create mode 100644 src/userspace/mlibc/stdio/getch.c
 create mode 100644 src/userspace/mlibc/stdio/printf.c
 create mode 100644 src/userspace/mlibc/stdio/readline.c
 create mode 100644 src/userspace/mlibc/stdio/vprintf.c
 create mode 100644 src/userspace/mlibc/stdio/writec.c

(limited to 'src/userspace/mlibc/stdio')

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
-- 
cgit v1.2.3