Index: kernel/generic/src/mm/as.c =================================================================== --- kernel/generic/src/mm/as.c (revision 44a7ee5373ccc121fce74799244a44867eed301d) +++ kernel/generic/src/mm/as.c (revision 58fa3e668549d763497f0c6b6a9059794bb2ff4a) @@ -67,5 +67,5 @@ #include #include -#include +#include #include #include @@ -189,6 +189,6 @@ DEADLOCK_PROBE_INIT(p_asidlock); - ASSERT(as != AS); - ASSERT(atomic_get(&as->refcount) == 0); + assert(as != AS); + assert(atomic_get(&as->refcount) == 0); /* @@ -236,5 +236,5 @@ bool cond = true; while (cond) { - ASSERT(!list_empty(&as->as_area_btree.leaf_list)); + assert(!list_empty(&as->as_area_btree.leaf_list)); btree_node_t *node = @@ -298,6 +298,6 @@ size_t count, bool guarded, as_area_t *avoid) { - ASSERT((addr % PAGE_SIZE) == 0); - ASSERT(mutex_locked(&as->lock)); + assert((addr % PAGE_SIZE) == 0); + assert(mutex_locked(&as->lock)); /* @@ -455,5 +455,5 @@ size_t size, bool guarded) { - ASSERT(mutex_locked(&as->lock)); + assert(mutex_locked(&as->lock)); if (size == 0) @@ -532,5 +532,5 @@ mutex_lock(&sh_info->lock); - ASSERT(sh_info->refcount); + assert(sh_info->refcount); if (--sh_info->refcount == 0) { @@ -696,5 +696,5 @@ NO_TRACE static as_area_t *find_area_and_lock(as_t *as, uintptr_t va) { - ASSERT(mutex_locked(&as->lock)); + assert(mutex_locked(&as->lock)); btree_node_t *leaf; @@ -827,5 +827,5 @@ bool cond = true; while (cond) { - ASSERT(!list_empty(&area->used_space.leaf_list)); + assert(!list_empty(&area->used_space.leaf_list)); btree_node_t *node = @@ -893,7 +893,7 @@ ptr + P2SZ(i), false, &pte); - ASSERT(found); - ASSERT(PTE_VALID(&pte)); - ASSERT(PTE_PRESENT(&pte)); + assert(found); + assert(PTE_VALID(&pte)); + assert(PTE_PRESENT(&pte)); if ((area->backend) && @@ -1008,7 +1008,7 @@ ptr + P2SZ(size), false, &pte); - ASSERT(found); - ASSERT(PTE_VALID(&pte)); - ASSERT(PTE_PRESENT(&pte)); + assert(found); + assert(PTE_VALID(&pte)); + assert(PTE_PRESENT(&pte)); if ((area->backend) && @@ -1194,5 +1194,5 @@ NO_TRACE bool as_area_check_access(as_area_t *area, pf_access_t access) { - ASSERT(mutex_locked(&area->lock)); + assert(mutex_locked(&area->lock)); int flagmap[] = { @@ -1321,7 +1321,7 @@ ptr + P2SZ(size), false, &pte); - ASSERT(found); - ASSERT(PTE_VALID(&pte)); - ASSERT(PTE_PRESENT(&pte)); + assert(found); + assert(PTE_VALID(&pte)); + assert(PTE_PRESENT(&pte)); old_frame[frame_idx++] = PTE_GET_FRAME(&pte); @@ -1541,5 +1541,5 @@ */ if (old_as) { - ASSERT(old_as->cpu_refcount); + assert(old_as->cpu_refcount); if ((--old_as->cpu_refcount == 0) && (old_as != AS_KERNEL)) { @@ -1550,5 +1550,5 @@ * ASID. */ - ASSERT(old_as->asid != ASID_INVALID); + assert(old_as->asid != ASID_INVALID); list_append(&old_as->inactive_as_with_asid_link, @@ -1597,5 +1597,5 @@ NO_TRACE unsigned int as_area_get_flags(as_area_t *area) { - ASSERT(mutex_locked(&area->lock)); + assert(mutex_locked(&area->lock)); return area_flags_to_page_flags(area->flags); @@ -1615,6 +1615,6 @@ NO_TRACE pte_t *page_table_create(unsigned int flags) { - ASSERT(as_operations); - ASSERT(as_operations->page_table_create); + assert(as_operations); + assert(as_operations->page_table_create); return as_operations->page_table_create(flags); @@ -1630,6 +1630,6 @@ NO_TRACE void page_table_destroy(pte_t *page_table) { - ASSERT(as_operations); - ASSERT(as_operations->page_table_destroy); + assert(as_operations); + assert(as_operations->page_table_destroy); as_operations->page_table_destroy(page_table); @@ -1651,6 +1651,6 @@ NO_TRACE void page_table_lock(as_t *as, bool lock) { - ASSERT(as_operations); - ASSERT(as_operations->page_table_lock); + assert(as_operations); + assert(as_operations->page_table_lock); as_operations->page_table_lock(as, lock); @@ -1665,6 +1665,6 @@ NO_TRACE void page_table_unlock(as_t *as, bool unlock) { - ASSERT(as_operations); - ASSERT(as_operations->page_table_unlock); + assert(as_operations); + assert(as_operations->page_table_unlock); as_operations->page_table_unlock(as, unlock); @@ -1680,6 +1680,6 @@ NO_TRACE bool page_table_locked(as_t *as) { - ASSERT(as_operations); - ASSERT(as_operations->page_table_locked); + assert(as_operations); + assert(as_operations->page_table_locked); return as_operations->page_table_locked(as); @@ -1724,7 +1724,7 @@ bool used_space_insert(as_area_t *area, uintptr_t page, size_t count) { - ASSERT(mutex_locked(&area->lock)); - ASSERT(IS_ALIGNED(page, PAGE_SIZE)); - ASSERT(count); + assert(mutex_locked(&area->lock)); + assert(IS_ALIGNED(page, PAGE_SIZE)); + assert(count); btree_node_t *leaf = NULL; @@ -1737,5 +1737,5 @@ } - ASSERT(leaf != NULL); + assert(leaf != NULL); if (!leaf->keys) { @@ -2010,7 +2010,7 @@ bool used_space_remove(as_area_t *area, uintptr_t page, size_t count) { - ASSERT(mutex_locked(&area->lock)); - ASSERT(IS_ALIGNED(page, PAGE_SIZE)); - ASSERT(count); + assert(mutex_locked(&area->lock)); + assert(IS_ALIGNED(page, PAGE_SIZE)); + assert(count); btree_node_t *leaf; @@ -2257,5 +2257,5 @@ as_area_t *area = node->value[i]; - ASSERT(area_idx < area_cnt); + assert(area_idx < area_cnt); mutex_lock(&area->lock); Index: kernel/generic/src/mm/backend_anon.c =================================================================== --- kernel/generic/src/mm/backend_anon.c (revision 44a7ee5373ccc121fce74799244a44867eed301d) +++ kernel/generic/src/mm/backend_anon.c (revision 58fa3e668549d763497f0c6b6a9059794bb2ff4a) @@ -37,4 +37,5 @@ */ +#include #include #include @@ -113,7 +114,7 @@ void anon_share(as_area_t *area) { - ASSERT(mutex_locked(&area->as->lock)); - ASSERT(mutex_locked(&area->lock)); - ASSERT(!(area->flags & AS_AREA_LATE_RESERVE)); + assert(mutex_locked(&area->as->lock)); + assert(mutex_locked(&area->lock)); + assert(!(area->flags & AS_AREA_LATE_RESERVE)); /* @@ -138,7 +139,7 @@ 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, @@ -190,7 +191,7 @@ uintptr_t frame; - 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)) @@ -294,6 +295,6 @@ void anon_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame) { - ASSERT(page_table_locked(area->as)); - ASSERT(mutex_locked(&area->lock)); + assert(page_table_locked(area->as)); + assert(mutex_locked(&area->lock)); if (area->flags & AS_AREA_LATE_RESERVE) { Index: kernel/generic/src/mm/backend_elf.c =================================================================== --- kernel/generic/src/mm/backend_elf.c (revision 44a7ee5373ccc121fce74799244a44867eed301d) +++ kernel/generic/src/mm/backend_elf.c (revision 58fa3e668549d763497f0c6b6a9059794bb2ff4a) @@ -37,5 +37,5 @@ #include -#include +#include #include #include @@ -142,6 +142,6 @@ 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,7 +200,7 @@ 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,7 +261,7 @@ 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,6 +345,6 @@ base + i * FRAME_SIZE, true, &pte); - ASSERT(found); - ASSERT(PTE_PRESENT(&pte)); + assert(found); + assert(PTE_PRESENT(&pte)); frame = PTE_GET_FRAME(&pte); @@ -424,9 +424,9 @@ 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; Index: kernel/generic/src/mm/backend_phys.c =================================================================== --- kernel/generic/src/mm/backend_phys.c (revision 44a7ee5373ccc121fce74799244a44867eed301d) +++ kernel/generic/src/mm/backend_phys.c (revision 58fa3e668549d763497f0c6b6a9059794bb2ff4a) @@ -37,5 +37,5 @@ */ -#include +#include #include #include @@ -95,6 +95,6 @@ void phys_share(as_area_t *area) { - ASSERT(mutex_locked(&area->as->lock)); - ASSERT(mutex_locked(&area->lock)); + assert(mutex_locked(&area->as->lock)); + assert(mutex_locked(&area->lock)); } @@ -135,12 +135,12 @@ uintptr_t base = area->backend_data.base; - 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)) return AS_PF_FAULT; - ASSERT(upage - area->base < area->backend_data.frames * FRAME_SIZE); + assert(upage - area->base < area->backend_data.frames * FRAME_SIZE); page_mapping_insert(AS, upage, base + (upage - area->base), as_area_get_flags(area)); Index: kernel/generic/src/mm/backend_user.c =================================================================== --- kernel/generic/src/mm/backend_user.c (revision 44a7ee5373ccc121fce74799244a44867eed301d) +++ kernel/generic/src/mm/backend_user.c (revision 58fa3e668549d763497f0c6b6a9059794bb2ff4a) @@ -46,5 +46,5 @@ #include #include -#include +#include #include #include @@ -108,7 +108,7 @@ int user_page_fault(as_area_t *area, uintptr_t upage, pf_access_t access) { - 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)) @@ -162,6 +162,6 @@ void user_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame) { - ASSERT(page_table_locked(area->as)); - ASSERT(mutex_locked(&area->lock)); + assert(page_table_locked(area->as)); + assert(mutex_locked(&area->lock)); pfn_t pfn = ADDR2PFN(frame); Index: kernel/generic/src/mm/frame.c =================================================================== --- kernel/generic/src/mm/frame.c (revision 44a7ee5373ccc121fce74799244a44867eed301d) +++ kernel/generic/src/mm/frame.c (revision 58fa3e668549d763497f0c6b6a9059794bb2ff4a) @@ -47,5 +47,5 @@ #include #include -#include +#include #include #include @@ -349,5 +349,5 @@ 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,5 +370,5 @@ pfn_t constraint) { - ASSERT(zone->flags & ZONE_AVAILABLE); + assert(zone->flags & ZONE_AVAILABLE); /* Allocate frames from zone */ @@ -377,6 +377,6 @@ FRAME_LOWPRIO, constraint, &index); - ASSERT(avail); - ASSERT(index != (size_t) -1); + assert(avail); + assert(index != (size_t) -1); /* Update frame reference count */ @@ -384,5 +384,5 @@ frame_t *frame = zone_get_frame(zone, index + i); - ASSERT(frame->refcount == 0); + assert(frame->refcount == 0); frame->refcount = 1; } @@ -407,9 +407,9 @@ 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,5 +429,5 @@ 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,9 +456,9 @@ 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,5 +509,5 @@ 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,5 +704,5 @@ * the assert */ - ASSERT(confframe != ADDR2PFN((uintptr_t ) NULL)); + assert(confframe != ADDR2PFN((uintptr_t ) NULL)); /* Update the known end of physical memory. */ @@ -792,5 +792,5 @@ 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,5 +806,5 @@ 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,5 +830,5 @@ uintptr_t constraint, size_t *pzone) { - ASSERT(count > 0); + assert(count > 0); size_t hint = pzone ? (*pzone) : 0; @@ -970,5 +970,5 @@ 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,5 +1030,5 @@ 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,8 +1153,8 @@ 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); Index: kernel/generic/src/mm/km.c =================================================================== --- kernel/generic/src/mm/km.c (revision 44a7ee5373ccc121fce74799244a44867eed301d) +++ kernel/generic/src/mm/km.c (revision 58fa3e668549d763497f0c6b6a9059794bb2ff4a) @@ -38,4 +38,5 @@ #include #include +#include #include #include @@ -44,5 +45,4 @@ #include #include -#include #include #include @@ -95,5 +95,5 @@ { km_ni_arena = ra_arena_create(); - ASSERT(km_ni_arena != NULL); + assert(km_ni_arena != NULL); km_non_identity_arch_init(); config.non_identity_configured = true; @@ -112,5 +112,5 @@ span_added = ra_span_add(km_ni_arena, base, size); - ASSERT(span_added); + assert(span_added); } @@ -132,6 +132,6 @@ uintptr_t offs; - ASSERT(ALIGN_DOWN(paddr, FRAME_SIZE) == paddr); - ASSERT(ALIGN_UP(size, FRAME_SIZE) == size); + assert(ALIGN_DOWN(paddr, FRAME_SIZE) == paddr); + assert(ALIGN_UP(size, FRAME_SIZE) == size); /* Enforce natural or at least PAGE_SIZE alignment. */ @@ -154,6 +154,6 @@ ipl_t ipl; - ASSERT(ALIGN_DOWN(vaddr, PAGE_SIZE) == vaddr); - ASSERT(ALIGN_UP(size, PAGE_SIZE) == size); + assert(ALIGN_DOWN(vaddr, PAGE_SIZE) == vaddr); + assert(ALIGN_UP(size, PAGE_SIZE) == size); page_table_lock(AS_KERNEL, true); @@ -240,7 +240,7 @@ uintptr_t km_temporary_page_get(uintptr_t *framep, frame_flags_t flags) { - ASSERT(THREAD); - ASSERT(framep); - ASSERT(!(flags & ~(FRAME_NO_RESERVE | FRAME_ATOMIC))); + assert(THREAD); + assert(framep); + assert(!(flags & ~(FRAME_NO_RESERVE | FRAME_ATOMIC))); /* @@ -281,5 +281,5 @@ void km_temporary_page_put(uintptr_t page) { - ASSERT(THREAD); + assert(THREAD); if (km_is_non_identity(page)) Index: kernel/generic/src/mm/page.c =================================================================== --- kernel/generic/src/mm/page.c (revision 44a7ee5373ccc121fce74799244a44867eed301d) +++ kernel/generic/src/mm/page.c (revision 58fa3e668549d763497f0c6b6a9059794bb2ff4a) @@ -69,6 +69,6 @@ #include #include -#include #include +#include #include #include @@ -98,8 +98,8 @@ unsigned int flags) { - ASSERT(page_table_locked(as)); - - ASSERT(page_mapping_operations); - ASSERT(page_mapping_operations->mapping_insert); + assert(page_table_locked(as)); + + assert(page_mapping_operations); + assert(page_mapping_operations->mapping_insert); page_mapping_operations->mapping_insert(as, ALIGN_DOWN(page, PAGE_SIZE), @@ -122,8 +122,8 @@ NO_TRACE void page_mapping_remove(as_t *as, uintptr_t page) { - ASSERT(page_table_locked(as)); - - ASSERT(page_mapping_operations); - ASSERT(page_mapping_operations->mapping_remove); + assert(page_table_locked(as)); + + assert(page_mapping_operations); + assert(page_mapping_operations->mapping_remove); page_mapping_operations->mapping_remove(as, @@ -147,8 +147,8 @@ pte_t *pte) { - ASSERT(nolock || page_table_locked(as)); - - ASSERT(page_mapping_operations); - ASSERT(page_mapping_operations->mapping_find); + assert(nolock || page_table_locked(as)); + + assert(page_mapping_operations); + assert(page_mapping_operations->mapping_find); return page_mapping_operations->mapping_find(as, @@ -168,8 +168,8 @@ pte_t *pte) { - ASSERT(nolock || page_table_locked(as)); - - ASSERT(page_mapping_operations); - ASSERT(page_mapping_operations->mapping_find); + assert(nolock || page_table_locked(as)); + + assert(page_mapping_operations); + assert(page_mapping_operations->mapping_find); page_mapping_operations->mapping_update(as, @@ -184,6 +184,6 @@ void page_mapping_make_global(uintptr_t base, size_t size) { - ASSERT(page_mapping_operations); - ASSERT(page_mapping_operations->mapping_make_global); + assert(page_mapping_operations); + assert(page_mapping_operations->mapping_make_global); return page_mapping_operations->mapping_make_global(base, size); Index: kernel/generic/src/mm/reserve.c =================================================================== --- kernel/generic/src/mm/reserve.c (revision 44a7ee5373ccc121fce74799244a44867eed301d) +++ kernel/generic/src/mm/reserve.c (revision 58fa3e668549d763497f0c6b6a9059794bb2ff4a) @@ -36,4 +36,5 @@ */ +#include #include #include @@ -42,5 +43,4 @@ #include #include -#include static bool reserve_initialized = false; @@ -72,5 +72,5 @@ bool reserved = false; - ASSERT(reserve_initialized); + assert(reserve_initialized); irq_spinlock_lock(&reserve_lock, true); Index: kernel/generic/src/mm/slab.c =================================================================== --- kernel/generic/src/mm/slab.c (revision 44a7ee5373ccc121fce74799244a44867eed301d) +++ kernel/generic/src/mm/slab.c (revision 58fa3e668549d763497f0c6b6a9059794bb2ff4a) @@ -101,4 +101,5 @@ */ +#include #include #include @@ -111,5 +112,4 @@ #include #include -#include #include #include @@ -260,5 +260,5 @@ slab = obj2slab(obj); - ASSERT(slab->cache == cache); + assert(slab->cache == cache); size_t freed = 0; @@ -268,5 +268,5 @@ irq_spinlock_lock(&cache->slablock, true); - ASSERT(slab->available < cache->objects); + assert(slab->available < cache->objects); *((size_t *) obj) = slab->nextavail; @@ -417,5 +417,5 @@ slab_magazine_t *lastmag = cache->mag_cache[CPU->id].last; - ASSERT(irq_spinlock_locked(&cache->mag_cache[CPU->id].lock)); + assert(irq_spinlock_locked(&cache->mag_cache[CPU->id].lock)); if (cmag) { /* First try local CPU magazines */ @@ -484,5 +484,5 @@ slab_magazine_t *lastmag = cache->mag_cache[CPU->id].last; - ASSERT(irq_spinlock_locked(&cache->mag_cache[CPU->id].lock)); + assert(irq_spinlock_locked(&cache->mag_cache[CPU->id].lock)); if (cmag) { @@ -586,5 +586,5 @@ NO_TRACE static bool make_magcache(slab_cache_t *cache) { - ASSERT(_slab_initialized >= 2); + assert(_slab_initialized >= 2); cache->mag_cache = malloc(sizeof(slab_mag_cache_t) * config.cpu_count, @@ -610,5 +610,5 @@ unsigned int kmflag), size_t (*destructor)(void *obj), unsigned int flags) { - ASSERT(size > 0); + assert(size > 0); memsetb(cache, sizeof(*cache), 0); @@ -948,6 +948,6 @@ void *malloc(size_t size, unsigned int flags) { - ASSERT(_slab_initialized); - ASSERT(size <= (1 << SLAB_MAX_MALLOC_W)); + assert(_slab_initialized); + assert(size <= (1 << SLAB_MAX_MALLOC_W)); if (size < (1 << SLAB_MIN_MALLOC_W)) @@ -961,6 +961,6 @@ void *realloc(void *ptr, size_t size, unsigned int flags) { - ASSERT(_slab_initialized); - ASSERT(size <= (1 << SLAB_MAX_MALLOC_W)); + assert(_slab_initialized); + assert(size <= (1 << SLAB_MAX_MALLOC_W)); void *new_ptr; Index: kernel/generic/src/mm/tlb.c =================================================================== --- kernel/generic/src/mm/tlb.c (revision 44a7ee5373ccc121fce74799244a44867eed301d) +++ kernel/generic/src/mm/tlb.c (revision 58fa3e668549d763497f0c6b6a9059794bb2ff4a) @@ -43,4 +43,5 @@ #include #include +#include #include #include @@ -50,5 +51,4 @@ #include #include -#include #include @@ -152,5 +152,5 @@ void tlb_shootdown_ipi_recv(void) { - ASSERT(CPU); + assert(CPU); CPU->tlb_active = false; @@ -159,5 +159,5 @@ irq_spinlock_lock(&CPU->lock, false); - ASSERT(CPU->tlb_messages_count <= TLB_MESSAGE_QUEUE_LEN); + assert(CPU->tlb_messages_count <= TLB_MESSAGE_QUEUE_LEN); size_t i; @@ -176,5 +176,5 @@ break; case TLB_INVL_PAGES: - ASSERT(count); + assert(count); tlb_invalidate_pages(asid, page, count); break;