Changes in kernel/generic/src/mm/backend_elf.c [63e27ef:38dc82d] in mainline

File:

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

kernel/generic/src/mm/backend_elf.c

@@ -37 +37 @@
 
 #include <lib/elf.h>
-#include <assert.h>
+#include <debug.h>
 #include <typedefs.h>
 #include <mm/as.h>
@@ -48 +48 @@
 #include <genarch/mm/page_ht.h>
 #include <align.h>
-#include <mem.h>
+#include <memstr.h>
 #include <macros.h>
 #include <arch.h>
@@ -142 +142 @@
         uintptr_t start_anon = entry->p_vaddr + entry->p_filesz;
 
-        assert(mutex_locked(&area->as->lock));
-        assert(mutex_locked(&area->lock));
+        ASSERT(mutex_locked(&area->as->lock));
+        ASSERT(mutex_locked(&area->lock));
 
         /*
@@ -200 +200 @@
                                     base + P2SZ(j), false, &pte);
 
-                                assert(found);
-                                assert(PTE_VALID(&pte));
-                                assert(PTE_PRESENT(&pte));
+                                ASSERT(found);
+                                ASSERT(PTE_VALID(&pte));
+                                ASSERT(PTE_PRESENT(&pte));
 
                                 btree_insert(&area->sh_info->pagemap,
@@ -261 +261 @@
         bool dirty = false;
 
-        assert(page_table_locked(AS));
-        assert(mutex_locked(&area->lock));
-        assert(IS_ALIGNED(upage, PAGE_SIZE));
+        ASSERT(page_table_locked(AS));
+        ASSERT(mutex_locked(&area->lock));
+        ASSERT(IS_ALIGNED(upage, PAGE_SIZE));
 
         if (!as_area_check_access(area, access))
@@ -345 +345 @@
                             base + i * FRAME_SIZE, true, &pte);
 
-                        assert(found);
-                        assert(PTE_PRESENT(&pte));
+                        ASSERT(found);
+                        ASSERT(PTE_PRESENT(&pte));
 
                         frame = PTE_GET_FRAME(&pte);
@@ -424 +424 @@
         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);
+        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;