[src/trunk]: src/sys/arch/usermode/usermode Implement pmap_extract() and prin...

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

details:   https://anonhg.NetBSD.org/src/rev/48559c53a302
branches:  trunk
changeset: 768607:48559c53a302
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Mon Aug 22 16:22:16 2011 +0000

description:
Implement pmap_extract() and print pmap_zero_page() pa address.

diffstat:

 sys/arch/usermode/usermode/pmap.c |  25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diffs (68 lines):

diff -r 477318dabc27 -r 48559c53a302 sys/arch/usermode/usermode/pmap.c
--- a/sys/arch/usermode/usermode/pmap.c Mon Aug 22 15:36:23 2011 +0000
+++ b/sys/arch/usermode/usermode/pmap.c Mon Aug 22 16:22:16 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.9 2011/08/22 15:36:23 reinoud Exp $ */
+/* $NetBSD: pmap.c,v 1.10 2011/08/22 16:22:16 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <reinoud%NetBSD.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.9 2011/08/22 15:36:23 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.10 2011/08/22 16:22:16 reinoud Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_memsize.h"
@@ -387,7 +387,8 @@
 pmap_page_activate(struct pv_entry *pv)
 {
        paddr_t pa = pv->pv_ppn * PAGE_SIZE;
-       vaddr_t va = pv->pv_lpn * PAGE_SIZE + kmem_k_start;
+       vaddr_t va = pv->pv_lpn * PAGE_SIZE + kmem_k_start; /* XXX V->A make new var */
+
        void *addr;
 
        addr = thunk_mmap((void *) va, PAGE_SIZE, pv->pv_mmap_ppl,
@@ -448,7 +449,7 @@
 
        /* to page numbers */
        ppn = atop(pa);
-       lpn = atop(va - kmem_k_start);  /* XXX make new var */
+       lpn = atop(va - kmem_k_start);  /* XXX V->A make new var */
 #ifdef DIAGNOSTIC
        if ((va < kmem_k_start) || (va > kmem_user_end))
                panic("pmap_do_enter: invalid va isued\n");
@@ -536,10 +537,18 @@
 bool
 pmap_extract(pmap_t pmap, vaddr_t va, paddr_t *pap)
 {
-       /* XXXJDM */
-       if (pap)
-               *pap = va;
+       struct pv_entry *pv;
+       UVMHIST_FUNC("pmap_extract");
+       UVMHIST_CALLED(pmaphist);
+
+       /* TODO protect against roque values */
 printf("pmap_extract: extracting va %p\n", (void *) va);
+       pv = pmap->pm_entries[atop(va - kmem_k_start)]; /* XXX V->A make new var */
+
+       if (pv == NULL)
+               return false;
+
+       *pap = ptoa(pv->pv_ppn);
        return true;
 }
 
@@ -584,7 +593,7 @@
 void
 pmap_zero_page(paddr_t pa)
 {
-printf("pmap_zero_page\n");
+printf("pmap_zero_page: pa %p\n", (void *) pa);
 }
 
 void