Changeset 63e27ef in mainline for kernel/arch/sparc64/src/mm/sun4v

Timestamp:

2017-06-19T21:47:42Z (9 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/arch/sparc64/src/mm/sun4v

Files:

• as.c (modified) (3 diffs)
• tlb.c (modified) (5 diffs)
• tsb.c (modified) (2 diffs)

kernel/arch/sparc64/src/mm/sun4v/as.c

@@ -37 +37 @@
 #include <arch/mm/pagesize.h>
 #include <arch/mm/tlb.h>
+#include <assert.h>
 #include <genarch/mm/page_ht.h>
 #include <genarch/mm/asid_fifo.h>
-#include <debug.h>
 #include <config.h>
 #include <arch/sun4v/hypercall.h>
@@ -121 +121 @@
         uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH);
         
-        ASSERT(as->arch.tsb_description.tsb_base);
+        assert(as->arch.tsb_description.tsb_base);
         uintptr_t tsb = PA2KA(as->arch.tsb_description.tsb_base);
         
@@ -160 +160 @@
         uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH);
         
-        ASSERT(as->arch.tsb_description.tsb_base);
+        assert(as->arch.tsb_description.tsb_base);
         
         uintptr_t tsb = PA2KA(as->arch.tsb_description.tsb_base);

kernel/arch/sparc64/src/mm/sun4v/tlb.c

@@ -43 +43 @@
 #include <arch/mm/tlb.h>
 #include <arch/interrupt.h>
+#include <assert.h>
 #include <interrupt.h>
 #include <arch.h>
@@ -215 +216 @@
         bool found = page_mapping_find(AS, va, true, &t);
         if (found && PTE_EXECUTABLE(&t)) {
-                ASSERT(t.p);
+                assert(t.p);
 
                 /*
@@ -265 +266 @@
         bool found = page_mapping_find(as, va, true, &t);
         if (found) {
-                ASSERT(t.p);
+                assert(t.p);
 
                 /*
@@ -303 +304 @@
         bool found = page_mapping_find(as, va, true, &t);
         if (found && PTE_WRITABLE(&t)) {
-                ASSERT(t.p);
+                assert(t.p);
 
                 /*
@@ -345 +346 @@
         __hypercall_fast_ret1(0, 0, 0, 0, 0, CPU_MYID, &myid);
 
-        ASSERT(mmu_fsas[myid].dft < 16);
+        assert(mmu_fsas[myid].dft < 16);
 
         printf("condition which caused the fault: %s\n",

kernel/arch/sparc64/src/mm/sun4v/tsb.c

@@ -39 +39 @@
 #include <arch/mm/page.h>
 #include <arch/barrier.h>
+#include <assert.h>
 #include <mm/as.h>
 #include <typedefs.h>
 #include <macros.h>
-#include <debug.h>
 
 /** Invalidate portion of TSB.
@@ -60 +60 @@
         size_t cnt;
         
-        ASSERT(as->arch.tsb_description.tsb_base);
+        assert(as->arch.tsb_description.tsb_base);
         
         i0 = (page >> MMU_PAGE_WIDTH) & TSB_ENTRY_MASK;