svn commit: r335574 - head/sys/powerpc/aim

Justin Hibbits jhibbits at FreeBSD.org
Sat Jun 23 01:42:35 UTC 2018


Author: jhibbits
Date: Sat Jun 23 01:42:34 2018
New Revision: 335574
URL: https://svnweb.freebsd.org/changeset/base/335574

Log:
  powerpc64: Fix stack setup in dbtrap
  
  r330610 relocated the DMAP from the base of memory to the base of the fourth
  quadrant of memory.  This broke synthetic traps, such as KDB forced
  breakpoints.  Use GET_TOCBASE() so the DMAP offset is handled.
  
  Submitted by:	git_bdragon.rkt0.net
  Differential Revision:	https://reviews.freebsd.org/D15973

Modified:
  head/sys/powerpc/aim/trap_subr64.S

Modified: head/sys/powerpc/aim/trap_subr64.S
==============================================================================
--- head/sys/powerpc/aim/trap_subr64.S	Sat Jun 23 00:48:45 2018	(r335573)
+++ head/sys/powerpc/aim/trap_subr64.S	Sat Jun 23 01:42:34 2018	(r335574)
@@ -896,7 +896,7 @@ dbtrap:
 	andi.	%r1,%r1,0xff00
 	mtsprg3	%r1
 
-	ld	%r1,TRAP_TOCBASE(0)		/* get new SP */
+	GET_TOCBASE(%r1)			/* get new SP */
 	ld	%r1,TOC_REF(tmpstk)(%r1)
 	addi	%r1,%r1,(TMPSTKSZ-48)
 


More information about the svn-src-all mailing list