Module Name: src
Committed By: uwe
Date: Sat Dec 24 14:32:42 UTC 2022
Modified Files:
src/sys/arch/amd64/amd64: db_machdep.c
src/sys/arch/i386/i386: db_machdep.c
Log Message:
{amd64,i386}/db_machdep.c: Use DB_SYM_NULL
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/amd64/amd64/db_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/i386/db_machdep.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/amd64/amd64/db_machdep.c
diff -u src/sys/arch/amd64/amd64/db_machdep.c:1.13 src/sys/arch/amd64/amd64/db_machdep.c:1.14
--- src/sys/arch/amd64/amd64/db_machdep.c:1.13 Mon Jun 27 23:36:48 2022
+++ src/sys/arch/amd64/amd64/db_machdep.c Sat Dec 24 14:32:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.13 2022/06/27 23:36:48 riastradh Exp $ */
+/* $NetBSD: db_machdep.c,v 1.14 2022/12/24 14:32:42 uwe Exp $ */
/*
* Mach Operating System
@@ -26,7 +26,7 @@
* rights to redistribute these changes.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.13 2022/06/27 23:36:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.14 2022/12/24 14:32:42 uwe Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -176,7 +176,7 @@ db_nextframe(long **nextframe, long **re
* err 0 or IREENT_MAGIC and trapno T_ASTFLT.
*/
if (db_frame_info(*nextframe, (db_addr_t)*ip, NULL, NULL, &traptype,
- NULL) != (db_sym_t)0
+ NULL) != DB_SYM_NULL
&& traptype == INTERRUPT) {
for (i = 0; i < 4; i++) {
ifp = (struct intrframe *)(argp + i);
@@ -210,13 +210,13 @@ db_frame_info(long *frame, db_addr_t cal
const char *name;
sym = db_search_symbol(callpc, DB_STGY_ANY, &offset);
- if (sym != 0 && offset == 0) {
+ if (sym != DB_SYM_NULL && offset == 0) {
sym = db_search_symbol(callpc - 1, DB_STGY_ANY, &offset);
offset++;
}
db_symbol_values(sym, &name, NULL);
- if (sym == (db_sym_t)0)
- return (db_sym_t)0;
+ if (sym == DB_SYM_NULL)
+ return DB_SYM_NULL;
*is_trap = NONE;
narg = 0;
Index: src/sys/arch/i386/i386/db_machdep.c
diff -u src/sys/arch/i386/i386/db_machdep.c:1.8 src/sys/arch/i386/i386/db_machdep.c:1.9
--- src/sys/arch/i386/i386/db_machdep.c:1.8 Mon Dec 13 01:25:29 2021
+++ src/sys/arch/i386/i386/db_machdep.c Sat Dec 24 14:32:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.8 2021/12/13 01:25:29 chs Exp $ */
+/* $NetBSD: db_machdep.c,v 1.9 2022/12/24 14:32:42 uwe Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.8 2021/12/13 01:25:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.9 2022/12/24 14:32:42 uwe Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -208,7 +208,7 @@ db_nextframe(long **nextframe, long **re
* err 0 or IREENT_MAGIC and trapno T_ASTFLT.
*/
if (db_frame_info(*nextframe, (db_addr_t)*ip, NULL, NULL, &traptype,
- NULL) != (db_sym_t)0
+ NULL) != DB_SYM_NULL
&& traptype == INTERRUPT) {
struct intrframe *ifp;
int trapno;
@@ -255,13 +255,13 @@ db_frame_info(long *frame, db_addr_t cal
const char *name;
sym = db_search_symbol(callpc, DB_STGY_ANY, &offset);
- if (sym != 0 && offset == 0) {
+ if (sym != DB_SYM_NULL && offset == 0) {
sym = db_search_symbol(callpc - 1, DB_STGY_ANY, &offset);
offset++;
}
db_symbol_values(sym, &name, NULL);
- if (sym == (db_sym_t)0)
- return (db_sym_t)0;
+ if (sym == DB_SYM_NULL)
+ return DB_SYM_NULL;
*is_trap = NONE;
narg = MAXNARG;
