xnu-1228.3.13.tar.gz

[apple/xnu.git] / osfmk / ppc / commpage / bcopy_g4.s

diff --git a/osfmk/ppc/commpage/bcopy_g4.s b/osfmk/ppc/commpage/bcopy_g4.s
index 9e0a5354534017ec3555bdd992680b9ef127fa94..0d901ab2072f0bb92b01941b9819d88219e891d9 100644 (file)
--- a/osfmk/ppc/commpage/bcopy_g4.s
+++ b/osfmk/ppc/commpage/bcopy_g4.s
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /* =======================================
  * BCOPY, MEMCPY, and MEMMOVE for Mac OS X
  */
 /* =======================================
  * BCOPY, MEMCPY, and MEMMOVE for Mac OS X


@@ -79,14 +85,12 @@
 #define        vx      v6
 #define        vy      v7
 
 #define        vx      v6
 #define        vy      v7
 

-#define        ASSEMBLER

 #include <sys/appleapiopts.h>
 #include <ppc/asm.h>
 #include <machine/cpu_capabilities.h>
 #include <machine/commpage.h>
 
         .text
 #include <sys/appleapiopts.h>
 #include <ppc/asm.h>
 #include <machine/cpu_capabilities.h>
 #include <machine/commpage.h>
 
         .text

-        .globl         EXT(bcopy_g4)

 
 #define        kMedium         32                              // too long for inline loopless code
 #define        kLong           96                              // long enough to justify use of Altivec
 
 #define        kMedium         32                              // too long for inline loopless code
 #define        kLong           96                              // long enough to justify use of Altivec


@@ -615,4 +619,4 @@ LReverseVecUnal:
         bne            cr6,LShortReverse16     // handle last 0-15 bytes iff any
         blr
 
         bne            cr6,LShortReverse16     // handle last 0-15 bytes iff any
         blr
 

-        COMMPAGE_DESCRIPTOR(bcopy_g4,_COMM_PAGE_BCOPY,kHasAltivec,k64Bit,kCommPageDCBA)
+       COMMPAGE_DESCRIPTOR(bcopy_g4,_COMM_PAGE_BCOPY,kHasAltivec,k64Bit,kCommPageDCBA+kCommPage32)