Module Name: src
Committed By: skrll
Date: Sat Oct 30 08:10:49 UTC 2021
Modified Files:
src/sys/arch/arm/arm: undefined.c
Log Message:
Use designated initialisers for static handlers and reduce the kernel size
a little.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/arm/arm/undefined.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/arm/arm/undefined.c
diff -u src/sys/arch/arm/arm/undefined.c:1.68 src/sys/arch/arm/arm/undefined.c:1.69
--- src/sys/arch/arm/arm/undefined.c:1.68 Tue Oct 26 06:34:02 2021
+++ src/sys/arch/arm/arm/undefined.c Sat Oct 30 08:10:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: undefined.c,v 1.68 2021/10/26 06:34:02 skrll Exp $ */
+/* $NetBSD: undefined.c,v 1.69 2021/10/30 08:10:48 skrll Exp $ */
/*
* Copyright (c) 2001 Ben Harris.
@@ -53,7 +53,7 @@
#include <sys/kgdb.h>
#endif
-__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.68 2021/10/26 06:34:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.69 2021/10/30 08:10:48 skrll Exp $");
#include <sys/kmem.h>
#include <sys/queue.h>
@@ -202,10 +202,16 @@ gdb_trapper(u_int addr, u_int insn, stru
return 1;
}
-static struct undefined_handler cp15_uh;
-static struct undefined_handler gdb_uh;
+static struct undefined_handler cp15_uh = {
+ .uh_handler = cp15_trapper,
+};
+static struct undefined_handler gdb_uh = {
+ .uh_handler = gdb_trapper,
+};
#ifdef THUMB_CODE
-static struct undefined_handler gdb_uh_thumb;
+static struct undefined_handler gdb_uh_thumb = {
+ .uh_handler = gdb_trapper,
+};
#endif
#ifdef KDTRACE_HOOKS
@@ -249,14 +255,11 @@ undefined_init(void)
LIST_INIT(&undefined_handlers[loop]);
/* Install handler for CP15 emulation */
- cp15_uh.uh_handler = cp15_trapper;
install_coproc_handler_static(SYSTEM_COPROC, &cp15_uh);
/* Install handler for GDB breakpoints */
- gdb_uh.uh_handler = gdb_trapper;
install_coproc_handler_static(CORE_UNKNOWN_HANDLER, &gdb_uh);
#ifdef THUMB_CODE
- gdb_uh_thumb.uh_handler = gdb_trapper;
install_coproc_handler_static(THUMB_UNKNOWN_HANDLER, &gdb_uh_thumb);
#endif
}
