From owner-svn-src-head@FreeBSD.ORG Wed Apr 8 00:32:40 2015 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C018A520; Wed, 8 Apr 2015 00:32:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AAA766BA; Wed, 8 Apr 2015 00:32:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t380Wed4054479; Wed, 8 Apr 2015 00:32:40 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t380WdLq054472; Wed, 8 Apr 2015 00:32:39 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201504080032.t380WdLq054472@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Wed, 8 Apr 2015 00:32:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281243 - head/lib/libc/powerpc/gen X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Apr 2015 00:32:40 -0000 Author: jhibbits Date: Wed Apr 8 00:32:39 2015 New Revision: 281243 URL: https://svnweb.freebsd.org/changeset/base/281243 Log: Fix powerpc setjmp FPR saving/restoring. X-MFC-With: r279784 Modified: head/lib/libc/powerpc/gen/_setjmp.S head/lib/libc/powerpc/gen/setjmp.S head/lib/libc/powerpc/gen/sigsetjmp.S Modified: head/lib/libc/powerpc/gen/_setjmp.S ============================================================================== --- head/lib/libc/powerpc/gen/_setjmp.S Wed Apr 8 00:31:33 2015 (r281242) +++ head/lib/libc/powerpc/gen/_setjmp.S Wed Apr 8 00:32:39 2015 (r281243) @@ -58,24 +58,24 @@ ENTRY(_setjmp) stmw %r9,20(%r3) /* FPRs */ - stfd %f14,92+0*8(%r3) - stfd %f15,92+1*8(%r3) - stfd %f16,92+2*8(%r3) - stfd %f17,92+3*8(%r3) - stfd %f18,92+4*8(%r3) - stfd %f19,92+5*8(%r3) - stfd %f20,92+6*8(%r3) - stfd %f21,92+7*8(%r3) - stfd %f22,92+8*8(%r3) - stfd %f23,92+9*8(%r3) - stfd %f24,92+10*8(%r3) - stfd %f25,92+11*8(%r3) - stfd %f26,92+12*8(%r3) - stfd %f27,92+13*8(%r3) - stfd %f28,93+13*8(%r3) - stfd %f29,93+14*8(%r3) - stfd %f30,93+15*8(%r3) - stfd %f31,93+16*8(%r3) + stfd %f14,112+0*8(%r3) + stfd %f15,112+1*8(%r3) + stfd %f16,112+2*8(%r3) + stfd %f17,112+3*8(%r3) + stfd %f18,112+4*8(%r3) + stfd %f19,112+5*8(%r3) + stfd %f20,112+6*8(%r3) + stfd %f21,112+7*8(%r3) + stfd %f22,112+8*8(%r3) + stfd %f23,112+9*8(%r3) + stfd %f24,112+10*8(%r3) + stfd %f25,112+11*8(%r3) + stfd %f26,112+12*8(%r3) + stfd %f27,112+13*8(%r3) + stfd %f28,112+14*8(%r3) + stfd %f29,112+15*8(%r3) + stfd %f30,112+16*8(%r3) + stfd %f31,112+17*8(%r3) li %r3,0 blr @@ -85,24 +85,24 @@ ENTRY(_longjmp) lmw %r9,20(%r3) /* FPRs */ - lfd %f14,92+0*8(%r3) - lfd %f15,92+1*8(%r3) - lfd %f16,92+2*8(%r3) - lfd %f17,92+3*8(%r3) - lfd %f18,92+4*8(%r3) - lfd %f19,92+5*8(%r3) - lfd %f20,92+6*8(%r3) - lfd %f21,92+7*8(%r3) - lfd %f22,92+8*8(%r3) - lfd %f23,92+9*8(%r3) - lfd %f24,92+10*8(%r3) - lfd %f25,92+11*8(%r3) - lfd %f26,92+12*8(%r3) - lfd %f27,92+13*8(%r3) - lfd %f28,93+13*8(%r3) - lfd %f29,93+14*8(%r3) - lfd %f30,93+15*8(%r3) - lfd %f31,93+16*8(%r3) + lfd %f14,112+0*8(%r3) + lfd %f15,112+1*8(%r3) + lfd %f16,112+2*8(%r3) + lfd %f17,112+3*8(%r3) + lfd %f18,112+4*8(%r3) + lfd %f19,112+5*8(%r3) + lfd %f20,112+6*8(%r3) + lfd %f21,112+7*8(%r3) + lfd %f22,112+8*8(%r3) + lfd %f23,112+9*8(%r3) + lfd %f24,112+10*8(%r3) + lfd %f25,112+11*8(%r3) + lfd %f26,112+12*8(%r3) + lfd %f27,112+13*8(%r3) + lfd %f28,112+14*8(%r3) + lfd %f29,112+15*8(%r3) + lfd %f30,112+16*8(%r3) + lfd %f31,112+17*8(%r3) mtlr %r11 mtcr %r12 Modified: head/lib/libc/powerpc/gen/setjmp.S ============================================================================== --- head/lib/libc/powerpc/gen/setjmp.S Wed Apr 8 00:31:33 2015 (r281242) +++ head/lib/libc/powerpc/gen/setjmp.S Wed Apr 8 00:32:39 2015 (r281243) @@ -68,24 +68,24 @@ ENTRY(setjmp) stmw %r9,20(%r6) /* FPRs */ - stfd %f14,92+0*8(%r6) - stfd %f15,92+1*8(%r6) - stfd %f16,92+2*8(%r6) - stfd %f17,92+3*8(%r6) - stfd %f18,92+4*8(%r6) - stfd %f19,92+5*8(%r6) - stfd %f20,92+6*8(%r6) - stfd %f21,92+7*8(%r6) - stfd %f22,92+8*8(%r6) - stfd %f23,92+9*8(%r6) - stfd %f24,92+10*8(%r6) - stfd %f25,92+11*8(%r6) - stfd %f26,92+12*8(%r6) - stfd %f27,92+13*8(%r6) - stfd %f28,93+13*8(%r6) - stfd %f29,93+14*8(%r6) - stfd %f30,93+15*8(%r6) - stfd %f31,93+16*8(%r6) + stfd %f14,112+0*8(%r6) + stfd %f15,112+1*8(%r6) + stfd %f16,112+2*8(%r6) + stfd %f17,112+3*8(%r6) + stfd %f18,112+4*8(%r6) + stfd %f19,112+5*8(%r6) + stfd %f20,112+6*8(%r6) + stfd %f21,112+7*8(%r6) + stfd %f22,112+8*8(%r6) + stfd %f23,112+9*8(%r6) + stfd %f24,112+10*8(%r6) + stfd %f25,112+11*8(%r6) + stfd %f26,112+12*8(%r6) + stfd %f27,112+13*8(%r6) + stfd %f28,112+14*8(%r6) + stfd %f29,112+15*8(%r6) + stfd %f30,112+16*8(%r6) + stfd %f31,112+17*8(%r6) li %r3,0 /* return (0) */ blr @@ -96,24 +96,24 @@ ENTRY(__longjmp) lmw %r9,20(%r3) /* restore regs */ /* FPRs */ - lfd %f14,92+0*8(%r3) - lfd %f15,92+1*8(%r3) - lfd %f16,92+2*8(%r3) - lfd %f17,92+3*8(%r3) - lfd %f18,92+4*8(%r3) - lfd %f19,92+5*8(%r3) - lfd %f20,92+6*8(%r3) - lfd %f21,92+7*8(%r3) - lfd %f22,92+8*8(%r3) - lfd %f23,92+9*8(%r3) - lfd %f24,92+10*8(%r3) - lfd %f25,92+11*8(%r3) - lfd %f26,92+12*8(%r3) - lfd %f27,92+13*8(%r3) - lfd %f28,93+13*8(%r3) - lfd %f29,93+14*8(%r3) - lfd %f30,93+15*8(%r3) - lfd %f31,93+16*8(%r3) + lfd %f14,112+0*8(%r3) + lfd %f15,112+1*8(%r3) + lfd %f16,112+2*8(%r3) + lfd %f17,112+3*8(%r3) + lfd %f18,112+4*8(%r3) + lfd %f19,112+5*8(%r3) + lfd %f20,112+6*8(%r3) + lfd %f21,112+7*8(%r3) + lfd %f22,112+8*8(%r3) + lfd %f23,112+9*8(%r3) + lfd %f24,112+10*8(%r3) + lfd %f25,112+11*8(%r3) + lfd %f26,112+12*8(%r3) + lfd %f27,112+13*8(%r3) + lfd %f28,112+14*8(%r3) + lfd %f29,112+15*8(%r3) + lfd %f30,112+16*8(%r3) + lfd %f31,112+17*8(%r3) mr %r6,%r4 /* save val param */ mtlr %r11 /* r11 -> link reg */ Modified: head/lib/libc/powerpc/gen/sigsetjmp.S ============================================================================== --- head/lib/libc/powerpc/gen/sigsetjmp.S Wed Apr 8 00:31:33 2015 (r281242) +++ head/lib/libc/powerpc/gen/sigsetjmp.S Wed Apr 8 00:32:39 2015 (r281243) @@ -73,24 +73,24 @@ ENTRY(sigsetjmp) stmw %r9,20(%r6) /* FPRs */ - stfd %f14,92+0*8(%r6) - stfd %f15,92+1*8(%r6) - stfd %f16,92+2*8(%r6) - stfd %f17,92+3*8(%r6) - stfd %f18,92+4*8(%r6) - stfd %f19,92+5*8(%r6) - stfd %f20,92+6*8(%r6) - stfd %f21,92+7*8(%r6) - stfd %f22,92+8*8(%r6) - stfd %f23,92+9*8(%r6) - stfd %f24,92+10*8(%r6) - stfd %f25,92+11*8(%r6) - stfd %f26,92+12*8(%r6) - stfd %f27,92+13*8(%r6) - stfd %f28,93+13*8(%r6) - stfd %f29,93+14*8(%r6) - stfd %f30,93+15*8(%r6) - stfd %f31,93+16*8(%r6) + stfd %f14,112+0*8(%r6) + stfd %f15,112+1*8(%r6) + stfd %f16,112+2*8(%r6) + stfd %f17,112+3*8(%r6) + stfd %f18,112+4*8(%r6) + stfd %f19,112+5*8(%r6) + stfd %f20,112+6*8(%r6) + stfd %f21,112+7*8(%r6) + stfd %f22,112+8*8(%r6) + stfd %f23,112+9*8(%r6) + stfd %f24,112+10*8(%r6) + stfd %f25,112+11*8(%r6) + stfd %f26,112+12*8(%r6) + stfd %f27,112+13*8(%r6) + stfd %f28,112+14*8(%r6) + stfd %f29,112+15*8(%r6) + stfd %f30,112+16*8(%r6) + stfd %f31,112+17*8(%r6) li %r3,0 blr @@ -100,24 +100,24 @@ ENTRY(siglongjmp) lmw %r9,20(%r3) /* FPRs */ - lfd %f14,92+0*8(%r3) - lfd %f15,92+1*8(%r3) - lfd %f16,92+2*8(%r3) - lfd %f17,92+3*8(%r3) - lfd %f18,92+4*8(%r3) - lfd %f19,92+5*8(%r3) - lfd %f20,92+6*8(%r3) - lfd %f21,92+7*8(%r3) - lfd %f22,92+8*8(%r3) - lfd %f23,92+9*8(%r3) - lfd %f24,92+10*8(%r3) - lfd %f25,92+11*8(%r3) - lfd %f26,92+12*8(%r3) - lfd %f27,92+13*8(%r3) - lfd %f28,93+13*8(%r3) - lfd %f29,93+14*8(%r3) - lfd %f30,93+15*8(%r3) - lfd %f31,93+16*8(%r3) + lfd %f14,112+0*8(%r3) + lfd %f15,112+1*8(%r3) + lfd %f16,112+2*8(%r3) + lfd %f17,112+3*8(%r3) + lfd %f18,112+4*8(%r3) + lfd %f19,112+5*8(%r3) + lfd %f20,112+6*8(%r3) + lfd %f21,112+7*8(%r3) + lfd %f22,112+8*8(%r3) + lfd %f23,112+9*8(%r3) + lfd %f24,112+10*8(%r3) + lfd %f25,112+11*8(%r3) + lfd %f26,112+12*8(%r3) + lfd %f27,112+13*8(%r3) + lfd %f28,112+14*8(%r3) + lfd %f29,112+15*8(%r3) + lfd %f30,112+16*8(%r3) + lfd %f31,112+17*8(%r3) lwz %r7,0(%r3) mr %r6,%r4