Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uvm(9): KASSERT(A && B) -> KASSERT(A); KASSERT(B) 

While here, print some of the inputs with KASSERTMSG.
This commit is contained in:
riastradh 2023-02-27 16:24:45 +00:00
parent 1f867660b6
commit e088bb05d6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/uvm/uvm_map.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_map.c,v 1.403 2022/11/23 23:53:53 riastradh Exp $ */
/* $NetBSD: uvm_map.c,v 1.404 2023/02/27 16:24:45 riastradh Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.403 2022/11/23 23:53:53 riastradh Exp $");
__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.404 2023/02/27 16:24:45 riastradh Exp $");
#include "opt_ddb.h"
#include "opt_pax.h"
@ -2123,7 +2123,10 @@ nextgap:
else
tmp = RIGHT_ENTRY(prev);
for (;;) {
KASSERT(tmp && tmp->maxgap >= length);
KASSERT(tmp);
KASSERTMSG(tmp->maxgap >= length,
"tmp->maxgap=0x%"PRIxVSIZE" length=0x%"PRIxVSIZE,
tmp->maxgap, length);
if (topdown)
child = RIGHT_ENTRY(tmp);
else
@ -2685,7 +2688,8 @@ uvm_map_extract(struct vm_map *srcmap, vaddr_t start, vsize_t len,
* REMOVE.
*/
KASSERT((start & PAGE_MASK) == 0 && (len & PAGE_MASK) == 0);
KASSERTMSG((start & PAGE_MASK) == 0, "start=0x%"PRIxVADDR, start);
KASSERTMSG((len & PAGE_MASK) == 0, "len=0x%"PRIxVADDR, len);
KASSERT((flags & UVM_EXTRACT_REMOVE) == 0 ||
(flags & (UVM_EXTRACT_CONTIG|UVM_EXTRACT_QREF)) == 0);