TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-15 07:27:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify the process structure

Browse Source
This commit is contained in:
Baptiste Wicht 2014-02-08 16:00:26 +01:00
parent 908264e2b2
commit d0b37eef9b
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/include/process.hpp
View File

@ -64,7 +64,6 @@ struct process_t {
volatile interrupt::syscall_regs* context; volatile interrupt::syscall_regs* context;
std::vector<segment_t> segments; std::vector<segment_t> segments;
std::vector<size_t> physical_paging;
}; };
constexpr const size_t program_base = 0x8000000000; constexpr const size_t program_base = 0x8000000000;

6
kernel/src/paging.cpp
View File

@ -429,7 +429,7 @@ bool paging::user_map(scheduler::process_t& process, size_t virt, size_t physica
clear_physical_page(physical_pdpt); clear_physical_page(physical_pdpt);
process.paging_size += paging::PAGE_SIZE; process.paging_size += paging::PAGE_SIZE;
process.physical_paging.push_back(physical_pdpt); process.segments.push_back({physical_pdpt, 1});
} }
auto physical_pdpt = reinterpret_cast<uintptr_t>(pml4t[pml4e]) & ~0xFFF; auto physical_pdpt = reinterpret_cast<uintptr_t>(pml4t[pml4e]) & ~0xFFF;
@ -448,7 +448,7 @@ bool paging::user_map(scheduler::process_t& process, size_t virt, size_t physica
clear_physical_page(physical_pd); clear_physical_page(physical_pd);
process.paging_size += paging::PAGE_SIZE; process.paging_size += paging::PAGE_SIZE;
process.physical_paging.push_back(physical_pd); process.segments.push_back({physical_pdpt, 1});
} }
auto physical_pd = reinterpret_cast<uintptr_t>(pdpt[pdpte]) & ~0xFFF; auto physical_pd = reinterpret_cast<uintptr_t>(pdpt[pdpte]) & ~0xFFF;
@ -467,7 +467,7 @@ bool paging::user_map(scheduler::process_t& process, size_t virt, size_t physica
clear_physical_page(physical_pt); clear_physical_page(physical_pt);
process.paging_size += paging::PAGE_SIZE; process.paging_size += paging::PAGE_SIZE;
process.physical_paging.push_back(physical_pt); process.segments.push_back({physical_pdpt, 1});
} }
auto physical_pt = reinterpret_cast<uintptr_t>(pd[pde]) & ~0xFFF; auto physical_pt = reinterpret_cast<uintptr_t>(pd[pde]) & ~0xFFF;

6
kernel/src/scheduler.cpp
View File

@ -92,12 +92,6 @@ void gc_task(){
//1. Release physical memory of PML4T //1. Release physical memory of PML4T
physical_allocator::free(desc.physical_cr3, 1); physical_allocator::free(desc.physical_cr3, 1);
//2. Release physical memory of paging structures
for(auto page : desc.physical_paging){
physical_allocator::free(page, 1);
}
desc.physical_paging.clear();
//3. Release physical stacks //3. Release physical stacks
physical_allocator::free(desc.physical_kernel_stack, scheduler::kernel_stack_size / paging::PAGE_SIZE); physical_allocator::free(desc.physical_kernel_stack, scheduler::kernel_stack_size / paging::PAGE_SIZE);
physical_allocator::free(desc.physical_user_stack, scheduler::user_stack_size / paging::PAGE_SIZE); physical_allocator::free(desc.physical_user_stack, scheduler::user_stack_size / paging::PAGE_SIZE);