svn commit: r203712 - projects/ppc64/lib/libc/powerpc64/sys

[Nathan Whitehorn]

Author: nwhitehorn
Date: Tue Feb  9 18:34:42 2010
New Revision: 203712
URL: http://svn.freebsd.org/changeset/base/203712

Log:
  @toc has different semantics than @got

Modified:
  projects/ppc64/lib/libc/powerpc64/sys/brk.S
  projects/ppc64/lib/libc/powerpc64/sys/sbrk.S
  projects/ppc64/lib/libc/powerpc64/sys/setlogin.S

Modified: projects/ppc64/lib/libc/powerpc64/sys/brk.S
==============================================================================
--- projects/ppc64/lib/libc/powerpc64/sys/brk.S	Tue Feb  9 18:22:26 2010	(r203711)
+++ projects/ppc64/lib/libc/powerpc64/sys/brk.S	Tue Feb  9 18:34:42 2010	(r203712)
@@ -41,9 +41,8 @@ HIDENAME(minbrk):
         .text
 
 ENTRY(brk)
-	addis	%r5,%r2,HIDENAME(minbrk)@toc at ha
-	ld	%r5,HIDENAME(minbrk)@toc at l(%r5)
-	ld	%r6,0(%r5)
+	addis	%r6,%r2,HIDENAME(minbrk)@toc at ha
+	ld	%r6,HIDENAME(minbrk)@toc at l(%r6)
 	cmpld   %r6,%r3			/* if (minbrk <= r3) */
 	bgt     0f
 	mr	%r6,%r3			/* r6 = r3 */
@@ -55,8 +54,7 @@ ENTRY(brk)
 
 	/* record new break */
 	addis	%r7,%r2,HIDENAME(curbrk)@toc at ha
-	ld	%r7,HIDENAME(curbrk)@toc at l(%r7)
-	std	%r6,0(%r7)
+	std	%r6,HIDENAME(curbrk)@toc at l(%r7)
 
 	blr				/* return 0 */
 

Modified: projects/ppc64/lib/libc/powerpc64/sys/sbrk.S
==============================================================================
--- projects/ppc64/lib/libc/powerpc64/sys/sbrk.S	Tue Feb  9 18:22:26 2010	(r203711)
+++ projects/ppc64/lib/libc/powerpc64/sys/sbrk.S	Tue Feb  9 18:34:42 2010	(r203712)
@@ -40,7 +40,7 @@ HIDENAME(curbrk):
 	.text
 ENTRY(sbrk)
 	addis	%r5,%r2,HIDENAME(curbrk)@toc at ha
-	ld	%r5,HIDENAME(curbrk)@toc at l(%r5)
+	addi	%r5,%r5,HIDENAME(curbrk)@toc at l
 	ld	%r6,0(%r5)			/* r6 = old break */
 	cmpdi	%r3,0				/* sbrk(0) - return curbrk */
 	beq	1f

Modified: projects/ppc64/lib/libc/powerpc64/sys/setlogin.S
==============================================================================
--- projects/ppc64/lib/libc/powerpc64/sys/setlogin.S	Tue Feb  9 18:22:26 2010	(r203711)
+++ projects/ppc64/lib/libc/powerpc64/sys/setlogin.S	Tue Feb  9 18:34:42 2010	(r203712)
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 
 SYSCALL(setlogin)
 	addis	%r4,%r2,CNAME(_logname_valid)@toc at ha
-	ld	%r4,CNAME(_logname_valid)@toc at l(%r4)
-	li	%r5,%r0
-	std	%r5,0(%r4)
+	li	%r5,0
+	stw	%r5,CNAME(_logname_valid)@toc at l(%r4)
 	blr