Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 84439d7 in mainline for kernel/arch/ppc32/src/mm/tlb.c


Ignore:
Timestamp:
2010-12-05T09:34:46Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
75732da
Parents:
56b962d (diff), 35537a7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge with development/

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ppc32/src/mm/tlb.c

    r56b962d r84439d7  
    111111static void pht_refill_fail(uintptr_t badvaddr, istate_t *istate)
    112112{
    113         fault_if_from_uspace(istate, "PHT Refill Exception on %p.", badvaddr);
     113        fault_if_from_uspace(istate, "PHT Refill Exception on %p.",
     114            (void *) badvaddr);
    114115        panic_memtrap(istate, PF_ACCESS_UNKNOWN, badvaddr,
    115116            "PHT Refill Exception.");
     
    459460                length = 0; \
    460461        \
    461         printf(name ": page=%.*p frame=%.*p length=%d KB (mask=%#x)%s%s\n", \
    462             sizeof(upper) * 2, upper & 0xffff0000, sizeof(lower) * 2, \
    463             lower & 0xffff0000, length, mask, \
     462        printf(name ": page=%#0" PRIx32 " frame=%#0" PRIx32 \
     463            " length=%#0" PRIx32 " KB (mask=%#0" PRIx32 ")%s%s\n", \
     464            upper & UINT32_C(0xffff0000), lower & UINT32_C(0xffff0000), \
     465            length, mask, \
    464466            ((upper >> 1) & 1) ? " supervisor" : "", \
    465467            (upper & 1) ? " user" : "");
    466468
    467 
    468469void tlb_print(void)
    469470{
     
    473474                uint32_t vsid = sr_get(sr << 28);
    474475               
    475                 printf("sr[%02u]: vsid=%.*p (asid=%u)%s%s\n", sr,
    476                     sizeof(vsid) * 2, vsid & 0xffffff, (vsid & 0xffffff) >> 4,
     476                printf("sr[%02" PRIu32 "]: vsid=%#0" PRIx32 " (asid=%" PRIu32 ")"
     477                    "%s%s\n", sr, vsid & UINT32_C(0x00ffffff),
     478                    (vsid & UINT32_C(0x00ffffff)) >> 4,
    477479                    ((vsid >> 30) & 1) ? " supervisor" : "",
    478480                    ((vsid >> 29) & 1) ? " user" : "");
Note: See TracChangeset for help on using the changeset viewer.