Changeset 3ac69647 in mainline

Timestamp:

2011-04-17T19:25:16Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8f6c6264

Parents:

2c86f81

Message:

Factor out common code to elf_nonanon_pages_get().

File:

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

kernel/generic/src/mm/backend_elf.c

@@ -70 +70 @@
 };
 
-bool elf_create(as_area_t *area)
+static size_t elf_nonanon_pages_get(as_area_t *area)
 {
         elf_segment_header_t *entry = area->backend_data.segment;
@@ -76 +76 @@
 
         if (entry->p_flags & PF_W)
-                nonanon_pages = 0;
+                return 0;
+
+        return nonanon_pages;
+}
+
+bool elf_create(as_area_t *area)
+{
+        size_t nonanon_pages = elf_nonanon_pages_get(area);
 
         if (area->pages <= nonanon_pages)
@@ -86 +93 @@
 bool elf_resize(as_area_t *area, size_t new_pages)
 {
-        elf_segment_header_t *entry = area->backend_data.segment;
-        size_t nonanon_pages = ALIGN_DOWN(entry->p_filesz, PAGE_SIZE);
-
-        if (entry->p_flags & PF_W)
-                nonanon_pages = 0;
+        size_t nonanon_pages = elf_nonanon_pages_get(area);
 
         if (new_pages > area->pages) {
@@ -199 +202 @@
 void elf_destroy(as_area_t *area)
 {
-        elf_segment_header_t *entry = area->backend_data.segment;
-        size_t nonanon_pages = ALIGN_DOWN(entry->p_filesz, PAGE_SIZE);
-
-        if (entry->p_flags & PF_W)
-                nonanon_pages = 0;
+        size_t nonanon_pages = elf_nonanon_pages_get(area);
 
         if (area->pages > nonanon_pages)