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


Ignore:
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/sun4u
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/sparc64/src/mm/sun4u/as.c

    r7354b5e r63e27ef  
    3535#include <arch/mm/as.h>
    3636#include <arch/mm/tlb.h>
     37#include <assert.h>
     38#include <config.h>
    3739#include <genarch/mm/page_ht.h>
    3840#include <genarch/mm/asid_fifo.h>
    39 #include <debug.h>
    40 #include <config.h>
    4141
    4242#ifdef CONFIG_TSB
    … …  
    130130        uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH);
    131131       
    132         ASSERT(as->arch.itsb);
    133         ASSERT(as->arch.dtsb);
     132        assert(as->arch.itsb);
     133        assert(as->arch.dtsb);
    134134       
    135135        uintptr_t tsb = (uintptr_t) as->arch.itsb;
    … …  
    202202        uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH);
    203203       
    204         ASSERT(as->arch.itsb);
    205         ASSERT(as->arch.dtsb);
     204        assert(as->arch.itsb);
     205        assert(as->arch.dtsb);
    206206       
    207207        uintptr_t tsb = (uintptr_t) as->arch.itsb;

  • kernel/arch/sparc64/src/mm/sun4u/tlb.c

    r7354b5e r63e27ef  
    4141#include <arch/mm/mmu.h>
    4242#include <arch/interrupt.h>
     43#include <assert.h>
    4344#include <interrupt.h>
    4445#include <arch.h>
    … …  
    201202        bool found = page_mapping_find(AS, istate->tpc, true, &t);
    202203        if (found && PTE_EXECUTABLE(&t)) {
    203                 ASSERT(t.p);
     204                assert(t.p);
    204205
    205206                /*
    … …  
    258259        bool found = page_mapping_find(as, page_16k, true, &t);
    259260        if (found) {
    260                 ASSERT(t.p);
     261                assert(t.p);
    261262
    262263                /*
    … …  
    301302        bool found = page_mapping_find(as, page_16k, true, &t);
    302303        if (found && PTE_WRITABLE(&t)) {
    303                 ASSERT(t.p);
     304                assert(t.p);
    304305
    305306                /*

  • kernel/arch/sparc64/src/mm/sun4u/tsb.c

    r7354b5e r63e27ef  
    2727 */
    2828
    29 /** @addtogroup sparc64mm       
     29/** @addtogroup sparc64mm
    3030 * @{
    3131 */
    … …  
    3737#include <arch/mm/page.h>
    3838#include <arch/barrier.h>
     39#include <assert.h>
    3940#include <mm/as.h>
    4041#include <typedefs.h>
    4142#include <macros.h>
    42 #include <debug.h>
    4343
    4444/** Invalidate portion of TSB.
    … …  
    5858        size_t cnt;
    5959       
    60         ASSERT(as->arch.itsb);
    61         ASSERT(as->arch.dtsb);
     60        assert(as->arch.itsb);
     61        assert(as->arch.dtsb);
    6262       
    6363        i0 = (page >> MMU_PAGE_WIDTH) & ITSB_ENTRY_MASK;
    … …  
    8585        size_t entry;
    8686
    87         ASSERT(index <= 1);
     87        assert(index <= 1);
    8888       
    8989        as = t->as;
    … …  
    130130        size_t entry;
    131131       
    132         ASSERT(index <= 1);
     132        assert(index <= 1);
    133133
    134134        as = t->as;
Note: See TracChangeset for help on using the changeset viewer.