Changeset 63e27ef in mainline for kernel/arch/mips32

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/mips32/src

Files:

• exception.c (modified) (2 diffs)
• mm/tlb.c (modified) (5 diffs)

kernel/arch/mips32/src/exception.c

@@ -39 +39 @@
 #include <arch/cp0.h>
 #include <arch.h>
-#include <debug.h>
+#include <assert.h>
 #include <proc/thread.h>
 #include <print.h>
@@ -120 +120 @@
 {
         if (*((uint32_t *) istate->epc) == 0x7c03e83b) {
-                ASSERT(THREAD);
+                assert(THREAD);
                 istate->epc += 4;
                 istate->v1 = istate->kt1;

kernel/arch/mips32/src/mm/tlb.c

@@ -44 +44 @@
 #include <print.h>
 #include <log.h>
-#include <debug.h>
+#include <assert.h>
 #include <align.h>
 #include <interrupt.h>
@@ -160 +160 @@
 #endif
 
-        ASSERT(!index.p);
+        assert(!index.p);
 
         badvaddr = cp0_badvaddr_read();
@@ -323 +323 @@
         int i;
 
-        ASSERT(interrupts_disabled());
+        assert(interrupts_disabled());
 
         hi_save.value = cp0_entry_hi_read();
@@ -356 +356 @@
         int i;
 
-        ASSERT(interrupts_disabled());
-        ASSERT(asid != ASID_INVALID);
+        assert(interrupts_disabled());
+        assert(asid != ASID_INVALID);
 
         hi_save.value = cp0_entry_hi_read();
@@ -398 +398 @@
         tlb_index_t index;
 
-        ASSERT(interrupts_disabled());
+        assert(interrupts_disabled());
         
         if (asid == ASID_INVALID)