Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve KGDB enabled build for news68k: 

* include sys/kgdb.h in news68k/trap.c for missing definitions.
* cast second kgdb_trap argument to (db_regs_t *).
* build m68k/kgdb_machdep.c for kgdb_trap() implementation.

Same as for mvme68k, build complains about undefined reference to zs_check_kgdb
due to missing port specific zs kgdb implementation for MI zs(4) driver though.
This commit is contained in:
andvar 2023-10-01 19:28:36 +00:00
parent 45b9d69bd5
commit 132b4e51b4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/arch/news68k/conf/files.news68k
View File

@ -1,4 +1,4 @@
# $NetBSD: files.news68k,v 1.35 2019/02/18 01:12:24 thorpej Exp $
# $NetBSD: files.news68k,v 1.36 2023/10/01 19:28:36 andvar Exp $
# NEWS68K-specific configuration info
@ -23,6 +23,7 @@ file arch/news68k/news68k/romcalls.S
file arch/news68k/news68k/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

7
sys/arch/news68k/news68k/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.74 2023/04/22 10:09:12 tsutsui Exp $ */
/* $NetBSD: trap.c,v 1.75 2023/10/01 19:28:36 andvar Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.74 2023/04/22 10:09:12 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.75 2023/10/01 19:28:36 andvar Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@ -54,6 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.74 2023/04/22 10:09:12 tsutsui Exp $");
#include <sys/syscall.h>
#include <sys/userret.h>
#include <sys/kauth.h>
#include <sys/kgdb.h>
#include <m68k/frame.h>
#include <m68k/cacheops.h>
@ -281,7 +282,7 @@ trap(struct frame *fp, int type, u_int code, u_int v)
s = splhigh();
#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