aboutsummaryrefslogtreecommitdiff
path: root/src/kernel
diff options
context:
space:
mode:
authorMarvin Borner2020-04-28 19:15:47 +0200
committerMarvin Borner2020-04-28 19:15:47 +0200
commitbfe16de4be67565f1a1e7b1331fcbe3aedf9c54e (patch)
tree1bc7450acb82410753e34da30cb9f44d19b9e92b /src/kernel
parent4b8518b4e791c68154ec52badcc921b62afafb49 (diff)
Userspace rewrite -> IT WORKS! :)
Finally, after many months of work and rewrites the syscalls with constant char pointers work now :D
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/kernel.c4
-rw-r--r--src/kernel/syscall/syscall.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 3461913..1b34a73 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -68,7 +68,7 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address, uint32_t esp)
printf("%s", read_file("/etc/test"));
syscalls_install();
- struct process *proc = elf_load("/bin/user");
+ struct process *proc = elf_load("/bin/sh");
if (proc) {
proc->stdin = NULL;
proc->stdout = NULL;
@@ -79,4 +79,4 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address, uint32_t esp)
log("Okidoko!");
halt_loop();
// asm ("div %0" :: "r"(0)); // Exception testing x/0
-} \ No newline at end of file
+}
diff --git a/src/kernel/syscall/syscall.c b/src/kernel/syscall/syscall.c
index 1454198..f883f2e 100644
--- a/src/kernel/syscall/syscall.c
+++ b/src/kernel/syscall/syscall.c
@@ -35,4 +35,4 @@ void syscall_handler(struct regs *r)
void syscalls_install()
{
isr_install_handler(0x80, syscall_handler);
-} \ No newline at end of file
+}