4-virtual_memory.md (#24)

[lunaix-os.git] / lunaix-os / kernel / exe / elf32 / ldelf32.c

diff --git a/lunaix-os/kernel/exe/elf32/ldelf32.c b/lunaix-os/kernel/exe/elf32/ldelf32.c
index 97db4bdcfb43609fbc04ce3915d49ebdd9da49f1..a72a14d15c4448b68fe0fb193b30bc9f39d902db 100644 (file)
--- a/lunaix-os/kernel/exe/elf32/ldelf32.c
+++ b/lunaix-os/kernel/exe/elf32/ldelf32.c
@@ -5,6 +5,8 @@
 #include <lunaix/mm/valloc.h>
 #include <lunaix/spike.h>
 
 #include <lunaix/mm/valloc.h>
 #include <lunaix/spike.h>
 

+#include <sys/mm/mempart.h>
+

 int
 elf32_smap(struct load_context* ldctx,
            const struct elf32* elf,
 int
 elf32_smap(struct load_context* ldctx,
            const struct elf32* elf,


@@ -29,16 +31,15 @@ elf32_smap(struct load_context* ldctx,
     uintptr_t va = phdre->p_va + base_va;
     struct exec_container* container = ldctx->container;
     struct mmap_param param = { .vms_mnt = container->vms_mnt,
     uintptr_t va = phdre->p_va + base_va;
     struct exec_container* container = ldctx->container;
     struct mmap_param param = { .vms_mnt = container->vms_mnt,

-                                .pvms = &container->proc->mm,
+                                .pvms = vmspace(container->proc),

                                 .proct = proct,
                                 .offset = PG_ALIGN(phdre->p_offset),
                                 .mlen = ROUNDUP(phdre->p_memsz, PG_SIZE),
                                 .proct = proct,
                                 .offset = PG_ALIGN(phdre->p_offset),
                                 .mlen = ROUNDUP(phdre->p_memsz, PG_SIZE),

-                                .flen = phdre->p_filesz,

                                 .flags = MAP_FIXED | MAP_PRIVATE,
                                 .type = REGION_TYPE_CODE };
 
     struct mm_region* seg_reg;
                                 .flags = MAP_FIXED | MAP_PRIVATE,
                                 .type = REGION_TYPE_CODE };
 
     struct mm_region* seg_reg;

-    int status = mem_map(NULL, &seg_reg, PG_ALIGN(va), elfile, &param);
+    int status = mmap_user(NULL, &seg_reg, PG_ALIGN(va), elfile, &param);

 
     if (!status) {
         size_t next_addr = phdre->p_memsz + va;
 
     if (!status) {
         size_t next_addr = phdre->p_memsz + va;


@@ -46,7 +47,7 @@ elf32_smap(struct load_context* ldctx,
         ldctx->mem_sz += phdre->p_memsz;
     } else {
         // we probably fucked up our process
         ldctx->mem_sz += phdre->p_memsz;
     } else {
         // we probably fucked up our process

-        terminate_proc(-1);
+        terminate_current(-1);

     }
 
     return status;
     }
 
     return status;


@@ -75,8 +76,8 @@ load_executable(struct load_context* context, const struct v_file* exefile)
         goto done;
     }
 
         goto done;
     }
 

-    ldpath = valloc(512);
-    errno = elf32_find_loader(&elf, ldpath, 512);
+    ldpath = valloc(256);
+    errno = elf32_find_loader(&elf, ldpath, 256);

     uintptr_t load_base = 0;
 
     if (errno < 0) {
     uintptr_t load_base = 0;
 
     if (errno < 0) {


@@ -102,7 +103,7 @@ load_executable(struct load_context* context, const struct v_file* exefile)
             goto done_close_elf32;
         }
 
             goto done_close_elf32;
         }
 

-        load_base = UMMAP_START;
+        load_base = USR_MMAP;

     }
 
     context->entry = elf.eheader.e_entry + load_base;
     }
 
     context->entry = elf.eheader.e_entry + load_base;


@@ -129,6 +130,8 @@ done_close_elf32:
     elf32_close(&elf);
 
 done:
     elf32_close(&elf);
 
 done:

-    vfree_safe(ldpath);
+    if (!container->argv_pp[1]) {
+        vfree_safe(ldpath);
+    }

     return errno;
 }
     return errno;
 }