Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / sysdeps / powerpc / powerpc32 / power6 / memset.S

diff --git a/sysdeps/powerpc/powerpc32/power6/memset.S b/sysdeps/powerpc/powerpc32/power6/memset.S
index 4b18fa79122a27749de1c80b2a2b9efd86cc7341..fa03846f2163fc03769ec4286509075c5da528d8 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power6/memset.S
+++ b/sysdeps/powerpc/powerpc32/power6/memset.S
@@ -1,5 +1,5 @@
 /* Optimized 32-bit memset implementation for POWER6.
-   Copyright (C) 1997-2014 Free Software Foundation, Inc.
+   Copyright (C) 1997-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -48,7 +48,7 @@ L(_memset):
        ble-    cr1, L(small)
 /* Align to word boundary.  */
        cmplwi  cr5, rLEN, 31
-       insrdi  rCHR, rCHR, 8, 48       /* Replicate byte to halfword.  */
+       insrwi  rCHR, rCHR, 8, 16       /* Replicate byte to halfword.  */
        beq+    L(aligned)
        mtcrf   0x01, rMEMP0
        subfic  rALIGN, rALIGN, 4
@@ -64,7 +64,7 @@ L(g0):
 /* Handle the case of size < 31.  */
 L(aligned):
        mtcrf   0x01, rLEN
-       insrdi  rCHR, rCHR, 16, 32      /* Replicate halfword to word.  */
+       insrwi  rCHR, rCHR, 16, 0       /* Replicate halfword to word.  */
        ble     cr5, L(medium)
 /* Align to 32-byte boundary.  */
        andi.   rALIGN, rMEMP, 0x1C
@@ -228,7 +228,7 @@ L(nzCacheAligned128):
        ori     r1,r1,0
         stw     rCHR,60(rMEMP3)
        blt     cr6,L(cacheAligned1)
-#ifndef NOT_IN_libc
+#if IS_IN (libc)
        lfd     0,-128(rMEMP)
 #endif
        b       L(nzCacheAligned256)
@@ -236,7 +236,7 @@ L(nzCacheAligned128):
 L(nzCacheAligned256):
        cmplwi  cr1,rLEN,256
        addi    rMEMP3,rMEMP,64
-#ifdef NOT_IN_libc
+#if !IS_IN (libc)
 /* When we are not in libc we should use only GPRs to avoid the FPU lock
    interrupt.  */
        stw     rCHR,0(rMEMP)