Changeset 04803bf in mainline for kernel/generic/src/mm/backend_elf.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 mainline changes (needs fixes).

File:

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

kernel/generic/src/mm/backend_elf.c

@@ -38 +38 @@
 #include <lib/elf.h>
 #include <debug.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <mm/as.h>
 #include <mm/frame.h>
@@ -85 +85 @@
         size_t i;
         bool dirty = false;
+
+        ASSERT(page_table_locked(AS));
+        ASSERT(mutex_locked(&area->lock));
 
         if (!as_area_check_access(area, access))
@@ -232 +235 @@
 void elf_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame)
 {
-        elf_header_t *elf = area->backend_data.elf;
         elf_segment_header_t *entry = area->backend_data.segment;
-        uintptr_t base, start_anon;
-        size_t i;
-
-        ASSERT((page >= ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) &&
-            (page < entry->p_vaddr + entry->p_memsz));
-        i = (page - ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) >> PAGE_WIDTH;
-        base = (uintptr_t) (((void *) elf) +
-            ALIGN_DOWN(entry->p_offset, FRAME_SIZE));
+        uintptr_t start_anon;
+
+        ASSERT(page_table_locked(area->as));
+        ASSERT(mutex_locked(&area->lock));
+
+        ASSERT(page >= ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE));
+        ASSERT(page < entry->p_vaddr + entry->p_memsz);
+
         start_anon = entry->p_vaddr + entry->p_filesz;
 
@@ -257 +259 @@
                  * lower part is backed by the ELF image and the upper is
                  * anonymous). In any case, a frame needs to be freed.
-                 */ 
+                 */
                 frame_free(frame);
         }
@@ -267 +269 @@
  * Otherwise only portions of the area that are not backed by the ELF image
  * are put into the pagemap.
- *
- * The address space and address space area must be locked prior to the call.
  *
  * @param area          Address space area.
@@ -278 +278 @@
         btree_node_t *leaf, *node;
         uintptr_t start_anon = entry->p_vaddr + entry->p_filesz;
+
+        ASSERT(mutex_locked(&area->as->lock));
+        ASSERT(mutex_locked(&area->lock));
 
         /*