Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sh3/sh3 Split compound assertion into several, one ...



details:   https://anonhg.NetBSD.org/src/rev/3a97d18b5bc3
branches:  trunk
changeset: 936773:3a97d18b5bc3
user:      uwe <uwe%NetBSD.org@localhost>
date:      Mon Aug 03 19:08:55 2020 +0000

description:
Split compound assertion into several, one for each term.

diffstat:

 sys/arch/sh3/sh3/mmu_sh4.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r b5994c97f606 -r 3a97d18b5bc3 sys/arch/sh3/sh3/mmu_sh4.c
--- a/sys/arch/sh3/sh3/mmu_sh4.c        Mon Aug 03 18:19:35 2020 +0000
+++ b/sys/arch/sh3/sh3/mmu_sh4.c        Mon Aug 03 19:08:55 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mmu_sh4.c,v 1.15 2020/08/03 16:43:44 uwe Exp $ */
+/*     $NetBSD: mmu_sh4.c,v 1.16 2020/08/03 19:08:55 uwe Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mmu_sh4.c,v 1.15 2020/08/03 16:43:44 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mmu_sh4.c,v 1.16 2020/08/03 19:08:55 uwe Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -155,7 +155,9 @@
        uint32_t ptel;
        int sr;
 
-       KDASSERT(asid < 0x100 && (pte & ~PGOFSET) != 0 && va != 0);
+       KDASSERT(asid < 0x100);
+       KDASSERT(va != 0);
+       KDASSERT((pte & ~PGOFSET) != 0);
 
        sr = _cpu_exception_suspend();
        /* Save old ASID */



Home | Main Index | Thread Index | Old Index