Changes in kernel/generic/src/mm/backend_elf.c [8f6c6264:8a2474f] in mainline

File:

• kernel/generic/src/mm/backend_elf.c (modified) (4 diffs)

kernel/generic/src/mm/backend_elf.c

@@ -57 +57 @@
 static void elf_destroy(as_area_t *);
 
-static int elf_page_fault(as_area_t *, uintptr_t, pf_access_t);
-static void elf_frame_free(as_area_t *, uintptr_t, uintptr_t);
+static int elf_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access);
+static void elf_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame);
 
 mem_backend_t elf_backend = {
@@ -70 +70 @@
 };
 
-static size_t elf_nonanon_pages_get(as_area_t *area)
-{
-        elf_segment_header_t *entry = area->backend_data.segment;
-        uintptr_t first = ALIGN_UP(entry->p_vaddr, PAGE_SIZE);
-        uintptr_t last = ALIGN_DOWN(entry->p_vaddr + entry->p_filesz,
-            PAGE_SIZE);
-
-        if (entry->p_flags & PF_W)
-                return 0;
-
-        if (last < first)
-                return 0;
-
-        return last - first;
-}
-
 bool elf_create(as_area_t *area)
 {
-        size_t nonanon_pages = elf_nonanon_pages_get(area);
+        elf_segment_header_t *entry = area->backend_data.segment;
+        size_t nonanon_pages = ALIGN_DOWN(entry->p_filesz, PAGE_SIZE);
 
         if (area->pages <= nonanon_pages)
@@ -98 +83 @@
 bool elf_resize(as_area_t *area, size_t new_pages)
 {
-        size_t nonanon_pages = elf_nonanon_pages_get(area);
+        elf_segment_header_t *entry = area->backend_data.segment;
+        size_t nonanon_pages = ALIGN_DOWN(entry->p_filesz, PAGE_SIZE);
 
         if (new_pages > area->pages) {
@@ -207 +193 @@
 void elf_destroy(as_area_t *area)
 {
-        size_t nonanon_pages = elf_nonanon_pages_get(area);
+        elf_segment_header_t *entry = area->backend_data.segment;
+        size_t nonanon_pages = ALIGN_DOWN(entry->p_filesz, PAGE_SIZE);
 
         if (area->pages > nonanon_pages)