Merge branch 'main' into codex/fix-elf-execution-error-in-fsh-o03ydi

pradosh-arduino · web-flow · commit d5933e4a63c7 · 2026-03-22T15:09:50.000+05:30
diff --git a/Makefile b/Makefile
@@ -88,8 +88,8 @@ QEMU_COMMON = \
     -device rtl8139,netdev=eth0 \
     -netdev user,hostfwd=tcp::5555-:22,id=eth0 \
     -device ahci,id=ahci \
-    -drive if=none,format=raw,file=disk.img,id=nvmedisk \
-    -device nvme,drive=nvmedisk,serial=FROSTNVME0 \
+	-drive if=none,format=raw,file=disk.img,id=disk \
+    -device ide-hd,drive=disk,bus=ahci.0 \
     -drive if=none,media=cdrom,format=raw,file=$(ISO_FILE),id=cd0 \
     -device ide-cd,drive=cd0,bus=ahci.1 \
     -rtc base=localtime,clock=host \
diff --git a/disk.img b/disk.img
diff --git a/source/kernel/C/userland.c b/source/kernel/C/userland.c
@@ -334,6 +334,8 @@ void enter_userland_at(uint64_t code_entry) {
         : "r"(stack_top), "r"(code_entry)
         : "memory", "rax", "rbx", "rcx", "rdx", "rsi", "rdi", "r8", "r9", "r10", "r11"
     );
+
+    return 0;
 }
 
 int userland_exec(const char* path, int argc, const char* const* argv, const char* const* envp) {

Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,8 @@ void enter_userland_at(uint64_t code_entry) {`
`334`	`334`	`: "r"(stack_top), "r"(code_entry)`
`335`	`335`	`: "memory", "rax", "rbx", "rcx", "rdx", "rsi", "rdi", "r8", "r9", "r10", "r11"`
`336`	`336`	`);`
	`337`	`+`
	`338`	`+ return 0;`
`337`	`339`	`}`
`338`	`340`
`339`	`341`	`int userland_exec(const char* path, int argc, const char* const* argv, const char* const* envp) {`