Module Name: src
Committed By: ryo
Date: Mon Sep 19 17:23:14 UTC 2022
Modified Files:
src/sys/arch/aarch64/aarch64: cpuswitch.S db_interface.c
Log Message:
Move cpu_Debugger() into a more suitable file, from cpuswitch.S to
db_interface.c.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/aarch64/aarch64/cpuswitch.S
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/aarch64/aarch64/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/aarch64/aarch64/cpuswitch.S
diff -u src/sys/arch/aarch64/aarch64/cpuswitch.S:1.38 src/sys/arch/aarch64/aarch64/cpuswitch.S:1.39
--- src/sys/arch/aarch64/aarch64/cpuswitch.S:1.38 Tue Jun 7 08:08:31 2022
+++ src/sys/arch/aarch64/aarch64/cpuswitch.S Mon Sep 19 17:23:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.38 2022/06/07 08:08:31 ryo Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.39 2022/09/19 17:23:14 ryo Exp $ */
/*-
* Copyright (c) 2014, 2020 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include "opt_ddb.h"
#include "opt_kasan.h"
-RCSID("$NetBSD: cpuswitch.S,v 1.38 2022/06/07 08:08:31 ryo Exp $")
+RCSID("$NetBSD: cpuswitch.S,v 1.39 2022/09/19 17:23:14 ryo Exp $")
ARMV8_DEFINE_OPTIONS
@@ -334,16 +334,6 @@ ENTRY_NP(lwp_trampoline)
END(lwp_trampoline)
-#ifdef DDB
-ENTRY_NP(cpu_Debugger)
- stp fp, lr, [sp, #-16]!
- mov fp, sp
- brk #0xffff
- ldp fp, lr, [sp], #16
- ret
-END(cpu_Debugger)
-#endif /* DDB */
-
/*
* int cpu_set_onfault(struct faultbuf *fb)
*/
Index: src/sys/arch/aarch64/aarch64/db_interface.c
diff -u src/sys/arch/aarch64/aarch64/db_interface.c:1.18 src/sys/arch/aarch64/aarch64/db_interface.c:1.19
--- src/sys/arch/aarch64/aarch64/db_interface.c:1.18 Sun May 29 16:39:22 2022
+++ src/sys/arch/aarch64/aarch64/db_interface.c Mon Sep 19 17:23:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.18 2022/05/29 16:39:22 ryo Exp $ */
+/* $NetBSD: db_interface.c,v 1.19 2022/09/19 17:23:14 ryo Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.18 2022/05/29 16:39:22 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.19 2022/09/19 17:23:14 ryo Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -639,3 +639,9 @@ db_ttbrdump(bool countmode, vaddr_t va,
db_dump_l0table(countmode, pmap_l0table(pm),
(pm == pmap_kernel()) ? 0xffff000000000000UL : 0, pr);
}
+
+void
+cpu_Debugger(void)
+{
+ __asm __volatile ("brk #0xffff");
+}
