Changes in kernel/generic/src/mm/frame.c [c12f891:63e27ef] in mainline

File:

• kernel/generic/src/mm/frame.c (modified) (16 diffs)

kernel/generic/src/mm/frame.c

@@ -47 +47 @@
 #include <mm/as.h>
 #include <panic.h>
-#include <debug.h>
+#include <assert.h>
 #include <adt/list.h>
 #include <synch/mutex.h>
@@ -349 +349 @@
 NO_TRACE static frame_t *zone_get_frame(zone_t *zone, size_t index)
 {
-        ASSERT(index < zone->count);
+        assert(index < zone->count);
         
         return &zone->frames[index];
@@ -370 +370 @@
     pfn_t constraint)
 {
-        ASSERT(zone->flags & ZONE_AVAILABLE);
+        assert(zone->flags & ZONE_AVAILABLE);
         
         /* Allocate frames from zone */
@@ -377 +377 @@
             FRAME_LOWPRIO, constraint, &index);
         
-        ASSERT(avail);
-        ASSERT(index != (size_t) -1);
+        assert(avail);
+        assert(index != (size_t) -1);
         
         /* Update frame reference count */
@@ -384 +384 @@
                 frame_t *frame = zone_get_frame(zone, index + i);
                 
-                ASSERT(frame->refcount == 0);
+                assert(frame->refcount == 0);
                 frame->refcount = 1;
         }
@@ -407 +407 @@
 NO_TRACE static size_t zone_frame_free(zone_t *zone, size_t index)
 {
-        ASSERT(zone->flags & ZONE_AVAILABLE);
+        assert(zone->flags & ZONE_AVAILABLE);
         
         frame_t *frame = zone_get_frame(zone, index);
         
-        ASSERT(frame->refcount > 0);
+        assert(frame->refcount > 0);
         
         if (!--frame->refcount) {
@@ -429 +429 @@
 NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t index)
 {
-        ASSERT(zone->flags & ZONE_AVAILABLE);
+        assert(zone->flags & ZONE_AVAILABLE);
         
         frame_t *frame = zone_get_frame(zone, index);
@@ -456 +456 @@
     void *confdata)
 {
-        ASSERT(zones.info[z1].flags & ZONE_AVAILABLE);
-        ASSERT(zones.info[z2].flags & ZONE_AVAILABLE);
-        ASSERT(zones.info[z1].flags == zones.info[z2].flags);
-        ASSERT(zones.info[z1].base < zones.info[z2].base);
-        ASSERT(!overlaps(zones.info[z1].base, zones.info[z1].count,
+        assert(zones.info[z1].flags & ZONE_AVAILABLE);
+        assert(zones.info[z2].flags & ZONE_AVAILABLE);
+        assert(zones.info[z1].flags == zones.info[z2].flags);
+        assert(zones.info[z1].base < zones.info[z2].base);
+        assert(!overlaps(zones.info[z1].base, zones.info[z1].count,
             zones.info[z2].base, zones.info[z2].count));
         
@@ -509 +509 @@
 NO_TRACE static void return_config_frames(size_t znum, pfn_t pfn, size_t count)
 {
-        ASSERT(zones.info[znum].flags & ZONE_AVAILABLE);
+        assert(zones.info[znum].flags & ZONE_AVAILABLE);
         
         size_t cframes = SIZE2FRAMES(zone_conf_size(count));
@@ -704 +704 @@
                  * the assert
                  */
-                ASSERT(confframe != ADDR2PFN((uintptr_t ) NULL));
+                assert(confframe != ADDR2PFN((uintptr_t ) NULL));
                 
                 /* Update the known end of physical memory. */
@@ -792 +792 @@
         size_t znum = find_zone(pfn, 1, hint);
         
-        ASSERT(znum != (size_t) -1);
+        assert(znum != (size_t) -1);
         
         zone_get_frame(&zones.info[znum],
@@ -806 +806 @@
         size_t znum = find_zone(pfn, 1, hint);
         
-        ASSERT(znum != (size_t) -1);
+        assert(znum != (size_t) -1);
         
         void *res = zone_get_frame(&zones.info[znum],
@@ -830 +830 @@
     uintptr_t constraint, size_t *pzone)
 {
-        ASSERT(count > 0);
+        assert(count > 0);
         
         size_t hint = pzone ? (*pzone) : 0;
@@ -970 +970 @@
                 size_t znum = find_zone(pfn, 1, 0);
                 
-                ASSERT(znum != (size_t) -1);
+                assert(znum != (size_t) -1);
                 
                 freed += zone_frame_free(&zones.info[znum],
@@ -1030 +1030 @@
         size_t znum = find_zone(pfn, 1, 0);
         
-        ASSERT(znum != (size_t) -1);
+        assert(znum != (size_t) -1);
         
         zones.info[znum].frames[pfn - zones.info[znum].base].refcount++;
@@ -1153 +1153 @@
     uint64_t *free)
 {
-        ASSERT(total != NULL);
-        ASSERT(unavail != NULL);
-        ASSERT(busy != NULL);
-        ASSERT(free != NULL);
+        assert(total != NULL);
+        assert(unavail != NULL);
+        assert(busy != NULL);
+        assert(free != NULL);
         
         irq_spinlock_lock(&zones.lock, true);