Changeset 63e27ef in mainline for kernel/genarch/src/mm/page_ht.c

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

File:

• kernel/genarch/src/mm/page_ht.c (modified) (8 diffs)

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;