Module Name: src
Committed By: andvar
Date: Thu Oct 26 10:41:03 UTC 2023
Modified Files:
src/sys/arch/sparc/conf: files.sparc
src/sys/arch/sparc/include: db_machdep.h
src/sys/arch/sparc/sparc: db_interface.c
Log Message:
Build db_machdep.c when KGDB option is enabled.
Do not cast (regs)->db_tf.tf_pc to db_addr_t (thus ifdef block is redundant).
Adjust ifdef conditions in db_interface.c to make it build with KGDB option.
While here, add #endif comments for longer blocks.
These changes should make sparc build with KGDB option, once ddb/db_access.c
code will be fixed to build with it.
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/arch/sparc/conf/files.sparc
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc/include/db_machdep.h
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/sparc/sparc/db_interface.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/sparc/conf/files.sparc
diff -u src/sys/arch/sparc/conf/files.sparc:1.163 src/sys/arch/sparc/conf/files.sparc:1.164
--- src/sys/arch/sparc/conf/files.sparc:1.163 Sat Apr 24 23:36:48 2021
+++ src/sys/arch/sparc/conf/files.sparc Thu Oct 26 10:41:03 2023
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc,v 1.163 2021/04/24 23:36:48 thorpej Exp $
+# $NetBSD: files.sparc,v 1.164 2023/10/26 10:41:03 andvar Exp $
# @(#)files.sparc 8.1 (Berkeley) 7/19/93
# sparc-specific configuration info
@@ -317,7 +317,7 @@ file arch/sparc/sparc/trap.c
file arch/sparc/sparc/vm_machdep.c
file arch/sparc/sparc/db_interface.c ddb | kgdb
-file arch/sparc/sparc/db_machdep.c ddb
+file arch/sparc/sparc/db_machdep.c ddb | kgdb
file arch/sparc/sparc/db_trace.c ddb
file arch/sparc/sparc/db_disasm.c ddb
Index: src/sys/arch/sparc/include/db_machdep.h
diff -u src/sys/arch/sparc/include/db_machdep.h:1.29 src/sys/arch/sparc/include/db_machdep.h:1.30
--- src/sys/arch/sparc/include/db_machdep.h:1.29 Sun Jan 24 07:36:54 2021
+++ src/sys/arch/sparc/include/db_machdep.h Thu Oct 26 10:41:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.29 2021/01/24 07:36:54 mrg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.30 2023/10/26 10:41:03 andvar Exp $ */
/*
* Mach Operating System
@@ -58,12 +58,7 @@ extern db_regs_t *ddb_regp;
#define DDB_TF (&ddb_regp->db_tf)
#define DDB_FR (&ddb_regp->db_fr)
-
-#if defined(lint)
#define PC_REGS(regs) ((regs)->db_tf.tf_pc)
-#else
-#define PC_REGS(regs) ((db_addr_t)(regs)->db_tf.tf_pc)
-#endif
#define PC_ADVANCE(regs) do { \
int n = (regs)->db_tf.tf_npc; \
(regs)->db_tf.tf_pc = n; \
Index: src/sys/arch/sparc/sparc/db_interface.c
diff -u src/sys/arch/sparc/sparc/db_interface.c:1.97 src/sys/arch/sparc/sparc/db_interface.c:1.98
--- src/sys/arch/sparc/sparc/db_interface.c:1.97 Wed Oct 26 23:38:08 2022
+++ src/sys/arch/sparc/sparc/db_interface.c Thu Oct 26 10:41:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.97 2022/10/26 23:38:08 riastradh Exp $ */
+/* $NetBSD: db_interface.c,v 1.98 2023/10/26 10:41:03 andvar Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.97 2022/10/26 23:38:08 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.98 2023/10/26 10:41:03 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -68,6 +68,9 @@ __KERNEL_RCSID(0, "$NetBSD: db_interface
#include <ddb/db_output.h>
#include <ddb/db_interface.h>
#endif
+#ifdef KGDB
+#include <ddb/db_interface.h>
+#endif
#include <machine/instr.h>
#if defined(_KERNEL)
@@ -221,7 +224,7 @@ ddb_suspend(struct trapframe *tf)
}
#endif /* MULTIPROCESSOR */
-#if defined(DDB)
+#if defined(DDB) || defined(KGDB)
/*
* kdb_trap - field a TRACE or BPT trap
*/
@@ -286,7 +289,7 @@ kdb_trap(int type, struct trapframe *tf)
return (1);
}
-#endif /* DDB */
+#endif /* DDB || KGDB */
#ifdef _KERNEL
void
@@ -388,7 +391,7 @@ db_page_cmd(db_expr_t addr, bool have_ad
db_printf("pa %llx pg %p\n", (unsigned long long)addr,
PHYS_TO_VM_PAGE(addr));
}
-#endif
+#endif /* _KERNEL */
#if defined(MULTIPROCESSOR)
@@ -456,8 +459,7 @@ const struct db_command db_machine_comma
#endif
{ DDB_END_CMD },
};
-#endif /* DDB */
-
+#endif /* DDB || _KMEMUSER */
/*
* support for SOFTWARE_SSTEP:
