summaryrefslogtreecommitdiff
path: root/kernel/vmem.c
diff options
context:
space:
mode:
authorMiguel <m.i@gmx.at>2018-09-13 02:14:46 +0200
committerMiguel <m.i@gmx.at>2018-09-13 02:14:46 +0200
commit6a886cb2a4af303fae01b61a2e6590ca22bb4a3e (patch)
treeaff66570735d0869dcdf7b98ebd5aa595213c81d /kernel/vmem.c
parentb669230cae92f061bc36f25cd01dd84d276d226b (diff)
reentrenacy for newilb
Diffstat (limited to 'kernel/vmem.c')
-rw-r--r--kernel/vmem.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/vmem.c b/kernel/vmem.c
index ade0a01..4faf93e 100644
--- a/kernel/vmem.c
+++ b/kernel/vmem.c
@@ -305,7 +305,9 @@ pdirectory* vmem_kernel_dir()
vmem_add_alloc(dir,VMEM_CPU_PRIVATE,4,false);
vmem_add_alloc(dir,VMEM_CPU_STACK_TOP-4096*VMEM_CPU_STACK_PAGES,VMEM_CPU_STACK_PAGES,false);
- vmem_add_alloc(dir,VMEM_USER_PROG,1024*4,true);
+ vmem_add_alloc(dir,VMEM_USER_PROG,1024*2,true);
+ vmem_add_alloc(dir,VMEM_USER_ENV,2,true);
+ vmem_add_alloc(dir,VMEM_USER_NEWLIB,2,true);
vmem_add_alloc(dir,VMEM_USER_STACK_TOP-4096*VMEM_USER_STACK_PAGES,VMEM_USER_STACK_PAGES,true);
return dir;
@@ -323,6 +325,8 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir,bool stack_only)
}
vmem_add_alloc(dir,VMEM_USER_PROG,1024*4,true);
+ vmem_add_alloc(dir,VMEM_USER_ENV,2,true);
+ vmem_add_alloc(dir,VMEM_USER_NEWLIB,2,true);
vmem_add_alloc(dir,VMEM_USER_STACK_TOP-4096*VMEM_USER_STACK_PAGES,VMEM_USER_STACK_PAGES,true);
pdirectory* mydir=x86_get_page_directory();
@@ -349,7 +353,7 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir,bool stack_only)
if(src_pd)
{
- klog("copy virt: %x / phys: %x -> %x",virt,src_phys,dst_phys);
+ //klog("copy virt: %x / phys: %x -> %x",virt,src_phys,dst_phys);
vmem_clear_one(mydir,VMEM_COPY_PAGE);
vmem_clear_one(mydir,VMEM_COPY_PAGE+4096);
@@ -362,7 +366,6 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir,bool stack_only)
memcpy(VMEM_COPY_PAGE+4096,VMEM_COPY_PAGE,4096);
}
-
virt+=4096;
}
}