Tue May 12 07:07:16 2015 UTC ()

Add some KASSERTs to catch similar bugs to the cnptes/nptes one


(skrll)

diff -r1.138 -r1.139 src/sys/arch/arm/include/arm32/pmap.h

--- src/sys/arch/arm/include/arm32/pmap.h 2015/02/25 13:52:42	1.138
+++ src/sys/arch/arm/include/arm32/pmap.h 2015/05/12 07:07:16	1.139

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.h,v 1.138 2015/02/25 13:52:42 joerg Exp $	*/
+/*	$NetBSD: pmap.h,v 1.139 2015/05/12 07:07:16 skrll Exp $	*/
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe & Steve C. Woodford for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -557,43 +557,46 @@ l1pte_set(pt_entry_t *pdep, pt_entry_t p
 #define l2pte_index(v)		((((v) & L2_ADDR_BITS) >> PGSHIFT) << (PGSHIFT-L2_S_SHIFT))
 #define l2pte_valid_p(pte)	(((pte) & L2_TYPE_MASK) != L2_TYPE_INV)
 #define l2pte_pa(pte)		((pte) & L2_S_FRAME)
 #define l1pte_lpage_p(pte)	(((pte) & L2_TYPE_MASK) == L2_TYPE_L)
 #define l2pte_minidata_p(pte)	(((pte) & \
 				 (L2_B | L2_C | L2_XS_T_TEX(TEX_XSCALE_X)))\
 				 == (L2_C | L2_XS_T_TEX(TEX_XSCALE_X)))
 static inline void
 l2pte_set(pt_entry_t *ptep, pt_entry_t pte, pt_entry_t opte)
+{
 	if (l1pte_lpage_p(pte)) {
 		KASSERTMSG((((uintptr_t)ptep / sizeof(pte)) & (L2_L_SIZE / L2_S_SIZE - 1)) == 0, "%p", ptep);
 		for (size_t k = 0; k < L2_L_SIZE / L2_S_SIZE; k++) {
 			*ptep++ = pte;
+		}
 	} else {
 		KASSERTMSG((((uintptr_t)ptep / sizeof(pte)) & (PAGE_SIZE / L2_S_SIZE - 1)) == 0, "%p", ptep);
 		for (size_t k = 0; k < PAGE_SIZE / L2_S_SIZE; k++) {
 			KASSERTMSG(*ptep == opte, "%#x [*%p] != %#x", *ptep, ptep, opte);
 			*ptep++ = pte;
 			pte += L2_S_SIZE;
 			if (opte)
 				opte += L2_S_SIZE;
+		}
+	}
+}
 static inline void
 l2pte_reset(pt_entry_t *ptep)
+{
 	KASSERTMSG((((uintptr_t)ptep / sizeof(*ptep)) & (PAGE_SIZE / L2_S_SIZE - 1)) == 0, "%p", ptep);
 	*ptep = 0;
 	for (vsize_t k = 1; k < PAGE_SIZE / L2_S_SIZE; k++) {
 		ptep[k] = 0;
+	}
+}
 /* L1 and L2 page table macros */
 #define pmap_pde_v(pde)		l1pte_valid(*(pde))
 #define pmap_pde_section(pde)	l1pte_section_p(*(pde))
 #define pmap_pde_supersection(pde)	l1pte_supersection_p(*(pde))
 #define pmap_pde_page(pde)	l1pte_page_p(*(pde))
 #define pmap_pde_fpage(pde)	l1pte_fpage_p(*(pde))