Changeset a7dbd49 in mainline

Timestamp:

2011-04-17T20:40:51Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fde2982c

Parents:

e5a015b (diff), 8f6c6264 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/mm.

Location:

kernel/generic/src

Files:

• mm/backend_anon.c (modified) (1 diff)
• mm/backend_elf.c (modified) (4 diffs)
• mm/backend_phys.c (modified) (1 diff)
• proc/scheduler.c (modified) (1 diff)

kernel/generic/src/mm/backend_anon.c

@@ -57 +57 @@
 static void anon_destroy(as_area_t *);
 
-static int anon_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access);
-static void anon_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame);
+static int anon_page_fault(as_area_t *, uintptr_t, pf_access_t);
+static void anon_frame_free(as_area_t *, uintptr_t, uintptr_t);
 
 mem_backend_t anon_backend = {

kernel/generic/src/mm/backend_elf.c

@@ -57 +57 @@
 static void elf_destroy(as_area_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);
+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);
 
 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)
 {
-        elf_segment_header_t *entry = area->backend_data.segment;
-        size_t nonanon_pages = ALIGN_DOWN(entry->p_filesz, PAGE_SIZE);
+        size_t nonanon_pages = elf_nonanon_pages_get(area);
 
         if (area->pages <= nonanon_pages)
@@ -83 +98 @@
 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);
+        size_t nonanon_pages = elf_nonanon_pages_get(area);
 
         if (new_pages > area->pages) {
@@ -193 +207 @@
 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);
+        size_t nonanon_pages = elf_nonanon_pages_get(area);
 
         if (area->pages > nonanon_pages)

kernel/generic/src/mm/backend_phys.c

@@ -52 +52 @@
 static void phys_destroy(as_area_t *);
 
-static int phys_page_fault(as_area_t *area, uintptr_t addr, pf_access_t access);
+static int phys_page_fault(as_area_t *, uintptr_t, pf_access_t);
 
 mem_backend_t phys_backend = {

kernel/generic/src/proc/scheduler.c

@@ -354 +354 @@
         
         /*
-         * Through the 'THE' structure, we keep track of THREAD, TASK, CPU, VM
+         * Through the 'THE' structure, we keep track of THREAD, TASK, CPU, AS
          * and preemption counter. At this point THE could be coming either
          * from THREAD's or CPU's stack.