Date: Sat, 23 Jun 2018 01:42:34 +0000 (UTC) From: Justin Hibbits <jhibbits@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335574 - head/sys/powerpc/aim Message-ID: <201806230142.w5N1gY4U042635@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806230142.w5N1gY4U042635>