Replace page:%016x avar with pte:%p.%#lx everywhere

Renaming this "pte" more closely represents what's being shared. Also, previously we were inconsistent about including the vmap or not; now we use the same format everywhere.

Replace page:%016x avar with pte:%p.%#lx everywhere
eb13f659 · Austin Clements · e9a949ba · eb13f659 · eb13f659
--- a/kernel/sysproc.cc
+++ b/kernel/sysproc.cc
@@ -105,8 +105,8 @@ sys_map(userptr<void> addr, size_t len)

 #if MTRACE
  mt_ascope ascope("%s(%p,%lx)", __func__, addr, len);
-  for (uptr i = PGROUNDDOWN(addr); i < PGROUNDUP(addr + len); i += PGSIZE)
-    mtwriteavar("page:%016x", i);
+  for (uptr i = addr / PGSIZE; i < PGROUNDUP(addr + len) / PGSIZE; i++)
+    mtwriteavar("pte:%p.%#lx", myproc()->vmap, i);
 #endif

  vmnode *vmn = new vmnode(PGROUNDUP(len) / PGSIZE);
@@ -130,8 +130,8 @@ sys_unmap(userptr<void> addr, size_t len)

 #if MTRACE
  mt_ascope ascope("%s(%p,%lx)", __func__, addr, len);
-  for (uptr i = PGROUNDDOWN(addr); i < PGROUNDUP(addr + len); i += PGSIZE)
-    mtwriteavar("page:%016x", i);
+  for (uptr i = addr / PGSIZE; i < PGROUNDUP(addr + len) / PGSIZE; i++)
+    mtwriteavar("pte:%p.%#lx", myproc()->vmap, i);
 #endif

  uptr align_addr = PGROUNDDOWN(addr);

--- a/kernel/vm.cc
+++ b/kernel/vm.cc
@@ -637,7 +637,7 @@ pagefault(vmap *vmap, uptr va, u32 err)
 {
 #if MTRACE
  mt_ascope ascope("%s(%p)", __func__, va);
-  mtwriteavar("page:%p.%016x", vmap, PGROUNDDOWN(va));
+  mtwriteavar("pte:%p.%#lx", vmap, va / PGSIZE);
 #endif

  for (;;) {
@@ -687,7 +687,7 @@ pagelookup(vmap* vmap, uptr va)
 {
 #if MTRACE
  mt_ascope ascope("%s(%p)", __func__, va);
-  mtwriteavar("page:%p.%016x", vmap, PGROUNDDOWN(va));
+  mtwriteavar("pte:%p.%#lx", vmap, va / PGSIZE);
 #endif

  for (;;) {