nites Reference: /n/patches.lsub.org/patch/mapnits Date: Sun Oct 28 18:52:06 CET 2012 Signed-off-by: quanstro@quanstro.net --- /sys/src/nix/k10/map.c Thu Sep 13 12:34:13 2012 +++ /sys/src/nix/k10/map.c Wed Jul 25 05:32:15 2012 @@ -4,11 +4,6 @@ #include "dat.h" #include "fns.h" -#define _KADDR(pa) UINT2PTR(kseg0+((uintptr)(pa))) -#define _PADDR(va) PTR2UINT(((uintptr)(va)) - kseg0) - -#define TMFM (64*MiB) - void* KADDR(uintmem pa) { @@ -33,14 +28,14 @@ if(pa > KSEG2) return pa-KSEG2; - panic("PADDR: va %#p pa #%p @ %#p\n", va, _PADDR(va), getcallerpc(&va)); + panic("PADDR: va %#p pa %#P @ %#p", va, mmuphysaddr(PTR2UINT(va)), getcallerpc(&va)); return 0; } KMap* kmap(Page* page) { - DBG("kmap(%#llux) @ %#p: %#p %#p\n", + DBG("kmap(%#P) @ %#p: %#p %#p\n", page->pa, getcallerpc(&page), page->pa, KADDR(page->pa));