refactor: rewrite kernel's make script

[lunaix-os.git] / lunaix-os / kernel / proc0.c

diff --git a/lunaix-os/kernel/proc0.c b/lunaix-os/kernel/proc0.c
index 2029bc593ccf9ccef10f896f4c38beb4464be184..bb9b3d9293e0d784774c4321170951923154029d 100644 (file)
--- a/lunaix-os/kernel/proc0.c
+++ b/lunaix-os/kernel/proc0.c
@@ -68,7 +68,7 @@ exec_initd()
 {
     int errno = 0;
 
 {
     int errno = 0;
 

-    if ((errno = exec_kexecve("/mnt/lunaix-os/usr/init", NULL, NULL))) {
+    if ((errno = exec_kexecve("/mnt/lunaix-os/usr/bin/init", NULL, NULL))) {

         goto fail;
     }
 
         goto fail;
     }
 


@@ -102,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
 extern multiboot_info_t* _k_init_mb_info; /* k_init.c */
 
 void


@@ -150,9 +150,9 @@ init_platform()
     unlock_reserved_memory();
 
     // clean up
     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);

     }
 }
 
     }
 }
 


@@ -171,26 +171,33 @@ unlock_reserved_memory()
 void
 __do_reserved_memory(int unlock)
 {
 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);
     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];
     // 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;
         }
         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;
         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);
         if (!unlock) {
             kprintf("mem: freeze: %p..%p type=%x\n",
                     pa,
                     pa + pg_num * PG_SIZE,
                     mmap.type);

+

             for (; j < pg_num; j++) {
             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;
                 if (_pa >= KERNEL_MM_BASE) {
                     // Don't fuck up our kernel space!
                     break;


@@ -199,6 +206,7 @@ __do_reserved_memory(int unlock)
                 pmm_mark_page_occupied(
                   KERNEL_PID, _pa >> PG_SIZE_BITS, PP_FGLOCKED);
             }
                 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 {
             // Save the progress for later unmapping.
             mmaps[i].len_low = j * PG_SIZE;
         } else {


@@ -206,8 +214,9 @@ __do_reserved_memory(int unlock)
                     pa,
                     pa + pg_num * PG_SIZE,
                     mmap.type);
                     pa,
                     pa + pg_num * PG_SIZE,
                     mmap.type);

+

             for (; j < pg_num; j++) {
             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);
                 vmm_del_mapping(VMS_SELF, _pa);
                 if (mmap.type == MULTIBOOT_MEMORY_ACPI_RECLAIMABLE) {
                     pmm_mark_page_free(_pa >> PG_SIZE_BITS);