X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/0cf90cca0c924622f3fee8d2a3fafa8238363dc6..b91be0033265b5b6bd716bd39cb0971da41906c4:/lunaix-os/kernel/proc0.c

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index abd0ac0..15afae4 100644
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -1,9 +1,10 @@
 #include <lunaix/block.h>
 #include <lunaix/common.h>
+#include <lunaix/exec.h>
 #include <lunaix/foptions.h>
 #include <lunaix/fs.h>
+#include <lunaix/fs/probe_boot.h>
 #include <lunaix/fs/twifs.h>
-#include <lunaix/ld.h>
 #include <lunaix/lxconsole.h>
 #include <lunaix/mm/cake.h>
 #include <lunaix/mm/pmm.h>
@@ -25,7 +26,7 @@
 #include <hal/pci.h>
 #include <hal/rtc.h>
 
-#include <arch/x86/boot/multiboot.h>
+#include <arch/i386/boot/multiboot.h>
 
 #include <klibc/string.h>
 
@@ -48,14 +49,14 @@ mount_bootmedium()
 {
     struct v_dnode* dnode;
     int errno = 0;
-    if ((errno = vfs_walk_proc("/dev/sdb", &dnode, NULL, 0))) {
+    struct device* dev = probe_boot_medium();
+    if (!dev) {
         kprintf(KERROR "fail to acquire device. (%d)", errno);
         return 0;
     }
 
-    struct device* dev = (struct device*)dnode->inode->data;
     if ((errno = vfs_mount("/mnt/lunaix-os", "iso9660", dev, 0))) {
-        kprintf(KERROR "fail to boot medium. (%d)", errno);
+        kprintf(KERROR "fail to mount boot medium. (%d)", errno);
         return 0;
     }
 
@@ -66,31 +67,11 @@ int
 exec_initd()
 {
     int errno = 0;
-    struct ld_param param;
-    char filename[] = "/mnt/lunaix-os/usr/init";
 
-    ld_create_param(&param, __current, VMS_SELF);
-
-    if ((errno = exec_load_byname(&param, filename, NULL, NULL))) {
+    if ((errno = exec_kexecve("/mnt/lunaix-os/usr/bin/init", NULL, NULL))) {
         goto fail;
     }
 
-    // user space
-    asm volatile("movw %0, %%ax\n"
-                 "movw %%ax, %%es\n"
-                 "movw %%ax, %%ds\n"
-                 "movw %%ax, %%fs\n"
-                 "movw %%ax, %%gs\n"
-                 "pushl %0\n"
-                 "pushl %1\n"
-                 "pushl %2\n"
-                 "pushl %3\n"
-                 "retf" ::"i"(UDATA_SEG),
-                 "r"(param.info.stack_top),
-                 "i"(UCODE_SEG),
-                 "r"(param.info.entry)
-                 : "eax", "memory");
-
     fail("should not reach");
 
 fail:
@@ -121,9 +102,9 @@ __proc0()
     }
 }
 
-extern uint8_t __kernel_start;            /* link/linker.ld */
-extern uint8_t __kernel_end;              /* link/linker.ld */
-extern uint8_t __init_hhk_end;            /* link/linker.ld */
+extern u8_t __kernel_start;               /* link/linker.ld */
+extern u8_t __kernel_end;                 /* link/linker.ld */
+extern u8_t __init_hhk_end;               /* link/linker.ld */
 extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 
 void
@@ -169,9 +150,9 @@ init_platform()
     unlock_reserved_memory();
 
     // clean up
-    for (size_t i = 0; i < (uintptr_t)(&__init_hhk_end); i += PG_SIZE) {
-        vmm_del_mapping(VMS_SELF, (void*)i);
-        pmm_free_page(KERNEL_PID, (void*)i);
+    for (size_t i = 0; i < (ptr_t)(&__init_hhk_end); i += PG_SIZE) {
+        vmm_del_mapping(VMS_SELF, (ptr_t)i);
+        pmm_free_page(KERNEL_PID, (ptr_t)i);
     }
 }
 
@@ -190,26 +171,33 @@ unlock_reserved_memory()
 void
 __do_reserved_memory(int unlock)
 {
-    multiboot_memory_map_t* mmaps = _k_init_mb_info->mmap_addr;
+    multiboot_memory_map_t* mmaps =
+      (multiboot_memory_map_t*)_k_init_mb_info->mmap_addr;
+
     size_t map_size =
       _k_init_mb_info->mmap_length / sizeof(multiboot_memory_map_t);
+
     // v_mapping mapping;
     for (unsigned int i = 0; i < map_size; i++) {
         multiboot_memory_map_t mmap = mmaps[i];
-        uint8_t* pa = PG_ALIGN(mmap.addr_low);
+        ptr_t pa = PG_ALIGN(mmap.addr_low);
+
         if (mmap.type == MULTIBOOT_MEMORY_AVAILABLE || pa <= MEM_4MB) {
             // Don't fuck up our kernel code or any free area!
             continue;
         }
+
         size_t pg_num = CEIL(mmap.len_low, PG_SIZE_BITS);
         size_t j = 0;
+
         if (!unlock) {
             kprintf("mem: freeze: %p..%p type=%x\n",
                     pa,
                     pa + pg_num * PG_SIZE,
                     mmap.type);
+
             for (; j < pg_num; j++) {
-                uintptr_t _pa = pa + (j << PG_SIZE_BITS);
+                ptr_t _pa = pa + (j << PG_SIZE_BITS);
                 if (_pa >= KERNEL_MM_BASE) {
                     // Don't fuck up our kernel space!
                     break;
@@ -218,6 +206,7 @@ __do_reserved_memory(int unlock)
                 pmm_mark_page_occupied(
                   KERNEL_PID, _pa >> PG_SIZE_BITS, PP_FGLOCKED);
             }
+
             // Save the progress for later unmapping.
             mmaps[i].len_low = j * PG_SIZE;
         } else {
@@ -225,8 +214,9 @@ __do_reserved_memory(int unlock)
                     pa,
                     pa + pg_num * PG_SIZE,
                     mmap.type);
+
             for (; j < pg_num; j++) {
-                uintptr_t _pa = pa + (j << PG_SIZE_BITS);
+                ptr_t _pa = pa + (j << PG_SIZE_BITS);
                 vmm_del_mapping(VMS_SELF, _pa);
                 if (mmap.type == MULTIBOOT_MEMORY_ACPI_RECLAIMABLE) {
                     pmm_mark_page_free(_pa >> PG_SIZE_BITS);