Browse Source

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

These will be appropriately rounded by the allocate_range(), so call sites
can stop worrying about it.
Andreas Kling 6 năm trước cách đây
mục cha
commit
cde47089d2
1 tập tin đã thay đổi với 0 bổ sung5 xóa
  1. 0 5
      Kernel/Process.cpp

+ 0 - 5
Kernel/Process.cpp

@@ -105,7 +105,6 @@ Region* Process::allocate_region_with_vmo(LinearAddress laddr, size_t size, Reta
     if (!range.is_valid())
         return nullptr;
     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)));
     MM.map_region(*this, *m_regions.last());
     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) {
             ASSERT(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);
             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) {
             ASSERT(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);
             return laddr.as_ptr();
         };