Changeset 63e27ef in mainline for kernel/genarch/src/mm

Timestamp:

2017-06-19T21:47:42Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

deacc58d

Parents:

7354b5e

Message:

ASSERT → assert

Location:

kernel/genarch/src/mm

Files:

• asid.c (modified) (5 diffs)
• page_ht.c (modified) (8 diffs)
• page_pt.c (modified) (7 diffs)

kernel/genarch/src/mm/asid.c

@@ -57 +57 @@
  */
 
+#include <assert.h>
 #include <mm/asid.h>
 #include <mm/as.h>
@@ -64 +65 @@
 #include <synch/mutex.h>
 #include <adt/list.h>
-#include <debug.h>
 
 static size_t asids_allocated = 0;
@@ -78 +78 @@
         as_t *as;
 
-        ASSERT(interrupts_disabled());
-        ASSERT(spinlock_locked(&asidlock));
+        assert(interrupts_disabled());
+        assert(spinlock_locked(&asidlock));
 
         /*
@@ -98 +98 @@
                  */
                 tmp = list_first(&inactive_as_with_asid_list);
-                ASSERT(tmp != NULL);
+                assert(tmp != NULL);
                 list_remove(tmp);
                 
@@ -108 +108 @@
                  */
                 asid = as->asid;
-                ASSERT(asid != ASID_INVALID);
+                assert(asid != ASID_INVALID);
 
                 /*

kernel/genarch/src/mm/page_ht.c

@@ -48 +48 @@
 #include <synch/spinlock.h>
 #include <arch.h>
-#include <debug.h>
+#include <assert.h>
 #include <adt/hash_table.h>
 #include <align.h>
@@ -137 +137 @@
 bool compare(sysarg_t key[], size_t keys, link_t *item)
 {
-        ASSERT(item);
-        ASSERT(keys > 0);
-        ASSERT(keys <= PAGE_HT_KEYS);
+        assert(item);
+        assert(keys > 0);
+        assert(keys <= PAGE_HT_KEYS);
         
         /*
@@ -161 +161 @@
 void remove_callback(link_t *item)
 {
-        ASSERT(item);
+        assert(item);
         
         /*
@@ -191 +191 @@
         };
 
-        ASSERT(page_table_locked(as));
+        assert(page_table_locked(as));
 
         irq_spinlock_lock(&page_ht_lock, true);
@@ -197 +197 @@
         if (!hash_table_find(&page_ht, key)) {
                 pte_t *pte = slab_alloc(pte_cache, FRAME_LOWMEM | FRAME_ATOMIC);
-                ASSERT(pte != NULL);
+                assert(pte != NULL);
                 
                 pte->g = (flags & PAGE_GLOBAL) != 0;
@@ -241 +241 @@
         };
 
-        ASSERT(page_table_locked(as));
+        assert(page_table_locked(as));
         
         irq_spinlock_lock(&page_ht_lock, true);
@@ -261 +261 @@
         };
 
-        ASSERT(nolock || page_table_locked(as));
+        assert(nolock || page_table_locked(as));
 
         link_t *cur = hash_table_find(&page_ht, key);
@@ -307 +307 @@
                 panic("Updating non-existent PTE");
         
-        ASSERT(pte->as == t->as);
-        ASSERT(pte->page == t->page);
-        ASSERT(pte->frame == t->frame);
-        ASSERT(pte->g == t->g);
-        ASSERT(pte->x == t->x);
-        ASSERT(pte->w == t->w);
-        ASSERT(pte->k == t->k);
-        ASSERT(pte->c == t->c);
-        ASSERT(pte->p == t->p);
+        assert(pte->as == t->as);
+        assert(pte->page == t->page);
+        assert(pte->frame == t->frame);
+        assert(pte->g == t->g);
+        assert(pte->x == t->x);
+        assert(pte->w == t->w);
+        assert(pte->k == t->k);
+        assert(pte->c == t->c);
+        assert(pte->p == t->p);
 
         t->a = pte->a;

kernel/genarch/src/mm/page_pt.c

@@ -36 +36 @@
  */
 
+#include <assert.h>
 #include <genarch/mm/page_pt.h>
 #include <mm/page.h>
@@ -81 +82 @@
         pte_t *ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);
 
-        ASSERT(page_table_locked(as));
+        assert(page_table_locked(as));
         
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
@@ -159 +160 @@
 void pt_mapping_remove(as_t *as, uintptr_t page)
 {
-        ASSERT(page_table_locked(as));
+        assert(page_table_locked(as));
 
         /*
@@ -293 +294 @@
 static pte_t *pt_mapping_find_internal(as_t *as, uintptr_t page, bool nolock)
 {
-        ASSERT(nolock || page_table_locked(as));
+        assert(nolock || page_table_locked(as));
 
         pte_t *ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);
@@ -358 +359 @@
                 panic("Updating non-existent PTE");     
 
-        ASSERT(PTE_VALID(t) == PTE_VALID(pte));
-        ASSERT(PTE_PRESENT(t) == PTE_PRESENT(pte));
-        ASSERT(PTE_GET_FRAME(t) == PTE_GET_FRAME(pte));
-        ASSERT(PTE_WRITABLE(t) == PTE_WRITABLE(pte));
-        ASSERT(PTE_EXECUTABLE(t) == PTE_EXECUTABLE(pte));
+        assert(PTE_VALID(t) == PTE_VALID(pte));
+        assert(PTE_PRESENT(t) == PTE_PRESENT(pte));
+        assert(PTE_GET_FRAME(t) == PTE_GET_FRAME(pte));
+        assert(PTE_WRITABLE(t) == PTE_WRITABLE(pte));
+        assert(PTE_EXECUTABLE(t) == PTE_EXECUTABLE(pte));
 
         *t = *pte;
@@ -398 +399 @@
 void pt_mapping_make_global(uintptr_t base, size_t size)
 {
-        ASSERT(size > 0);
+        assert(size > 0);
         
         uintptr_t ptl0 = PA2KA((uintptr_t) AS_KERNEL->genarch.page_table);
@@ -416 +417 @@
             addr += ptl0_step) {
                 if (GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr)) != 0) {
-                        ASSERT(overlaps(addr, ptl0_step,
+                        assert(overlaps(addr, ptl0_step,
                             config.identity_base, config.identity_size));