aboutsummaryrefslogtreecommitdiff
path: root/src/userspace
diff options
context:
space:
mode:
authorMarvin Borner2019-11-30 21:07:22 +0100
committerMarvin Borner2019-11-30 21:07:22 +0100
commit50f949d994c33ab23d63bdb9e8a438560ab0b4c4 (patch)
tree35089087979bd8cee4693c71264b1c537336e4dd /src/userspace
parentac947d45c288f62e927895afe7cd6a722ffdd8f8 (diff)
Working userspace!
Diffstat (limited to 'src/userspace')
-rw-r--r--src/userspace/main.asm12
-rw-r--r--src/userspace/main.c6
2 files changed, 12 insertions, 6 deletions
diff --git a/src/userspace/main.asm b/src/userspace/main.asm
new file mode 100644
index 0000000..4369f10
--- /dev/null
+++ b/src/userspace/main.asm
@@ -0,0 +1,12 @@
+bits 32
+mov esp, ebp
+
+mov eax, 1
+lea edi, [ebp+welcome]
+mov esi, welcome_sz
+int 0x80
+
+jmp $
+
+welcome db "Welcome to the userspace!", 0x0A, 0x0A
+welcome_sz equ $ - welcome \ No newline at end of file
diff --git a/src/userspace/main.c b/src/userspace/main.c
deleted file mode 100644
index 73e937f..0000000
--- a/src/userspace/main.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <kernel/syscall/syscall.h>
-
-void test_user()
-{
- syscall_serial_write("Hello, user world!\n");
-} \ No newline at end of file