Source-Changes-HG archive

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

[.joined/src/trunk]: .joined/src/sys/arch/mips/mips fix KASSERT issue



details:   https://anonhg.NetBSD.org/.joined/src/rev/caa1938a0847
branches:  trunk
changeset: 359404:caa1938a0847
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 02 16:03:46 2022 +0000

description:
fix KASSERT issue

diffstat:

 sys/arch/mips/mips/mips_fixup.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r ad79ba59a308 -r caa1938a0847 sys/arch/mips/mips/mips_fixup.c
--- a/sys/arch/mips/mips/mips_fixup.c   Sun Jan 02 16:03:30 2022 +0000
+++ b/sys/arch/mips/mips/mips_fixup.c   Sun Jan 02 16:03:46 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mips_fixup.c,v 1.22 2021/10/02 14:28:04 skrll Exp $    */
+/*     $NetBSD: mips_fixup.c,v 1.23 2022/01/02 16:03:46 christos Exp $ */
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mips_fixup.c,v 1.22 2021/10/02 14:28:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_fixup.c,v 1.23 2022/01/02 16:03:46 christos Exp $");
 
 #include "opt_mips3_wired.h"
 #include "opt_multiprocessor.h"
@@ -120,6 +120,7 @@
                        if (addr <= load_addr
                            && load_addr < addr + size
                            && base == lui_reg) {
+#if defined(DIAGNOSTIC) || defined(DEBUG_VERBOSE)
                                KASSERT(rt == _R_K0 || rt == _R_K1);
 #ifdef DEBUG_VERBOSE
                                printf("%s: %#x: insn %08x: %s r%zu, %%lo(%08x)(r%zu)\n",
@@ -130,6 +131,7 @@
                                        : INSN_SW_P(insn) ? "sw" : "sd",
                                    rt, load_addr, base);
 #endif
+#endif
                                new_insns[0] = lui_insn;
                                new_insns[1] = *insnp;
                                if ((callback)(load_addr, new_insns, arg)) {



Home | Main Index | Thread Index | Old Index