Index: ../lib/libkvm/kvm_aarch64.c
===================================================================
RCS file: /cvsroot/src/lib/libkvm/kvm_aarch64.c,v
retrieving revision 1.5
diff -p -u -r1.5 kvm_aarch64.c
--- ../lib/libkvm/kvm_aarch64.c	9 Nov 2018 04:06:40 -0000	1.5
+++ ../lib/libkvm/kvm_aarch64.c	23 Nov 2018 19:24:50 -0000
@@ -64,6 +64,8 @@ _kvm_initvtop(kvm_t *kd)
 	return (0);
 }
 
+#define LOG(fmt, ...) printf("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__)
+
 int
 _kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
 {
@@ -128,18 +130,23 @@ lose:
 	paddr_t pte_addr = (cpu_kh->kh_ttbr1 & TTBR_BADDR);
 	pte_addr &= ~((8L << (va_bits - addr_shift)) - 1);
 
+LOG("page_size %lx page_mask %lx page_addr %lx pte_mask %lx pte_shift %x\n", page_size, page_mask, page_addr, pte_mask, pte_shift);
+LOG("level %u page_shift %u va_bits %u addr_shift %u pte_addr %lx\n", level, page_shift, va_bits, addr_shift, pte_addr);
 	for (;;) {
 		pt_entry_t pte;
 
 		/* now index into the pte table */
 		pte_addr += 8 * ((va >> addr_shift) & pte_mask);
+LOG("pte_addr %lx\n", pte_addr);
 
 		/* Find and read the PTE. */
 		if (_kvm_pread(kd, kd->pmfd, &pte, sizeof(pte),
 		    _kvm_pa2off(kd, pte_addr)) != sizeof(pte)) {
+LOG("oink\n");
 			_kvm_syserr(kd, 0, "could not read pte");
 			goto lose;
 		}
+LOG("pte %lx\n", pte);
 
 		/* Find and read the L2 PTE. */
 		if ((pte & LX_VALID) == 0) {
@@ -151,11 +158,13 @@ lose:
 			const paddr_t blk_mask = ((1L << addr_shift) - 1);
 
 			*pa = (pte & page_addr & ~blk_mask) | (va & blk_mask);
+LOG("win1: pa %lx (blk_mask %lx)\n", (long)*pa, blk_mask);
 			return 0;
 		}
 
 		if (level == page_shift) {
 			*pa = (pte & page_addr) | (va & page_mask);
+LOG("win2: pa %lx\n", (long)*pa);
 			return 0;
 		}
 
@@ -165,6 +174,7 @@ lose:
 
 		pte_addr = pte & page_addr;
 		addr_shift -= pte_shift;
+LOG("pte_addr %lx addr_shift %x\n", pte_addr, addr_shift);
 	}
 }
 
@@ -177,8 +187,10 @@ _kvm_pa2off(kvm_t *kd, paddr_t pa)
 	const cpu_kcore_hdr_t * const cpu_kh = kd->cpu_data;
 	off_t off = 0;
 
+LOG("pa %lx\n", pa);
 	for (const phys_ram_seg_t *ramsegs = cpu_kh->kh_ramsegs;
 	     ramsegs->size != 0; ramsegs++) {
+LOG("ramsegs->start %lx size %lx\n", ramsegs->start, ramsegs->size);
 		if (pa >= ramsegs->start
 		    && pa < ramsegs->start + ramsegs->size) {
 			off += pa - ramsegs->start;
@@ -187,6 +199,7 @@ _kvm_pa2off(kvm_t *kd, paddr_t pa)
 		off += ramsegs->size;
 	}
 
+LOG("returning %lx\n", kd->dump_off + off);
 	return kd->dump_off + off;
 }