Module Name: src
Committed By: andvar
Date: Sat Sep 30 21:00:43 UTC 2023
Modified Files:
src/sys/arch/mvme68k/conf: files.mvme68k
src/sys/arch/mvme68k/mvme68k: trap.c
Log Message:
Improve kgdb build for mvme68k:
* include sys/kgdb.h in mvme68k/trap.c for missing definitions.
* cast second kgdb_trap argument to (db_regs_t *).
* build m68k/kgdb_machdep.c in kgdb enable build for kgdb_trap() implementation.
KGDB build still fails, apparently due to missing zs_kgdb.c implementation.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/mvme68k/conf/files.mvme68k
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/mvme68k/mvme68k/trap.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/mvme68k/conf/files.mvme68k
diff -u src/sys/arch/mvme68k/conf/files.mvme68k:1.64 src/sys/arch/mvme68k/conf/files.mvme68k:1.65
--- src/sys/arch/mvme68k/conf/files.mvme68k:1.64 Mon Feb 18 01:12:23 2019
+++ src/sys/arch/mvme68k/conf/files.mvme68k Sat Sep 30 21:00:43 2023
@@ -1,4 +1,4 @@
-# $NetBSD: files.mvme68k,v 1.64 2019/02/18 01:12:23 thorpej Exp $
+# $NetBSD: files.mvme68k,v 1.65 2023/09/30 21:00:43 andvar Exp $
# config file for mvme68k
@@ -97,6 +97,7 @@ file arch/mvme68k/mvme68k/pmap_bootstrap
file arch/mvme68k/mvme68k/trap.c
file arch/m68k/m68k/cacheops.c
file arch/m68k/m68k/db_memrw.c ddb | kgdb
+file arch/m68k/m68k/kgdb_machdep.c kgdb
file arch/m68k/m68k/m68k_trap.c
file arch/m68k/m68k/pmap_motorola.c
file arch/m68k/m68k/procfs_machdep.c procfs
Index: src/sys/arch/mvme68k/mvme68k/trap.c
diff -u src/sys/arch/mvme68k/mvme68k/trap.c:1.112 src/sys/arch/mvme68k/mvme68k/trap.c:1.113
--- src/sys/arch/mvme68k/mvme68k/trap.c:1.112 Sat Sep 25 19:16:31 2021
+++ src/sys/arch/mvme68k/mvme68k/trap.c Sat Sep 30 21:00:43 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.112 2021/09/25 19:16:31 tsutsui Exp $ */
+/* $NetBSD: trap.c,v 1.113 2023/09/30 21:00:43 andvar Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.112 2021/09/25 19:16:31 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.113 2023/09/30 21:00:43 andvar Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -57,6 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.1
#include <sys/syslog.h>
#include <sys/userret.h>
#include <sys/kauth.h>
+#include <sys/kgdb.h>
#ifdef DEBUG
#include <dev/cons.h>
@@ -313,7 +314,7 @@ trap(struct frame *fp, int type, unsigne
(type & T_USER) ? "user" : "kernel", fp->f_pc);
#ifdef KGDB
/* If connected, step or cont returns 1 */
- if (kgdb_trap(type, fp))
+ if (kgdb_trap(type, (db_regs_t *)fp))
goto kgdb_cont;
#endif
#ifdef DDB
