From 34bf08cd05e2d7df1049c92a0b9c030553dbb183 Mon Sep 17 00:00:00 2001
From: bjh21 <bjh21@NetBSD.org>
Date: Tue, 23 Jan 2001 22:41:16 +0000
Subject: [PATCH] Use a permanent breakpoint to invoke DDB rather than
 constructing a trapframe manually.  Prevents the problem introduced in the
 trapframe unification whereby continuing from DDB would cause a panic.

---
 sys/arch/arm26/arm26/locore.S | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/sys/arch/arm26/arm26/locore.S b/sys/arch/arm26/arm26/locore.S
index c65974b8be2e..831682966d42 100644
--- a/sys/arch/arm26/arm26/locore.S
+++ b/sys/arch/arm26/arm26/locore.S
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.11 2001/01/22 22:10:43 bjh21 Exp $ */
+/* $NetBSD: locore.S,v 1.12 2001/01/23 22:41:16 bjh21 Exp $ */
 /*
  * Copyright (c) 1998, 1999, 2000 Ben Harris
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -42,6 +42,7 @@
 
 #include <sys/syscall.h>
 #include <arm/armreg.h>
+#include <arm/trap.h>
 #include "assym.h"
 
 #include "opt_cputypes.h"
@@ -433,14 +434,7 @@ ENTRY(longjmp)
 /* void cpu_Debugger(void); */
 ENTRY(cpu_Debugger)
 	stmfd	r13!, {r14}
-	sub	sp, sp, #(TF_SIZE - TF_R0)
-	str	r15, [sp, #(TF_R15 - TF_R0)]
-	stmfd	sp!, {r0-r14}		/* Save all SVC-mode regs */
-	sub	sp, sp, #TF_R0
-	mov	r1, sp
-	mov	r0, #0
-	bl	_C_LABEL(kdb_trap)
-	add	sp, sp, #TF_SIZE
+	.word	KERNEL_BREAKPOINT
 	ldmfd	r13!, {pc}^
 #endif
 
@@ -456,4 +450,4 @@ _C_LABEL(intrcnt):
 	.global	_C_LABEL(eintrcnt)
 _C_LABEL(eintrcnt):
 
-RCSID("$NetBSD: locore.S,v 1.11 2001/01/22 22:10:43 bjh21 Exp $")
+RCSID("$NetBSD: locore.S,v 1.12 2001/01/23 22:41:16 bjh21 Exp $")