pjht/os
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix new_address_space and copy_data.

Browse Source
This commit is contained in:
pjht 2019-05-06 08:24:30 -05:00
parent f34d5029df
commit 52882f0794
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/i386/address_spaces.c
View File

@ -5,6 +5,6 @@ void copy_data(void* cr3, void* data,uint32_t size,void* virt_addr) {
asm volatile("movl %%cr3, %%eax; movl %%eax, %0;":"=m"(old_cr3)::"%eax");
void* phys_addr=virt_to_phys(data);
load_address_space(cr3);
map_pages((void*)((uint32_t)virt_addr<<12),phys_addr,(size/4096)+1,1,0);
map_pages(virt_addr,phys_addr,(size/4096)+1,1,1);
load_address_space(old_cr3);
}

13
cpu/i386/paging.c
View File

@ -114,9 +114,16 @@ void alloc_pages_virt(int num_pages,void* addr) {
map_pages(addr,phys_addr,num_pages,1,1);
}
void invl_page(void* addr) {
asm volatile("invlpg (%0)"::"r"(addr):"memory");
}
void* paging_new_address_space() {
uint32_t cr3;
asm volatile("movl %%cr3, %%eax; movl %%eax, %0;":"=m"(cr3)::"%eax");
void* dir=pmem_alloc(1);
smap_page_tables[0]=((uint32_t)dir)|0x3;
invl_page(smap);
for (uint32_t i=0;i<NUM_KERN_DIRS;i++) {
uint32_t entry_virt=(uint32_t)&(kern_page_tables[i*1024]);
smap[i+768]=(entry_virt-0xC0000000)|0x7;
@ -126,10 +133,8 @@ void* paging_new_address_space() {
uint32_t entry_virt=(uint32_t)&(smap_page_tables[i*1024]);
smap[i+1022]=(entry_virt-0xC0000000)|0x3;
}
smap_page_tables[0]=(((uint32_t)&(page_directory))-0xC0000000)|0x3;
for (uint32_t i=1;i<2048;i++) {
smap_page_tables[i]=0;
}
smap_page_tables[0]=cr3|0x3;
invl_page(smap);
return dir;
}