xnu-1228.12.14.tar.gz

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

diff --git a/osfmk/ppc/commpage/mach_absolute_time.s b/osfmk/ppc/commpage/mach_absolute_time.s
index 865f91e9c2d6e7cf60357fbb1884b82b7bcc2c7d..be9345dadcc717681b010f6cbbbfae6c3e5d830d 100644 (file)
--- a/osfmk/ppc/commpage/mach_absolute_time.s
+++ b/osfmk/ppc/commpage/mach_absolute_time.s
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

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


@@ -20,10 +23,9 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 
  */
 

-#define        ASSEMBLER

 #include <sys/appleapiopts.h>
 #include <ppc/asm.h>                                   // EXT, LEXT
 #include <machine/cpu_capabilities.h>
 #include <sys/appleapiopts.h>
 #include <ppc/asm.h>                                   // EXT, LEXT
 #include <machine/cpu_capabilities.h>


@@ -31,8 +33,6 @@
 
         .text
         .align 2
 
         .text
         .align 2

-        .globl EXT(mach_absolute_time_32)
-        .globl EXT(mach_absolute_time_64)

 
 
 // *********************************************
 
 
 // *********************************************


@@ -48,21 +48,33 @@ mach_absolute_time_32:
         beqlr+
         b              1b
         
         beqlr+
         b              1b
         

-        COMMPAGE_DESCRIPTOR(mach_absolute_time_32,_COMM_PAGE_ABSOLUTE_TIME,0,k64Bit,0)
+       COMMPAGE_DESCRIPTOR(mach_absolute_time_32,_COMM_PAGE_ABSOLUTE_TIME,0,k64Bit,kCommPage32)

         
         
 // *********************************************
 // * M A C H _ A B S O L U T E _ T I M E _ 6 4 *
 // *********************************************
 //
         
         
 // *********************************************
 // * M A C H _ A B S O L U T E _ T I M E _ 6 4 *
 // *********************************************
 //

-// Why bother to special case for 64-bit?  Because the "mftb" variants
-// are 10 cycles each, and they are serialized. 
+// This is the version that is called in 32-bit mode, so we return the TBR in r3 and r4.

 
 mach_absolute_time_64:
         mftb   r4
         srdi   r3,r4,32
         blr
 
 
 mach_absolute_time_64:
         mftb   r4
         srdi   r3,r4,32
         blr
 

-        COMMPAGE_DESCRIPTOR(mach_absolute_time_64,_COMM_PAGE_ABSOLUTE_TIME,k64Bit,0,0)
+       COMMPAGE_DESCRIPTOR(mach_absolute_time_64,_COMM_PAGE_ABSOLUTE_TIME,k64Bit,0,kCommPage32)
+        
+        
+// *************************************************
+// * M A C H _ A B S O L U T E _ T I M E _ L P 6 4 *
+// *************************************************
+//
+// This is the version that is called in 64-bit mode, so we return the TBR in r3.
+
+mach_absolute_time_lp64:
+        mftb   r3
+        blr
+
+       COMMPAGE_DESCRIPTOR(mach_absolute_time_lp64,_COMM_PAGE_ABSOLUTE_TIME,k64Bit,0,kCommPage64)