[src/trunk]: src/sys/arch/arm/arm32 Sprinkle assertions after calling pmap_ge...

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

details:   https://anonhg.NetBSD.org/src/rev/34a2d5f52b83
branches:  trunk
changeset: 750449:34a2d5f52b83
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Fri Jan 01 02:32:28 2010 +0000

description:
Sprinkle assertions after calling pmap_get_l2_bucket().

diffstat:

 sys/arch/arm/arm32/pmap.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (66 lines):

diff -r a78d6c1572fa -r 34a2d5f52b83 sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Fri Jan 01 00:16:54 2010 +0000
+++ b/sys/arch/arm/arm32/pmap.c Fri Jan 01 02:32:28 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.209 2009/12/31 18:34:56 uebayasi Exp $      */
+/*     $NetBSD: pmap.c,v 1.210 2010/01/01 02:32:28 uebayasi Exp $      */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -211,7 +211,7 @@
 #include <machine/param.h>
 #include <arm/arm32/katelib.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.209 2009/12/31 18:34:56 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.210 2010/01/01 02:32:28 uebayasi Exp $");
 
 #ifdef PMAP_DEBUG
 
@@ -1531,6 +1531,7 @@
 
                pm->pm_pl1vec = &pm->pm_l1->l1_kva[L1_IDX(vector_page)];
                l2b = pmap_get_l2_bucket(pm, vector_page);
+               KDASSERT(l2b != NULL);
                pm->pm_l1vec = l2b->l2b_phys | L1_C_PROTO |
                    L1_C_DOM(pm->pm_domain);
        } else
@@ -1752,6 +1753,7 @@
                        pv->pv_flags |= PVF_NC;
 
                        l2b = pmap_get_l2_bucket(pv->pv_pmap, pv->pv_va);
+                       KDASSERT(l2b != NULL);
                        ptep = &l2b->l2b_kva[l2pte_index(pv->pv_va)];
                        pte = *ptep & ~L2_S_CACHE_MASK;
 
@@ -1794,6 +1796,7 @@
                        pv->pv_flags &= ~PVF_NC;
 
                        l2b = pmap_get_l2_bucket(pv->pv_pmap, pv->pv_va);
+                       KDASSERT(l2b != NULL);
                        ptep = &l2b->l2b_kva[l2pte_index(pv->pv_va)];
                        pte = (*ptep & ~L2_S_CACHE_MASK) | pte_l2_s_cache_mode;
 
@@ -2082,6 +2085,7 @@
         */
        SLIST_FOREACH(pv, &pg->mdpage.pvh_list, pv_link) {
                l2b = pmap_get_l2_bucket(pv->pv_pmap, pv->pv_va);
+               KDASSERT(l2b != NULL);
                ptep = &l2b->l2b_kva[l2pte_index(pv->pv_va)];
                opte = *ptep;
                pte = opte & ~L2_S_CACHE_MASK;
@@ -5231,6 +5235,7 @@
        if (vector_page < KERNEL_BASE) {
                pm->pm_pl1vec = &pm->pm_l1->l1_kva[L1_IDX(vector_page)];
                l2b = pmap_get_l2_bucket(pm, vector_page);
+               KDASSERT(l2b != NULL);
                pm->pm_l1vec = l2b->l2b_phys | L1_C_PROTO |
                    L1_C_DOM(pm->pm_domain);
        } else
@@ -5459,6 +5464,7 @@
                         * with the cache-mode set to write-through.
                         */
                        l2b = pmap_get_l2_bucket(pmap_kernel(), va);
+                       KDASSERT(l2b != NULL);
                        ptep = &l2b->l2b_kva[l2pte_index(va)];
                        pte = *ptep;
                        pte = (pte & ~L2_S_CACHE_MASK) | pte_l2_s_cache_mode_pt;