gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor prepare_process_ranges_args_envs()

Browse Source
This commit is contained in:
NAKAMURA Gou
2016-03-14 20:16:34 +09:00
parent c9cc4330c8
commit 489cd6d1a2
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/host.c
View File

@ -85,12 +85,12 @@ int prepare_process_ranges_args_envs(struct thread *thread,
struct process *proc = thread->proc; struct process *proc = thread->proc;
struct process_vm *vm = proc->vm; struct process_vm *vm = proc->vm;
struct address_space *as = vm->address_space; struct address_space *as = vm->address_space;
long delta = -1; long aout_base;
n = p->num_sections; n = p->num_sections;
aout_base = (pn->reloc)? vm->region.user_start: 0;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (pn->sections[i].interp && (interp_nbase == (uintptr_t)-1)) { if (pn->sections[i].interp && (interp_nbase == (uintptr_t)-1)) {
interp_obase = pn->sections[i].vaddr; interp_obase = pn->sections[i].vaddr;
interp_obase -= (interp_obase % pn->interp_align); interp_obase -= (interp_obase % pn->interp_align);
@ -105,16 +105,7 @@ int prepare_process_ranges_args_envs(struct thread *thread,
p->sections[i].vaddr = pn->sections[i].vaddr; p->sections[i].vaddr = pn->sections[i].vaddr;
} }
else{ else{
if(delta == -1){ pn->sections[i].vaddr += aout_base;
if(pn->reloc){
delta = vm->region.user_start;
pn->at_phdr += delta;
pn->at_entry += delta;
}
else
delta = 0;
}
pn->sections[i].vaddr += delta;
p->sections[i].vaddr = pn->sections[i].vaddr; p->sections[i].vaddr = pn->sections[i].vaddr;
} }
s = (pn->sections[i].vaddr) & PAGE_MASK; s = (pn->sections[i].vaddr) & PAGE_MASK;
@ -197,6 +188,11 @@ int prepare_process_ranges_args_envs(struct thread *thread,
pn->entry); pn->entry);
} }
if (aout_base) {
pn->at_phdr += aout_base;
pn->at_entry += aout_base;
}
vm->region.brk_start = vm->region.brk_end = vm->region.data_end; vm->region.brk_start = vm->region.brk_end = vm->region.data_end;
/* Map, copy and update args and envs */ /* Map, copy and update args and envs */