[src/netbsd-1-5]: src/lib/libkvm pullup 1.5 (approved by thorpej):

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/495fcde501f3
branches:  netbsd-1-5
changeset: 488945:495fcde501f3
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Aug 07 01:22:27 2000 +0000

description:
pullup 1.5 (approved by thorpej):
>Handle kernel cores properly.

diffstat:

 lib/libkvm/kvm_sparc64.c |  112 +++++++++++++++++++++++++++++++---------------
 1 files changed, 76 insertions(+), 36 deletions(-)

diffs (156 lines):

diff -r e4afd531839c -r 495fcde501f3 lib/libkvm/kvm_sparc64.c
--- a/lib/libkvm/kvm_sparc64.c  Mon Aug 07 01:20:20 2000 +0000
+++ b/lib/libkvm/kvm_sparc64.c  Mon Aug 07 01:22:27 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kvm_sparc64.c,v 1.2 1999/07/02 15:28:51 simonb Exp $   */
+/*     $NetBSD: kvm_sparc64.c,v 1.2.8.1 2000/08/07 01:22:27 mrg Exp $  */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)kvm_sparc.c        8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: kvm_sparc64.c,v 1.2 1999/07/02 15:28:51 simonb Exp $");
+__RCSID("$NetBSD: kvm_sparc64.c,v 1.2.8.1 2000/08/07 01:22:27 mrg Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -87,12 +87,15 @@
  * Prepare for translation of kernel virtual addresses into offsets
  * into crash dump files. We use the MMU specific goop written at the
  * front of the crash dump by pmap_dumpmmu().
+ *
+ * We should read in and cache the ksegs here to speed up operations...
  */
 int
 _kvm_initvtop(kd)
        kvm_t *kd;
 {
-       kd->nbpg = 8196;
+       kd->nbpg = 0x2000;
+
        return (0);
 }
 
@@ -110,50 +113,87 @@
 {
        cpu_kcore_hdr_t *cpup = kd->cpu_data;
        u_long kernbase = cpup->kernbase;
+       uint64_t *pseg, *pdir, *ptbl;
+       int64_t data;
 
        if (va < kernbase)
-               goto err;
+               goto lose;
+
+       /* Handle the wired 4MB TTEs */
+       if (va > cpup->ktextbase && va < (cpup->ktextbase + cpup->ktextsz)) {
+               u_long vaddr;
 
-       /* Handle the wired 4MB TTE */
-       if (va > cpup->kernbase && va < cpup->kernbase + 4*1024*1024) {
+               vaddr = va - cpup->ktextbase;
+               *pa = cpup->ktextp + vaddr;
+               return (cpup->ktextsz - vaddr);
+       }
+
+       if (va > cpup->kdatabase && va < (cpup->kdatabase + cpup->kdatasz)) {
                u_long vaddr;
 
-               vaddr = va - cpup->kernbase;
-               *pa = cpup->kphys + va;
-               return (4*1024*1024 - va);
+               vaddr = va - cpup->kdatabase;
+               *pa = cpup->kdatap + vaddr;
+               return (cpup->kdatasz - vaddr);
        }
-#if 0
+
+
        /*
-        * Layout of CPU segment:
-        *      cpu_kcore_hdr_t;
-        *      [alignment]
-        *      phys_ram_seg_t[cpup->nmemseg];
-        *      segmap[cpup->nsegmap];
-        *      ptes[cpup->npmegs];
+        * Parse kernel page table.
         */
-       segmaps = (struct segmap *)((long)kd->cpu_data + cpup->segmapoffset);
-       ptes = (int *)((int)kd->cpu_data + cpup->pmegoffset);
-       nkreg = ((int)((-(unsigned)kernbase) / NBPRG));
-       nureg = 256 - nkreg;
+       pseg = (uint64_t *)(u_long)cpup->segmapoffset;
+       if (pread(kd->pmfd, &pdir, sizeof(pdir),
+               _kvm_pa2off(kd, (u_long)&pseg[va_to_seg(va)])) 
+               != sizeof(pdir)) {
+               _kvm_syserr(kd, 0, "could not read L1 PTE");
+               goto lose;
+       }
+
+       if (!pdir) {
+               _kvm_err(kd, 0, "invalid L1 PTE");
+               goto lose;
+       }
+
+       if (pread(kd->pmfd, &ptbl, sizeof(ptbl),
+               _kvm_pa2off(kd, (u_long)&pdir[va_to_dir(va)])) 
+               != sizeof(ptbl)) {
+               _kvm_syserr(kd, 0, "could not read L2 PTE");
+               goto lose;
+       }
 
-       vr = VA_VREG(va);
-       vs = VA_VSEG(va);
+       if (!ptbl) {
+               _kvm_err(kd, 0, "invalid L2 PTE");
+               goto lose;
+       }
+
+       if (pread(kd->pmfd, &data, sizeof(data),
+               _kvm_pa2off(kd, (u_long)&ptbl[va_to_pte(va)])) 
+               != sizeof(data)) {
+               _kvm_syserr(kd, 0, "could not read TTE");
+               goto lose;
+       }
 
-       sp = &segmaps[(vr-nureg)*NSEGRG + vs];
-       if (sp->sg_npte == 0)
-               goto err;
-       if (sp->sg_pmeg == cpup->npmeg - 1) /* =seginval */
-               goto err;
-       pte = ptes[sp->sg_pmeg * nptesg + VA_VPG(va)];
-       if ((pte & PG_V) != 0) {
-               long p, off = VA_OFF(va);
+       if (data >= 0) {
+               _kvm_err(kd, 0, "invalid L2 TTE");
+               goto lose;
+       }
+       
+       /* 
+        * Calculate page offsets and things.
+        *
+        * XXXX -- We could support multiple page sizes.
+        */
+       va = va & (kd->nbpg - 1);
+       data &= TLB_PA_MASK;
+       *pa = data + va;
 
-               p = (pte & PG_PFNUM) << pgshift;
-               *pa = p + off;
-               return (kd->nbpg - off);
-       }
-#endif
-err:
+       /*
+        * Parse and trnslate our TTE.
+        */
+
+       return (kd->nbpg - va);
+
+lose:
+       *pa = -1;
        _kvm_err(kd, 0, "invalid address (%x)", va);
        return (0);
 }