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

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/sparc64/src/mm/sun4u/tlb.c

    r56b962d r84439d7  
    360360static void print_tlb_entry(int i, tlb_tag_read_reg_t t, tlb_data_t d)
    361361{
    362         printf("%d: vpn=%#llx, context=%d, v=%d, size=%d, nfo=%d, "
    363             "ie=%d, soft2=%#x, pfn=%#x, soft=%#x, l=%d, "
    364             "cp=%d, cv=%d, e=%d, p=%d, w=%d, g=%d\n", i, t.vpn,
     362        printf("%u: vpn=%#" PRIx64 ", context=%u, v=%u, size=%u, nfo=%u, "
     363            "ie=%u, soft2=%#x, pfn=%#x, soft=%#x, l=%u, "
     364            "cp=%u, cv=%u, e=%u, p=%u, w=%u, g=%u\n", i, (uint64_t) t.vpn,
    365365            t.context, d.v, d.size, d.nfo, d.ie, d.soft2,
    366366            d.pfn, d.soft, d.l, d.cp, d.cv, d.e, d.p, d.w, d.g);
     
    441441    uintptr_t va, const char *str)
    442442{
    443         fault_if_from_uspace(istate, "%s, Address=%p.", str, va);
     443        fault_if_from_uspace(istate, "%s, address=%p.", str, (void *) va);
    444444        panic_memtrap(istate, PF_ACCESS_EXEC, va, str);
    445445}
     
    451451
    452452        va = tag.vpn << MMU_PAGE_WIDTH;
    453         fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
    454             tag.context);
     453        fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
     454            (void *) va, tag.context);
    455455        panic_memtrap(istate, PF_ACCESS_UNKNOWN, va, str);
    456456}
     
    462462
    463463        va = tag.vpn << MMU_PAGE_WIDTH;
    464         fault_if_from_uspace(istate, "%s, Page=%p (ASID=%d).", str, va,
    465             tag.context);
     464        fault_if_from_uspace(istate, "%s, page=%p (asid=%u).", str,
     465            (void *) va, tag.context);
    466466        panic_memtrap(istate, PF_ACCESS_WRITE, va, str);
    467467}
     
    484484            sfsr.e, sfsr.ct, sfsr.pr, sfsr.w, sfsr.ow, sfsr.fv);
    485485#endif
    486            
    487         printf("DTLB SFAR: address=%p\n", sfar);
     486       
     487        printf("DTLB SFAR: address=%p\n", (void *) sfar);
    488488       
    489489        dtlb_sfsr_write(0);
     
    508508#endif
    509509           
    510         printf("DTLB SFAR: address=%p\n", sfar);
     510        printf("DTLB SFAR: address=%p\n", (void *) sfar);
    511511       
    512512        dtlb_sfsr_write(0);
Note: See TracChangeset for help on using the changeset viewer.