Changeset 1d432f9 in mainline for kernel/generic/src/mm/backend_elf.c

Timestamp:

2010-05-31T22:33:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

179d052

Parents:

3a2b636

Message:

Reflect assumptions about lock and interrupt state in functions themselves.

File:

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

kernel/generic/src/mm/backend_elf.c

@@ -86 +86 @@
         bool dirty = false;
 
+        ASSERT(page_table_locked(AS));
+        ASSERT(mutex_locked(&area->lock));
+
         if (!as_area_check_access(area, access))
                 return AS_PF_FAULT;
@@ -235 +238 @@
         uintptr_t start_anon;
 
-        ASSERT((page >= ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) &&
-            (page < entry->p_vaddr + entry->p_memsz));
+        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;
 
@@ -273 +280 @@
         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));
 
         /*