Page MenuHomeFreeBSD

D14484.diff
No OneTemporary

D14484.diff

Index: head/sys/powerpc/aim/locore32.S
===================================================================
--- head/sys/powerpc/aim/locore32.S
+++ head/sys/powerpc/aim/locore32.S
@@ -60,6 +60,12 @@
GLOBAL(tmpstk)
.space TMPSTKSZ
+#ifdef KDB
+#define TRAPSTKSZ 4096 /* 4k trap stack */
+GLOBAL(trapstk)
+ .space TRAPSTKSZ
+#endif
+
.text
.globl btext
btext:
Index: head/sys/powerpc/aim/locore64.S
===================================================================
--- head/sys/powerpc/aim/locore64.S
+++ head/sys/powerpc/aim/locore64.S
@@ -65,6 +65,14 @@
TOC_ENTRY(tmpstk)
TOC_ENTRY(can_wakeup)
+#ifdef KDB
+#define TRAPSTKSZ 4096 /* 4k trap stack */
+GLOBAL(trapstk)
+ .space TRAPSTKSZ
+TOC_ENTRY(trapstk)
+#endif
+
+
/*
* Entry point for bootloaders that do not fully implement ELF and start
* at the beginning of the image (kexec, notably). In its own section so
Index: head/sys/powerpc/aim/trap_subr32.S
===================================================================
--- head/sys/powerpc/aim/trap_subr32.S
+++ head/sys/powerpc/aim/trap_subr32.S
@@ -864,8 +864,8 @@
mtsprg3 %r1
lwz %r1,TRAP_TOCBASE(0) /* get new SP */
- lwz %r1,tmpstk@got(%r1)
- addi %r1,%r1,TMPSTKSZ-16
+ lwz %r1,trapstk@got(%r1)
+ addi %r1,%r1,TRAPSTKSZ-16
FRAME_SETUP(PC_DBSAVE)
/* Call C trap code: */
Index: head/sys/powerpc/aim/trap_subr64.S
===================================================================
--- head/sys/powerpc/aim/trap_subr64.S
+++ head/sys/powerpc/aim/trap_subr64.S
@@ -897,8 +897,8 @@
mtsprg3 %r1
GET_TOCBASE(%r1) /* get new SP */
- ld %r1,TOC_REF(tmpstk)(%r1)
- addi %r1,%r1,(TMPSTKSZ-48)
+ ld %r1,TOC_REF(trapstk)(%r1)
+ addi %r1,%r1,(TRAPSTKSZ-48)
FRAME_SETUP(PC_DBSAVE)
/* Call C trap code: */

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 10, 5:52 AM (4 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16572015
Default Alt Text
D14484.diff (1 KB)

Event Timeline