Semi-working C-based userspace syscalls

3 files changed, 32 insertions, 12 deletions

diff --git a/src/userspace/main.asm b/src/userspace/main.asm
deleted file mode 100644
index 4369f10..0000000
--- a/src/userspace/main.asm
+++ /dev/null
@@ -1,12 +0,0 @@
-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
new file mode 100644
index 0000000..22bb42a
--- /dev/null
+++ b/src/userspace/main.c
@@ -0,0 +1,10 @@
+#include <stddef.h>
+
+extern void syscall();
+
+void user_main()
+{
+    syscall();
+
+    while (1) {};
+}
\ No newline at end of file
diff --git a/src/userspace/start.asm b/src/userspace/start.asm
new file mode 100644
index 0000000..498f5f5
--- /dev/null
+++ b/src/userspace/start.asm
@@ -0,0 +1,22 @@
+bits 32
+section .start_section
+    dd _start
+
+section .text
+    global _start
+    extern user_main
+    _start:
+        mov esp, ebp
+        call user_main
+
+    global syscall
+    syscall:
+        mov eax, 1
+        lea edi, [ebp+welcome]
+        mov esi, welcome_sz
+        int 0x80
+        ret
+
+section .data
+        welcome db "Welcome to the userspace", 0x0A, 0x0A
+        welcome_sz equ $ - welcome
\ No newline at end of file