0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Kernel: Remove some unnecessary massaging of region base/size pairs.

Browse source 
These will be appropriately rounded by the allocate_range(), so call sites
can stop worrying about it.
This commit is contained in:
Andreas Kling 2019-05-17 04:47:06 +02:00
parent 6957825444
commit cde47089d2
Notes: sideshowbarker 2024-07-19 14:05:13 +09:00
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Kernel/Process.cpp
View file

@ -105,7 +105,6 @@ Region* Process::allocate_region_with_vmo(LinearAddress laddr, size_t size, Reta
if (!range.is_valid()) if (!range.is_valid())
return nullptr; return nullptr;
offset_in_vmo &= PAGE_MASK; offset_in_vmo &= PAGE_MASK;
size = ceil_div(size, PAGE_SIZE) * PAGE_SIZE;
m_regions.append(adopt(*new Region(range, move(vmo), offset_in_vmo, move(name), is_readable, is_writable))); m_regions.append(adopt(*new Region(range, move(vmo), offset_in_vmo, move(name), is_readable, is_writable)));
MM.map_region(*this, *m_regions.last()); MM.map_region(*this, *m_regions.last());
return m_regions.last().ptr(); return m_regions.last().ptr();
@ -335,16 +334,12 @@ int Process::do_exec(String path, Vector<String> arguments, Vector<String> envir
loader->map_section_hook = [&] (LinearAddress laddr, size_t size, size_t alignment, size_t offset_in_image, bool is_readable, bool is_writable, const String& name) { loader->map_section_hook = [&] (LinearAddress laddr, size_t size, size_t alignment, size_t offset_in_image, bool is_readable, bool is_writable, const String& name) {
ASSERT(size); ASSERT(size);
ASSERT(alignment == PAGE_SIZE); ASSERT(alignment == PAGE_SIZE);
size = ceil_div(size, PAGE_SIZE) * PAGE_SIZE;
(void) allocate_region_with_vmo(laddr, size, vmo.copy_ref(), offset_in_image, String(name), is_readable, is_writable); (void) allocate_region_with_vmo(laddr, size, vmo.copy_ref(), offset_in_image, String(name), is_readable, is_writable);
return laddr.as_ptr(); return laddr.as_ptr();
}; };
loader->alloc_section_hook = [&] (LinearAddress laddr, size_t size, size_t alignment, bool is_readable, bool is_writable, const String& name) { loader->alloc_section_hook = [&] (LinearAddress laddr, size_t size, size_t alignment, bool is_readable, bool is_writable, const String& name) {
ASSERT(size); ASSERT(size);
ASSERT(alignment == PAGE_SIZE); ASSERT(alignment == PAGE_SIZE);
size += laddr.get() & 0xfff;
laddr.mask(0xffff000);
size = ceil_div(size, PAGE_SIZE) * PAGE_SIZE;
(void) allocate_region(laddr, size, String(name), is_readable, is_writable); (void) allocate_region(laddr, size, String(name), is_readable, is_writable);
return laddr.as_ptr(); return laddr.as_ptr();
}; };