From NetBSD: merge of 960317

1 files changed, 23 insertions, 53 deletions

diff --git a/lib/libkvm/kvm_m68k.c b/lib/libkvm/kvm_m68k.c
index 67c4e279da1..dbea9864055 100644
--- a/lib/libkvm/kvm_m68k.c
+++ b/lib/libkvm/kvm_m68k.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: kvm_m68k.c,v 1.2 1996/03/19 23:15:24 niklas Exp $	*/
+
 /*-
  * Copyright (c) 1989, 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -37,7 +39,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 /* from: static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93"; */
-static char *rcsid = "$Id: kvm_m68k.c,v 1.1.1.1 1995/10/18 08:42:44 deraadt Exp $";
+static char *rcsid = "$OpenBSD: kvm_m68k.c,v 1.2 1996/03/19 23:15:24 niklas Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 /*
@@ -49,31 +51,31 @@ static char *rcsid = "$Id: kvm_m68k.c,v 1.1.1.1 1995/10/18 08:42:44 deraadt Exp
 #include <sys/user.h>
 #include <sys/proc.h>
 #include <sys/stat.h>
+
+#include <sys/core.h>
+#include <sys/exec_aout.h>
+#include <sys/kcore.h>
+
 #include <unistd.h>
+#include <limits.h>
 #include <nlist.h>
 #include <kvm.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 
-#include <limits.h>
 #include <db.h>
 
 #include "kvm_private.h"
 
 #include <machine/pte.h>
+#include <machine/kcore.h>
 
 #ifndef btop
 #define	btop(x)		(((unsigned)(x)) >> PGSHIFT)	/* XXX */
 #define	ptob(x)		((caddr_t)((x) << PGSHIFT))	/* XXX */
 #endif
 
-struct vmstate {
-	u_long lowram;
-	int mmutype;
-	st_entry_t *Sysseg;
-};
-
 #define KREAD(kd, addr, p)\
 	(kvm_read(kd, addr, (char *)(p), sizeof(*(p))) != sizeof(*(p)))
 
@@ -89,36 +91,6 @@ int
 _kvm_initvtop(kd)
 	kvm_t *kd;
 {
-	struct vmstate *vm;
-	struct nlist nlist[4];
-
-	vm = (struct vmstate *)_kvm_malloc(kd, sizeof(*vm));
-	if (vm == 0)
-		return (-1);
-	kd->vmst = vm;
-
-	nlist[0].n_name = "_lowram";
-	nlist[1].n_name = "_mmutype";
-	nlist[2].n_name = "_Sysseg";
-	nlist[3].n_name = 0;
-
-	if (kvm_nlist(kd, nlist) != 0) {
-		_kvm_err(kd, kd->program, "bad namelist");
-		return (-1);
-	}
-	vm->Sysseg = 0;
-	if (KREAD(kd, (u_long)nlist[0].n_value, &vm->lowram)) {
-		_kvm_err(kd, kd->program, "cannot read lowram");
-		return (-1);
-	}
-	if (KREAD(kd, (u_long)nlist[1].n_value, &vm->mmutype)) {
-		_kvm_err(kd, kd->program, "cannot read mmutype");
-		return (-1);
-	}
-	if (KREAD(kd, (u_long)nlist[2].n_value, &vm->Sysseg)) {
-		_kvm_err(kd, kd->program, "cannot read segment table");
-		return (-1);
-	}
 	return (0);
 }
 
@@ -129,8 +101,7 @@ _kvm_vatop(kd, sta, va, pa)
 	u_long va;
 	u_long *pa;
 {
-	register struct vmstate *vm;
-	register u_long lowram;
+	register cpu_kcore_hdr_t *cpu_kh;
 	register u_long addr;
 	int p, ste, pte;
 	int offset;
@@ -139,18 +110,17 @@ _kvm_vatop(kd, sta, va, pa)
 		_kvm_err(kd, 0, "vatop called in live kernel!");
 		return((off_t)0);
 	}
-	vm = kd->vmst;
 	offset = va & PGOFSET;
+	cpu_kh = kd->cpu_hdr;
 	/*
 	 * If we are initializing (kernel segment table pointer not yet set)
 	 * then return pa == va to avoid infinite recursion.
 	 */
-	if (vm->Sysseg == 0) {
-		*pa = va;
+	if (cpu_kh->sysseg_pa == 0) {
+		*pa = va + cpu_kh->kernel_pa;
 		return (NBPG - offset);
 	}
-	lowram = vm->lowram;
-	if (vm->mmutype == -2) {
+	if (cpu_kh->mmutype == -2) {
 		st_entry_t *sta2;
 
 		addr = (u_long)&sta[va >> SG4_SHIFT1];
@@ -158,8 +128,8 @@ _kvm_vatop(kd, sta, va, pa)
 		 * Can't use KREAD to read kernel segment table entries.
 		 * Fortunately it is 1-to-1 mapped so we don't have to. 
 		 */
-		if (sta == vm->Sysseg) {
-			if (lseek(kd->pmfd, (off_t)addr, 0) == -1 ||
+		if (sta == cpu_kh->sysseg_pa) {
+			if (lseek(kd->pmfd, _kvm_pa2off(kd, addr), 0) == -1 ||
 			    read(kd->pmfd, (char *)&ste, sizeof(ste)) < 0)
 				goto invalid;
 		} else if (KREAD(kd, addr, &ste))
@@ -175,7 +145,7 @@ _kvm_vatop(kd, sta, va, pa)
 		 * Address from level 1 STE is a physical address,
 		 * so don't use kvm_read.
 		 */
-		if (lseek(kd->pmfd, (off_t)(addr - lowram), 0) == -1 || 
+		if (lseek(kd->pmfd, _kvm_pa2off(kd, addr), 0) == -1 || 
 		    read(kd->pmfd, (char *)&ste, sizeof(ste)) < 0)
 			goto invalid;
 		if ((ste & SG_V) == 0) {
@@ -191,8 +161,8 @@ _kvm_vatop(kd, sta, va, pa)
 		 * Can't use KREAD to read kernel segment table entries.
 		 * Fortunately it is 1-to-1 mapped so we don't have to. 
 		 */
-		if (sta == vm->Sysseg) {
-			if (lseek(kd->pmfd, (off_t)addr, 0) == -1 ||
+		if (sta == cpu_kh->sysseg_pa) {
+			if (lseek(kd->pmfd, _kvm_pa2off(kd, addr), 0) == -1 ||
 			    read(kd->pmfd, (char *)&ste, sizeof(ste)) < 0)
 				goto invalid;
 		} else if (KREAD(kd, addr, &ste))
@@ -207,7 +177,7 @@ _kvm_vatop(kd, sta, va, pa)
 	/*
 	 * Address from STE is a physical address so don't use kvm_read.
 	 */
-	if (lseek(kd->pmfd, (off_t)(addr - lowram), 0) == -1 || 
+	if (lseek(kd->pmfd, _kvm_pa2off(kd, addr), 0) == -1 || 
 	    read(kd->pmfd, (char *)&pte, sizeof(pte)) < 0)
 		goto invalid;
 	addr = pte & PG_FRAME;
@@ -215,7 +185,7 @@ _kvm_vatop(kd, sta, va, pa)
 		_kvm_err(kd, 0, "page not valid");
 		return (0);
 	}
-	*pa = addr - lowram + offset;
+	*pa = addr + offset;
 	
 	return (NBPG - offset);
 invalid:
@@ -229,5 +199,5 @@ _kvm_kvatop(kd, va, pa)
 	u_long va;
 	u_long *pa;
 {
-	return (_kvm_vatop(kd, (u_long)kd->vmst->Sysseg, va, pa));
+	return (_kvm_vatop(kd, (u_long)kd->cpu_hdr->sysseg_pa, va, pa));
 }