aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/fs/elf.c
diff options
context:
space:
mode:
authorMarvin Borner2020-06-01 23:30:40 +0200
committerMarvin Borner2020-06-01 23:30:40 +0200
commit0b3b63ffdedb2e37e0732c09eb0e967e256f0d71 (patch)
treef92a97a59e15d699b2594d3d313214f241ae8565 /src/kernel/fs/elf.c
parent5782d6b0c10b322d78c5d1284cbd4199d2e0f7ce (diff)
Very clean mmap approach
Sorry for the previous commit messages, I was kind of frustrated.
Diffstat (limited to 'src/kernel/fs/elf.c')
-rw-r--r--src/kernel/fs/elf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/fs/elf.c b/src/kernel/fs/elf.c
index 9d4dd60..7b95c3b 100644
--- a/src/kernel/fs/elf.c
+++ b/src/kernel/fs/elf.c
@@ -53,7 +53,7 @@ struct process *elf_load(char *path)
proc->registers.useresp = 0x40000000 - (PAGE_SIZE / 2);
proc->registers.ebp = proc->registers.useresp;
proc->registers.esp = proc->registers.useresp;
- paging_map_user(stk, 0x40000000 - PAGE_SIZE);
+ //paging_map_user(stk, 0x40000000 - PAGE_SIZE);
for (int i = 0; i < header->phnum; i++, program_header++) {
switch (program_header->type) {
@@ -61,7 +61,7 @@ struct process *elf_load(char *path)
break;
case 1: {
u32 loc = (u32)valloc(PAGE_SIZE);
- paging_map_user(loc, program_header->vaddr);
+ //paging_map_user(loc, program_header->vaddr);
memcpy((void *)program_header->vaddr,
((void *)((u32)file) + program_header->offset),
program_header->filesz);