d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix kvm_i386.c just enough to make it compile and return lots of errors

Browse Source 
when called.  Noop out swapread in kvm_proc.c as our vm system is
different.
This commit is contained in:
Rodney W. Grimes 1994-05-28 05:48:30 +00:00
parent f95a02507b
commit 21d54b076d
3 changed files with 74 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

207
lib/libkvm/kvm_amd64.c
View File

@ -40,7 +40,7 @@ static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
/* /*
* Hp300 machine dependent routines for kvm. Hopefully, the forthcoming * i386 machine dependent routines for kvm. Hopefully, the forthcoming
* vm code will one day obsolete this module. * vm code will one day obsolete this module.
*/ */
@ -60,227 +60,88 @@ static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
#include "kvm_private.h" #include "kvm_private.h"
#if defined(hp300)
#include <hp300/hp300/pte.h>
#endif
#if defined(luna68k)
#include <luna68k/luna68k/pte.h>
#endif
#ifndef btop #ifndef btop
#define btop(x) (((unsigned)(x)) >> PGSHIFT) /* XXX */ #define btop(x) (i386_btop(x))
#define ptob(x) ((caddr_t)((x) << PGSHIFT)) /* XXX */ #define ptob(x) (i386_ptob(x))
#endif #endif
struct vmstate { struct vmstate {
u_long lowram; struct pde **IdlePTD;
int mmutype; struct pde *PTD;
struct ste *Sysseg;
}; };
#define KREAD(kd, addr, p)\ #define KREAD(kd, addr, p)\
(kvm_read(kd, addr, (char *)(p), sizeof(*(p))) != sizeof(*(p))) (kvm_read(kd, addr, (char *)(p), sizeof(*(p))) != sizeof(*(p)))
void void
_kvm_freevtop(kd) _kvm_freevtop(kvm_t *kd) {
kvm_t *kd; if (kd->vmst->PTD) {
{ free(kd->vmst->PTD);
if (kd->vmst != 0) }
if (kd->vmst != 0) {
free(kd->vmst); free(kd->vmst);
}
} }
int int
_kvm_initvtop(kd) _kvm_initvtop(kvm_t *kd) {
kvm_t *kd;
{
struct vmstate *vm; struct vmstate *vm;
struct nlist nlist[4]; struct nlist nlist[2];
vm = (struct vmstate *)_kvm_malloc(kd, sizeof(*vm)); vm = (struct vmstate *)_kvm_malloc(kd, sizeof(*vm));
if (vm == 0) if (vm == 0) {
_kvm_err(kd, kd->program, "cannot allocate vm");
return (-1); return (-1);
}
kd->vmst = vm; kd->vmst = vm;
nlist[0].n_name = "_lowram"; nlist[0].n_name = "_IdlePTD";
nlist[1].n_name = "_mmutype"; nlist[1].n_name = 0;
nlist[2].n_name = "_Sysseg";
nlist[3].n_name = 0;
if (kvm_nlist(kd, nlist) != 0) { if (kvm_nlist(kd, nlist) != 0) {
_kvm_err(kd, kd->program, "bad namelist"); _kvm_err(kd, kd->program, "bad namelist");
return (-1); return (-1);
} }
vm->Sysseg = 0; vm->IdlePTD = 0;
if (KREAD(kd, (u_long)nlist[0].n_value, &vm->lowram)) { if (KREAD(kd, (u_long)nlist[0].n_value, &vm->IdlePTD)) {
_kvm_err(kd, kd->program, "cannot read lowram"); _kvm_err(kd, kd->program, "cannot read IdlePTD");
return (-1); return (-1);
} }
if (KREAD(kd, (u_long)nlist[1].n_value, &vm->mmutype)) { if ((vm->PTD = _kvm_malloc(kd, NBPG /*sizeof(struct pde)*/)) != 0) {
_kvm_err(kd, kd->program, "cannot read mmutype"); _kvm_err(kd, kd->program, "cannot allocate vm->PTD");
return (-1);
} }
if (KREAD(kd, (u_long)nlist[2].n_value, &vm->Sysseg)) { if (KREAD(kd, (u_long)nlist[1].n_value, &vm->PTD)) {
_kvm_err(kd, kd->program, "cannot read segment table"); _kvm_err(kd, kd->program, "cannot read PTD");
return (-1); return (-1);
} }
return (0); return (0);
} }
static int static int
_kvm_vatop(kd, sta, va, pa) _kvm_vatop(kvm_t *kd, u_long va, u_long *pa) {
kvm_t *kd;
struct ste *sta;
u_long va;
u_long *pa;
{
register struct vmstate *vm;
register u_long lowram;
register u_long addr;
int p, ste, pte;
int offset;
if (ISALIVE(kd)) { if (ISALIVE(kd)) {
_kvm_err(kd, 0, "vatop called in live kernel!"); _kvm_err(kd, 0, "vatop called in live kernel!");
return((off_t)0); return((off_t)0);
} }
vm = kd->vmst;
offset = va & PGOFSET;
/*
* 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;
return (NBPG - offset);
}
lowram = vm->lowram;
if (vm->mmutype == -2) {
struct ste *sta2;
addr = (u_long)&sta[va >> SG4_SHIFT1];
/*
* 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 ||
read(kd->pmfd, (char *)&ste, sizeof(ste)) < 0)
goto invalid;
} else if (KREAD(kd, addr, &ste))
goto invalid;
if ((ste & SG_V) == 0) {
_kvm_err(kd, 0, "invalid level 1 descriptor (%x)",
ste);
return((off_t)0);
}
sta2 = (struct ste *)(ste & SG4_ADDR1);
addr = (u_long)&sta2[(va & SG4_MASK2) >> SG4_SHIFT2];
/*
* 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 ||
read(kd->pmfd, (char *)&ste, sizeof(ste)) < 0)
goto invalid;
if ((ste & SG_V) == 0) {
_kvm_err(kd, 0, "invalid level 2 descriptor (%x)",
ste);
return((off_t)0);
}
sta2 = (struct ste *)(ste & SG4_ADDR2);
addr = (u_long)&sta2[(va & SG4_MASK3) >> SG4_SHIFT3];
} else {
addr = (u_long)&sta[va >> SEGSHIFT];
/*
* 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 ||
read(kd->pmfd, (char *)&ste, sizeof(ste)) < 0)
goto invalid;
} else if (KREAD(kd, addr, &ste))
goto invalid;
if ((ste & SG_V) == 0) {
_kvm_err(kd, 0, "invalid segment (%x)", ste);
return((off_t)0);
}
p = btop(va & SG_PMASK);
addr = (ste & SG_FRAME) + (p * sizeof(struct pte));
}
/*
* Address from STE is a physical address so don't use kvm_read.
*/
if (lseek(kd->pmfd, (off_t)(addr - lowram), 0) == -1 ||
read(kd->pmfd, (char *)&pte, sizeof(pte)) < 0)
goto invalid;
addr = pte & PG_FRAME;
if (pte == PG_NV) {
_kvm_err(kd, 0, "page not valid");
return (0);
}
*pa = addr - lowram + offset;
return (NBPG - offset);
invalid:
_kvm_err(kd, 0, "invalid address (%x)", va); _kvm_err(kd, 0, "invalid address (%x)", va);
return (0); return ((off_t)0);
} }
int int
_kvm_kvatop(kd, va, pa) _kvm_kvatop(kvm_t *kd, u_long va, u_long *pa) {
kvm_t *kd; return (_kvm_vatop(kd, va, pa));
u_long va;
u_long *pa;
{
return (_kvm_vatop(kd, (u_long)kd->vmst->Sysseg, va, pa));
} }
/* /*
* Translate a user virtual address to a physical address. * Translate a user virtual address to a physical address.
*/ */
int int
_kvm_uvatop(kd, p, va, pa) _kvm_uvatop(kvm_t *kd, const struct proc *p, u_long va, u_long *pa) {
kvm_t *kd;
const struct proc *p;
u_long va;
u_long *pa;
{
register struct vmspace *vms = p->p_vmspace;
int kva;
/*
* If this is a live kernel we just look it up in the kernel
* virtually allocated flat 4mb page table (i.e. let the kernel
* do the table walk). In this way, we avoid needing to know
* the MMU type.
*/
if (ISALIVE(kd)) { if (ISALIVE(kd)) {
struct pte *ptab; /* Not done yet */
int pte, offset; } else {
/* Not done yet */
kva = (int)&vms->vm_pmap.pm_ptab;
if (KREAD(kd, kva, &ptab)) {
_kvm_err(kd, 0, "invalid address (%x)", va);
return (0);
}
kva = (int)&ptab[btop(va)];
if (KREAD(kd, kva, &pte) || (pte & PG_V) == 0) {
_kvm_err(kd, 0, "invalid address (%x)", va);
return (0);
}
offset = va & PGOFSET;
*pa = (pte & PG_FRAME) | offset;
return (NBPG - offset);
} }
/* return ((off_t)(0));
* Otherwise, we just walk the table ourself.
*/
kva = (int)&vms->vm_pmap.pm_stab;
if (KREAD(kd, kva, &kva)) {
_kvm_err(kd, 0, "invalid address (%x)", va);
return (0);
}
return (_kvm_vatop(kd, kva, va, pa));
} }

207
lib/libkvm/kvm_i386.c
View File

@ -40,7 +40,7 @@ static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
/* /*
* Hp300 machine dependent routines for kvm. Hopefully, the forthcoming * i386 machine dependent routines for kvm. Hopefully, the forthcoming
* vm code will one day obsolete this module. * vm code will one day obsolete this module.
*/ */
@ -60,227 +60,88 @@ static char sccsid[] = "@(#)kvm_hp300.c 8.1 (Berkeley) 6/4/93";
#include "kvm_private.h" #include "kvm_private.h"
#if defined(hp300)
#include <hp300/hp300/pte.h>
#endif
#if defined(luna68k)
#include <luna68k/luna68k/pte.h>
#endif
#ifndef btop #ifndef btop
#define btop(x) (((unsigned)(x)) >> PGSHIFT) /* XXX */ #define btop(x) (i386_btop(x))
#define ptob(x) ((caddr_t)((x) << PGSHIFT)) /* XXX */ #define ptob(x) (i386_ptob(x))
#endif #endif
struct vmstate { struct vmstate {
u_long lowram; struct pde **IdlePTD;
int mmutype; struct pde *PTD;
struct ste *Sysseg;
}; };
#define KREAD(kd, addr, p)\ #define KREAD(kd, addr, p)\
(kvm_read(kd, addr, (char *)(p), sizeof(*(p))) != sizeof(*(p))) (kvm_read(kd, addr, (char *)(p), sizeof(*(p))) != sizeof(*(p)))
void void
_kvm_freevtop(kd) _kvm_freevtop(kvm_t *kd) {
kvm_t *kd; if (kd->vmst->PTD) {
{ free(kd->vmst->PTD);
if (kd->vmst != 0) }
if (kd->vmst != 0) {
free(kd->vmst); free(kd->vmst);
}
} }
int int
_kvm_initvtop(kd) _kvm_initvtop(kvm_t *kd) {
kvm_t *kd;
{
struct vmstate *vm; struct vmstate *vm;
struct nlist nlist[4]; struct nlist nlist[2];
vm = (struct vmstate *)_kvm_malloc(kd, sizeof(*vm)); vm = (struct vmstate *)_kvm_malloc(kd, sizeof(*vm));
if (vm == 0) if (vm == 0) {
_kvm_err(kd, kd->program, "cannot allocate vm");
return (-1); return (-1);
}
kd->vmst = vm; kd->vmst = vm;
nlist[0].n_name = "_lowram"; nlist[0].n_name = "_IdlePTD";
nlist[1].n_name = "_mmutype"; nlist[1].n_name = 0;
nlist[2].n_name = "_Sysseg";
nlist[3].n_name = 0;
if (kvm_nlist(kd, nlist) != 0) { if (kvm_nlist(kd, nlist) != 0) {
_kvm_err(kd, kd->program, "bad namelist"); _kvm_err(kd, kd->program, "bad namelist");
return (-1); return (-1);
} }
vm->Sysseg = 0; vm->IdlePTD = 0;
if (KREAD(kd, (u_long)nlist[0].n_value, &vm->lowram)) { if (KREAD(kd, (u_long)nlist[0].n_value, &vm->IdlePTD)) {
_kvm_err(kd, kd->program, "cannot read lowram"); _kvm_err(kd, kd->program, "cannot read IdlePTD");
return (-1); return (-1);
} }
if (KREAD(kd, (u_long)nlist[1].n_value, &vm->mmutype)) { if ((vm->PTD = _kvm_malloc(kd, NBPG /*sizeof(struct pde)*/)) != 0) {
_kvm_err(kd, kd->program, "cannot read mmutype"); _kvm_err(kd, kd->program, "cannot allocate vm->PTD");
return (-1);
} }
if (KREAD(kd, (u_long)nlist[2].n_value, &vm->Sysseg)) { if (KREAD(kd, (u_long)nlist[1].n_value, &vm->PTD)) {
_kvm_err(kd, kd->program, "cannot read segment table"); _kvm_err(kd, kd->program, "cannot read PTD");
return (-1); return (-1);
} }
return (0); return (0);
} }
static int static int
_kvm_vatop(kd, sta, va, pa) _kvm_vatop(kvm_t *kd, u_long va, u_long *pa) {
kvm_t *kd;
struct ste *sta;
u_long va;
u_long *pa;
{
register struct vmstate *vm;
register u_long lowram;
register u_long addr;
int p, ste, pte;
int offset;
if (ISALIVE(kd)) { if (ISALIVE(kd)) {
_kvm_err(kd, 0, "vatop called in live kernel!"); _kvm_err(kd, 0, "vatop called in live kernel!");
return((off_t)0); return((off_t)0);
} }
vm = kd->vmst;
offset = va & PGOFSET;
/*
* 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;
return (NBPG - offset);
}
lowram = vm->lowram;
if (vm->mmutype == -2) {
struct ste *sta2;
addr = (u_long)&sta[va >> SG4_SHIFT1];
/*
* 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 ||
read(kd->pmfd, (char *)&ste, sizeof(ste)) < 0)
goto invalid;
} else if (KREAD(kd, addr, &ste))
goto invalid;
if ((ste & SG_V) == 0) {
_kvm_err(kd, 0, "invalid level 1 descriptor (%x)",
ste);
return((off_t)0);
}
sta2 = (struct ste *)(ste & SG4_ADDR1);
addr = (u_long)&sta2[(va & SG4_MASK2) >> SG4_SHIFT2];
/*
* 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 ||
read(kd->pmfd, (char *)&ste, sizeof(ste)) < 0)
goto invalid;
if ((ste & SG_V) == 0) {
_kvm_err(kd, 0, "invalid level 2 descriptor (%x)",
ste);
return((off_t)0);
}
sta2 = (struct ste *)(ste & SG4_ADDR2);
addr = (u_long)&sta2[(va & SG4_MASK3) >> SG4_SHIFT3];
} else {
addr = (u_long)&sta[va >> SEGSHIFT];
/*
* 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 ||
read(kd->pmfd, (char *)&ste, sizeof(ste)) < 0)
goto invalid;
} else if (KREAD(kd, addr, &ste))
goto invalid;
if ((ste & SG_V) == 0) {
_kvm_err(kd, 0, "invalid segment (%x)", ste);
return((off_t)0);
}
p = btop(va & SG_PMASK);
addr = (ste & SG_FRAME) + (p * sizeof(struct pte));
}
/*
* Address from STE is a physical address so don't use kvm_read.
*/
if (lseek(kd->pmfd, (off_t)(addr - lowram), 0) == -1 ||
read(kd->pmfd, (char *)&pte, sizeof(pte)) < 0)
goto invalid;
addr = pte & PG_FRAME;
if (pte == PG_NV) {
_kvm_err(kd, 0, "page not valid");
return (0);
}
*pa = addr - lowram + offset;
return (NBPG - offset);
invalid:
_kvm_err(kd, 0, "invalid address (%x)", va); _kvm_err(kd, 0, "invalid address (%x)", va);
return (0); return ((off_t)0);
} }
int int
_kvm_kvatop(kd, va, pa) _kvm_kvatop(kvm_t *kd, u_long va, u_long *pa) {
kvm_t *kd; return (_kvm_vatop(kd, va, pa));
u_long va;
u_long *pa;
{
return (_kvm_vatop(kd, (u_long)kd->vmst->Sysseg, va, pa));
} }
/* /*
* Translate a user virtual address to a physical address. * Translate a user virtual address to a physical address.
*/ */
int int
_kvm_uvatop(kd, p, va, pa) _kvm_uvatop(kvm_t *kd, const struct proc *p, u_long va, u_long *pa) {
kvm_t *kd;
const struct proc *p;
u_long va;
u_long *pa;
{
register struct vmspace *vms = p->p_vmspace;
int kva;
/*
* If this is a live kernel we just look it up in the kernel
* virtually allocated flat 4mb page table (i.e. let the kernel
* do the table walk). In this way, we avoid needing to know
* the MMU type.
*/
if (ISALIVE(kd)) { if (ISALIVE(kd)) {
struct pte *ptab; /* Not done yet */
int pte, offset; } else {
/* Not done yet */
kva = (int)&vms->vm_pmap.pm_ptab;
if (KREAD(kd, kva, &ptab)) {
_kvm_err(kd, 0, "invalid address (%x)", va);
return (0);
}
kva = (int)&ptab[btop(va)];
if (KREAD(kd, kva, &pte) || (pte & PG_V) == 0) {
_kvm_err(kd, 0, "invalid address (%x)", va);
return (0);
}
offset = va & PGOFSET;
*pa = (pte & PG_FRAME) | offset;
return (NBPG - offset);
} }
/* return ((off_t)(0));
* Otherwise, we just walk the table ourself.
*/
kva = (int)&vms->vm_pmap.pm_stab;
if (KREAD(kd, kva, &kva)) {
_kvm_err(kd, 0, "invalid address (%x)", va);
return (0);
}
return (_kvm_vatop(kd, kva, va, pa));
} }

6
lib/libkvm/kvm_proc.c
View File

@ -76,6 +76,11 @@ kvm_readswap(kd, p, va, cnt)
u_long va; u_long va;
u_long *cnt; u_long *cnt;
{ {
#ifdef __FreeBSD__
/* XXX Stubbed out, our vm system is differnet */
_kvm_err(kd, kd->program, "kvm_readswap not implemented");
return(0);
#else
register int ix; register int ix;
register u_long addr, head; register u_long addr, head;
register u_long offset, pagestart, sbstart, pgoff; register u_long offset, pagestart, sbstart, pgoff;
@ -166,6 +171,7 @@ kvm_readswap(kd, p, va, cnt)
offset %= NBPG; offset %= NBPG;
*cnt = NBPG - offset; *cnt = NBPG - offset;
return (&page[offset]); return (&page[offset]);
#endif /* __FreeBSD__ */
} }
#define KREAD(kd, addr, obj) \ #define KREAD(kd, addr, obj) \