From 89bd0a43383b1b10e21cfba74c7bf109b71a62f1 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 24 Aug 2001 08:53:30 +0000 Subject: Dynamically adjust to the value of KERNBASE in a crashdump, with a fallback for old kernels without the "kernbase" symbol. --- lib/libkvm/kvm_amd64.c | 14 ++++++++++++-- lib/libkvm/kvm_i386.c | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/libkvm/kvm_amd64.c b/lib/libkvm/kvm_amd64.c index b4365ae..5801e0c 100644 --- a/lib/libkvm/kvm_amd64.c +++ b/lib/libkvm/kvm_amd64.c @@ -93,6 +93,7 @@ _kvm_initvtop(kvm_t *kd) struct vmstate *vm; struct nlist nlist[2]; u_long pa; + u_long kernbase; pd_entry_t *PTD; vm = (struct vmstate *)_kvm_malloc(kd, sizeof(*vm)); @@ -103,14 +104,23 @@ _kvm_initvtop(kvm_t *kd) kd->vmst = vm; vm->PTD = 0; - nlist[0].n_name = "_IdlePTD"; + nlist[0].n_name = "kernbase"; + nlist[1].n_name = 0; + + if (kvm_nlist(kd, nlist) != 0) + kernbase = KERNBASE; /* for old kernels */ + else + kernbase = nlist[0].n_value; + + nlist[0].n_name = "IdlePTD"; nlist[1].n_name = 0; if (kvm_nlist(kd, nlist) != 0) { _kvm_err(kd, kd->program, "bad namelist"); return (-1); } - if (kvm_read(kd, (nlist[0].n_value - KERNBASE), &pa, sizeof(pa)) != sizeof(pa)) { + if (kvm_read(kd, (nlist[0].n_value - kernbase), &pa, sizeof(pa)) != + sizeof(pa)) { _kvm_err(kd, kd->program, "cannot read IdlePTD"); return (-1); } diff --git a/lib/libkvm/kvm_i386.c b/lib/libkvm/kvm_i386.c index b4365ae..5801e0c 100644 --- a/lib/libkvm/kvm_i386.c +++ b/lib/libkvm/kvm_i386.c @@ -93,6 +93,7 @@ _kvm_initvtop(kvm_t *kd) struct vmstate *vm; struct nlist nlist[2]; u_long pa; + u_long kernbase; pd_entry_t *PTD; vm = (struct vmstate *)_kvm_malloc(kd, sizeof(*vm)); @@ -103,14 +104,23 @@ _kvm_initvtop(kvm_t *kd) kd->vmst = vm; vm->PTD = 0; - nlist[0].n_name = "_IdlePTD"; + nlist[0].n_name = "kernbase"; + nlist[1].n_name = 0; + + if (kvm_nlist(kd, nlist) != 0) + kernbase = KERNBASE; /* for old kernels */ + else + kernbase = nlist[0].n_value; + + nlist[0].n_name = "IdlePTD"; nlist[1].n_name = 0; if (kvm_nlist(kd, nlist) != 0) { _kvm_err(kd, kd->program, "bad namelist"); return (-1); } - if (kvm_read(kd, (nlist[0].n_value - KERNBASE), &pa, sizeof(pa)) != sizeof(pa)) { + if (kvm_read(kd, (nlist[0].n_value - kernbase), &pa, sizeof(pa)) != + sizeof(pa)) { _kvm_err(kd, kd->program, "cannot read IdlePTD"); return (-1); } -- cgit v1.1