Module Name: src
Committed By: mrg
Date: Mon Aug 17 21:50:14 UTC 2020
Modified Files:
src/sys/arch/mips/mips: mips_stacktrace.c
Log Message:
avoid build failure on !DBB kernels.
should fix arc, emips, ews4800mips, mipsco, newsmips and pmax builds.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/mips/mips_stacktrace.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/mips_stacktrace.c
diff -u src/sys/arch/mips/mips/mips_stacktrace.c:1.3 src/sys/arch/mips/mips/mips_stacktrace.c:1.4
--- src/sys/arch/mips/mips/mips_stacktrace.c:1.3 Mon Aug 17 04:15:34 2020
+++ src/sys/arch/mips/mips/mips_stacktrace.c Mon Aug 17 21:50:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_stacktrace.c,v 1.3 2020/08/17 04:15:34 mrg Exp $ */
+/* $NetBSD: mips_stacktrace.c,v 1.4 2020/08/17 21:50:14 mrg Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mips_stacktrace.c,v 1.3 2020/08/17 04:15:34 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_stacktrace.c,v 1.4 2020/08/17 21:50:14 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -62,9 +62,9 @@ __KERNEL_RCSID(0, "$NetBSD: mips_stacktr
#ifdef DDB
#include <machine/db_machdep.h>
#include <ddb/db_sym.h>
-#endif
#include <ddb/db_user.h>
#include <ddb/db_access.h>
+#endif
#ifdef KGDB
#include <sys/kgdb.h>
@@ -201,7 +201,11 @@ kdbpeek(vaddr_t addr, unsigned *valp)
printf("kdbpeek: NULL\n");
return false;
} else {
+#if _KERNEL
+ *valp = *(unsigned *)addr;
+#else
db_read_bytes((db_addr_t)addr, sizeof(unsigned), (char *)valp);
+#endif
return true;
}
}
@@ -223,9 +227,15 @@ kdbrpeek(vaddr_t addr, size_t n)
rc = 0xdeadfeed;
} else {
if (sizeof(mips_reg_t) == 8 && n == 8)
+#if _KERNEL
db_read_bytes((db_addr_t)addr, sizeof(int64_t), (char *)&rc);
else
db_read_bytes((db_addr_t)addr, sizeof(int32_t), (char *)&rc);
+#else
+ rc = *(int64_t *)addr;
+ else
+ rc = *(int32_t *)addr;
+#endif
}
return rc;
}
