xnu-3789.70.16.tar.gz

[apple/xnu.git] / osfmk / i386 / cpu_capabilities.h

diff --git a/osfmk/i386/cpu_capabilities.h b/osfmk/i386/cpu_capabilities.h
index c7e22b1e35997b45652781e2623f1ed3a30c0710..0f1b7dadde186b2c515417da97ca46762f85ebac 100644 (file)
--- a/osfmk/i386/cpu_capabilities.h
+++ b/osfmk/i386/cpu_capabilities.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2003-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003-2009 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -48,30 +48,55 @@
 #define        kCache64                        0x00000020
 #define        kCache128                       0x00000040
 #define        kFastThreadLocalStorage         0x00000080      /* TLS ptr is kept in a user-mode-readable register */
 #define        kCache64                        0x00000020
 #define        kCache128                       0x00000040
 #define        kFastThreadLocalStorage         0x00000080      /* TLS ptr is kept in a user-mode-readable register */

-#define kHasSupplementalSSE3   0x00000100
-#define kHasMNI                                kHasSupplementalSSE3
+#define kHasSupplementalSSE3           0x00000100

 #define        k64Bit                          0x00000200      /* processor supports EM64T (not what mode you're running in) */
 #define        k64Bit                          0x00000200      /* processor supports EM64T (not what mode you're running in) */

-
+#define        kHasSSE4_1                      0x00000400
+#define        kHasSSE4_2                      0x00000800
+#define        kHasAES                         0x00001000
+#define        kInOrderPipeline                0x00002000
+#define        kSlow                           0x00004000      /* tsc < nanosecond */

 #define        kUP                             0x00008000      /* set if (kNumCPUs == 1) */
 #define        kNumCPUs                        0x00FF0000      /* number of CPUs (see _NumCPUs() below) */
 #define        kUP                             0x00008000      /* set if (kNumCPUs == 1) */
 #define        kNumCPUs                        0x00FF0000      /* number of CPUs (see _NumCPUs() below) */

+#define        kNumCPUsShift                   16
+#define        kHasAVX1_0                      0x01000000
+#define        kHasRDRAND                      0x02000000
+#define        kHasF16C                        0x04000000
+#define        kHasENFSTRG                     0x08000000
+#define        kHasFMA                         0x10000000
+#define        kHasAVX2_0                      0x20000000
+#define        kHasBMI1                        0x40000000
+#define        kHasBMI2                        0x80000000
+/* Extending into 64-bits from here: */ 
+#define        kHasRTM                 0x0000000100000000ULL
+#define        kHasHLE                 0x0000000200000000ULL
+#define        kHasRDSEED              0x0000000800000000ULL
+#define        kHasADX                 0x0000000400000000ULL
+#define        kHasMPX                 0x0000001000000000ULL
+#define        kHasSGX                 0x0000002000000000ULL

 
 

-#define        kNumCPUsShift                   16              /* see _NumCPUs() below */

 
 #ifndef        __ASSEMBLER__
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
 
 #ifndef        __ASSEMBLER__
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS

-extern int  _get_cpu_capabilities( void );
+extern uint64_t  _get_cpu_capabilities( void );

 __END_DECLS
 
 __END_DECLS
 

-inline static
+__inline static

 int _NumCPUs( void )
 {
 int _NumCPUs( void )
 {

-       return (_get_cpu_capabilities() & kNumCPUs) >> kNumCPUsShift;
+       return (int) (_get_cpu_capabilities() & kNumCPUs) >> kNumCPUsShift;

 }
 
 #endif /* __ASSEMBLER__ */
 
 }
 
 #endif /* __ASSEMBLER__ */
 

+/* The following macro is used to generate the 64-bit commpage address for a given
+ * routine, based on its 32-bit address.  This is used in the kernel to compile
+ * the 64-bit commpage.  Since the kernel can be a 32-bit object, cpu_capabilities.h
+ * only defines the 32-bit address.
+ */
+#define        _COMM_PAGE_32_TO_64( ADDRESS )  ( ADDRESS + _COMM_PAGE64_START_ADDRESS - _COMM_PAGE32_START_ADDRESS )
+

 
 /*
  * The shared kernel/user "comm page(s)":
 
 /*
  * The shared kernel/user "comm page(s)":


@@ -83,16 +108,37 @@ int _NumCPUs( void )
  * Because Mach VM cannot map the last page of an address space, we don't use it.
  */
  
  * Because Mach VM cannot map the last page of an address space, we don't use it.
  */
  

-#define        _COMM_PAGE32_AREA_LENGTH        ( 19 * 4096 )                           /* reserved length of entire comm area */
-#define _COMM_PAGE32_BASE_ADDRESS      ( -20 * 4096 )                          /* base address of allocated memory */
-#define _COMM_PAGE32_START_ADDRESS     ( -16 * 4096 )                          /* address traditional commpage code starts on */
-#define _COMM_PAGE32_AREA_USED         ( 19 * 4096 )                           /* this is the amt actually allocated */
+#define        _COMM_PAGE32_AREA_LENGTH        ( 1 * 4096 )                            /* reserved length of entire comm area */
+#define _COMM_PAGE32_BASE_ADDRESS      ( 0xffff0000 )                          /* base address of allocated memory */
+#define _COMM_PAGE32_START_ADDRESS     ( _COMM_PAGE32_BASE_ADDRESS )   /* address traditional commpage code starts on */
+#define _COMM_PAGE32_AREA_USED         ( 1 * 4096 )                            /* this is the amt actually allocated */
+#define _COMM_PAGE32_SIGS_OFFSET       0x8000                                      /* offset to routine signatures */
+
+#define        _COMM_PAGE64_AREA_LENGTH        ( 1 * 4096 )                    /* reserved length of entire comm area (2MB) */
+#ifdef __ASSEMBLER__
+#define _COMM_PAGE64_BASE_ADDRESS      ( 0x00007fffffe00000 )   /* base address of allocated memory */
+#else /* __ASSEMBLER__ */
+#define _COMM_PAGE64_BASE_ADDRESS      ( 0x00007fffffe00000ULL )   /* base address of allocated memory */
+#endif /* __ASSEMBLER__ */
+#define _COMM_PAGE64_START_ADDRESS     ( _COMM_PAGE64_BASE_ADDRESS )   /* address traditional commpage code starts on */
+#define _COMM_PAGE64_AREA_USED         ( 1 * 4096 )                            /* this is the amt actually populated */

 
 

-#define        _COMM_PAGE64_AREA_LENGTH        ( 2 * 1024 * 1024 )                     /* reserved length of entire comm area (2MB) */
-#define _COMM_PAGE64_BASE_ADDRESS      ( 0x00007fffffe00000ULL )               /* base address of allocated memory */
-#define _COMM_PAGE64_START_ADDRESS     ( _COMM_PAGE64_BASE_ADDRESS )           /* address traditional commpage code starts on */
-#define _COMM_PAGE64_AREA_USED         ( 2 * 4096 )                            /* this is the amt actually populated */
+/* no need for an Objective-C area on Intel */
+#define _COMM_PAGE32_OBJC_SIZE         0ULL
+#define _COMM_PAGE32_OBJC_BASE         0ULL
+#define _COMM_PAGE64_OBJC_SIZE         0ULL
+#define _COMM_PAGE64_OBJC_BASE         0ULL

 
 

+#ifdef KERNEL_PRIVATE
+
+/* Inside the kernel, comm page addresses are absolute addresses
+ * assuming they are a part of the 32-bit commpage. They may
+ * be mapped somewhere else, especially for the 64-bit commpage.
+ */
+#define _COMM_PAGE_START_ADDRESS       _COMM_PAGE32_START_ADDRESS
+#define _COMM_PAGE_SIGS_OFFSET         _COMM_PAGE32_SIGS_OFFSET
+
+#else /* !KERNEL_PRIVATE */

 
 #if defined(__i386__)
 
 
 #if defined(__i386__)
 


@@ -100,7 +146,7 @@ int _NumCPUs( void )
 #define _COMM_PAGE_BASE_ADDRESS                _COMM_PAGE32_BASE_ADDRESS
 #define _COMM_PAGE_START_ADDRESS       _COMM_PAGE32_START_ADDRESS
 #define _COMM_PAGE_AREA_USED           _COMM_PAGE32_AREA_USED
 #define _COMM_PAGE_BASE_ADDRESS                _COMM_PAGE32_BASE_ADDRESS
 #define _COMM_PAGE_START_ADDRESS       _COMM_PAGE32_START_ADDRESS
 #define _COMM_PAGE_AREA_USED           _COMM_PAGE32_AREA_USED

-#define _COMM_PAGE_SIGS_OFFSET         0x8000                                  /* offset to routine signatures */
+#define _COMM_PAGE_SIGS_OFFSET         _COMM_PAGE32_SIGS_OFFSET

 
 #elif defined(__x86_64__)
 
 
 #elif defined(__x86_64__)
 


@@ -113,85 +159,108 @@ int _NumCPUs( void )
 #error architecture not supported
 #endif
  
 #error architecture not supported
 #endif
  

+#endif /* !KERNEL_PRIVATE */
+

 /* data in the comm page */
  
 /* data in the comm page */
  

-#define _COMM_PAGE_SIGNATURE           (_COMM_PAGE_START_ADDRESS+0x000)        /* first few bytes are a signature */
+#define _COMM_PAGE_SIGNATURE           (_COMM_PAGE_START_ADDRESS+0x000)        /* first 16 bytes are a signature */
+#define _COMM_PAGE_SIGNATURELEN                (0x10)
+#define _COMM_PAGE_CPU_CAPABILITIES64  (_COMM_PAGE_START_ADDRESS+0x010)        /* uint64_t _cpu_capabilities */
+#define _COMM_PAGE_UNUSED              (_COMM_PAGE_START_ADDRESS+0x018)        /* 6 unused bytes */

 #define _COMM_PAGE_VERSION             (_COMM_PAGE_START_ADDRESS+0x01E)        /* 16-bit version# */
 #define _COMM_PAGE_VERSION             (_COMM_PAGE_START_ADDRESS+0x01E)        /* 16-bit version# */

-#define        _COMM_PAGE_THIS_VERSION         6                                       /* version of the commarea format */
+#define _COMM_PAGE_THIS_VERSION                13                                      /* in ver 13, _COMM_PAGE_NT_SHIFT defaults to 0 (was 32) */

   
   

-#define _COMM_PAGE_CPU_CAPABILITIES    (_COMM_PAGE_START_ADDRESS+0x020)        /* uint32_t _cpu_capabilities */
-#define _COMM_PAGE_NCPUS               (_COMM_PAGE_START_ADDRESS+0x022)        /* uint8_t number of configured CPUs */
+#define _COMM_PAGE_CPU_CAPABILITIES    (_COMM_PAGE_START_ADDRESS+0x020)        /* uint32_t _cpu_capabilities (retained for compatibility) */
+#define _COMM_PAGE_NCPUS               (_COMM_PAGE_START_ADDRESS+0x022)        /* uint8_t number of configured CPUs (hw.logicalcpu at boot time) */
+#define _COMM_PAGE_UNUSED0             (_COMM_PAGE_START_ADDRESS+0x024)        /* 2 unused bytes, previouly reserved for expansion of cpu_capabilities */

 #define _COMM_PAGE_CACHE_LINESIZE      (_COMM_PAGE_START_ADDRESS+0x026)        /* uint16_t cache line size */
 
 #define _COMM_PAGE_CACHE_LINESIZE      (_COMM_PAGE_START_ADDRESS+0x026)        /* uint16_t cache line size */
 

-#define _COMM_PAGE_UNUSED1             (_COMM_PAGE_START_ADDRESS+0x028)        /* 24 unused bytes */
- 
-#if defined(__i386__)                                                          /* following are not defined in 64-bit */
-#define _COMM_PAGE_2_TO_52             (_COMM_PAGE_START_ADDRESS+0x040)        /* double float constant 2**52 */
-#define _COMM_PAGE_10_TO_6             (_COMM_PAGE_START_ADDRESS+0x048)        /* double float constant 10**6 */
-#else
-#define _COMM_PAGE_UNUSED2             (_COMM_PAGE_START_ADDRESS+0x040)        /* 16 unused bytes */
-#endif
+#define _COMM_PAGE_SCHED_GEN           (_COMM_PAGE_START_ADDRESS+0x028)        /* uint32_t scheduler generation number (count of pre-emptions) */
+#define _COMM_PAGE_MEMORY_PRESSURE     (_COMM_PAGE_START_ADDRESS+0x02c)        /* uint32_t copy of vm_memory_pressure */
+#define        _COMM_PAGE_SPIN_COUNT           (_COMM_PAGE_START_ADDRESS+0x030)        /* uint32_t max spin count for mutex's */
+
+#define _COMM_PAGE_ACTIVE_CPUS         (_COMM_PAGE_START_ADDRESS+0x034)        /* uint8_t number of active CPUs (hw.activecpu) */
+#define _COMM_PAGE_PHYSICAL_CPUS       (_COMM_PAGE_START_ADDRESS+0x035)        /* uint8_t number of physical CPUs (hw.physicalcpu_max) */
+#define _COMM_PAGE_LOGICAL_CPUS        (_COMM_PAGE_START_ADDRESS+0x036)        /* uint8_t number of logical CPUs (hw.logicalcpu_max) */
+#define _COMM_PAGE_UNUSED1             (_COMM_PAGE_START_ADDRESS+0x037)        /* 1 unused bytes */
+#define _COMM_PAGE_MEMORY_SIZE         (_COMM_PAGE_START_ADDRESS+0x038)        /* uint64_t max memory size */

 
 

+#define _COMM_PAGE_CPUFAMILY           (_COMM_PAGE_START_ADDRESS+0x040)        /* uint32_t hw.cpufamily, x86*/
+#define _COMM_PAGE_KDEBUG_ENABLE       (_COMM_PAGE_START_ADDRESS+0x044)        /* uint32_t export "kdebug_enable" to userspace */
+#define        _COMM_PAGE_ATM_DIAGNOSTIC_CONFIG        (_COMM_PAGE_START_ADDRESS+0x48) /* uint32_t export "atm_diagnostic_config" to userspace */
+
+#define _COMM_PAGE_UNUSED2             (_COMM_PAGE_START_ADDRESS+0x04C)        /* [0x4C,0x50) unused */
+
+#define        _COMM_PAGE_TIME_DATA_START      (_COMM_PAGE_START_ADDRESS+0x050)        /* base of offsets below (_NT_SCALE etc) */

 #define _COMM_PAGE_NT_TSC_BASE         (_COMM_PAGE_START_ADDRESS+0x050)        /* used by nanotime() */
 #define _COMM_PAGE_NT_SCALE            (_COMM_PAGE_START_ADDRESS+0x058)        /* used by nanotime() */
 #define _COMM_PAGE_NT_SHIFT            (_COMM_PAGE_START_ADDRESS+0x05c)        /* used by nanotime() */
 #define _COMM_PAGE_NT_NS_BASE          (_COMM_PAGE_START_ADDRESS+0x060)        /* used by nanotime() */
 #define _COMM_PAGE_NT_TSC_BASE         (_COMM_PAGE_START_ADDRESS+0x050)        /* used by nanotime() */
 #define _COMM_PAGE_NT_SCALE            (_COMM_PAGE_START_ADDRESS+0x058)        /* used by nanotime() */
 #define _COMM_PAGE_NT_SHIFT            (_COMM_PAGE_START_ADDRESS+0x05c)        /* used by nanotime() */
 #define _COMM_PAGE_NT_NS_BASE          (_COMM_PAGE_START_ADDRESS+0x060)        /* used by nanotime() */

+#define _COMM_PAGE_NT_GENERATION       (_COMM_PAGE_START_ADDRESS+0x068)        /* used by nanotime() */
+#define _COMM_PAGE_GTOD_GENERATION     (_COMM_PAGE_START_ADDRESS+0x06c)        /* used by gettimeofday() */
+#define _COMM_PAGE_GTOD_NS_BASE                (_COMM_PAGE_START_ADDRESS+0x070)        /* used by gettimeofday() */
+#define _COMM_PAGE_GTOD_SEC_BASE       (_COMM_PAGE_START_ADDRESS+0x078)        /* used by gettimeofday() */

  
  

-#define _COMM_PAGE_TIMEBASE            (_COMM_PAGE_START_ADDRESS+0x068)        /* used by gettimeofday() */
-#define _COMM_PAGE_TIMESTAMP           (_COMM_PAGE_START_ADDRESS+0x070)        /* used by gettimeofday() */
-#define _COMM_PAGE_TIMEENABLE          (_COMM_PAGE_START_ADDRESS+0x078)        /* used by gettimeofday() */
+/* NOTE: APPROX_TIME must be aligned to 64-byte cache line size: */
+#define _COMM_PAGE_APPROX_TIME         (_COMM_PAGE_START_ADDRESS+0x080)        /* used by mach_approximate_time() */
+#define _COMM_PAGE_APPROX_TIME_SUPPORTED (_COMM_PAGE_START_ADDRESS+0x088)      /* used by mach_approximate_time() */
+
+/* Align following entries to next cache line */
+#define _COMM_PAGE_CONT_TIMEBASE       (_COMM_PAGE_START_ADDRESS+0x0C0)        /* used by mach_continuous_time() */
+#define _COMM_PAGE_BOOTTIME_USEC       (_COMM_PAGE_START_ADDRESS+0x0C8)        /* uint64_t boottime */

 
 

-#define        _NT_TSC_BASE                    0                                       /* offsets into nanotime data */
+#define _COMM_PAGE_END                 (_COMM_PAGE_START_ADDRESS+0xfff)        /* end of common page */
+
+/* Warning: kernel commpage.h has a matching c typedef for the following.  They must be kept in sync.  */
+/* These offsets are from _COMM_PAGE_TIME_DATA_START */
+
+#define        _NT_TSC_BASE                    0

 #define        _NT_SCALE                       8
 #define        _NT_SHIFT                       12
 #define        _NT_NS_BASE                     16
 #define        _NT_SCALE                       8
 #define        _NT_SHIFT                       12
 #define        _NT_NS_BASE                     16

-#define        _TIMEBASE                       0                                       /* offsets into gettimeofday data */
-#define        _TIMESTAMP                      8
-#define        _TIMEENABLE                     16
+#define        _NT_GENERATION                  24
+#define        _GTOD_GENERATION                28
+#define        _GTOD_NS_BASE                   32
+#define        _GTOD_SEC_BASE                  40

  
  /* jump table (jmp to this address, which may be a branch to the actual code somewhere else) */
  
  /* jump table (jmp to this address, which may be a branch to the actual code somewhere else) */

- /* When new jump table entries are added, corresponding symbols should be added below         */
-
-#define _COMM_PAGE_COMPARE_AND_SWAP32   (_COMM_PAGE_START_ADDRESS+0x080)       /* compare-and-swap word */
-#define _COMM_PAGE_COMPARE_AND_SWAP64   (_COMM_PAGE_START_ADDRESS+0x0c0)       /* compare-and-swap doubleword */
-#define _COMM_PAGE_ENQUEUE              (_COMM_PAGE_START_ADDRESS+0x100)       /* enqueue */
-#define _COMM_PAGE_DEQUEUE              (_COMM_PAGE_START_ADDRESS+0x140)       /* dequeue */
-#define _COMM_PAGE_MEMORY_BARRIER       (_COMM_PAGE_START_ADDRESS+0x180)       /* memory barrier */
-#define _COMM_PAGE_ATOMIC_ADD32         (_COMM_PAGE_START_ADDRESS+0x1a0)       /* add atomic word */
-#define _COMM_PAGE_ATOMIC_ADD64         (_COMM_PAGE_START_ADDRESS+0x1c0)       /* add atomic doubleword */
-
-#define        _COMM_PAGE_UNUSED3              (_COMM_PAGE_START_ADDRESS+0x1e0)        /* 32 unused bytes */
-
-#define _COMM_PAGE_ABSOLUTE_TIME       (_COMM_PAGE_START_ADDRESS+0x200)        /* mach_absolute_time() */
-#define _COMM_PAGE_SPINLOCK_TRY                (_COMM_PAGE_START_ADDRESS+0x220)        /* spinlock_try() */
-#define _COMM_PAGE_SPINLOCK_LOCK       (_COMM_PAGE_START_ADDRESS+0x260)        /* spinlock_lock() */
-#define _COMM_PAGE_SPINLOCK_UNLOCK     (_COMM_PAGE_START_ADDRESS+0x2a0)        /* spinlock_unlock() */
-#define _COMM_PAGE_PTHREAD_GETSPECIFIC  (_COMM_PAGE_START_ADDRESS+0x2c0)       /* pthread_getspecific() */
-#define _COMM_PAGE_GETTIMEOFDAY                (_COMM_PAGE_START_ADDRESS+0x2e0)        /* used by gettimeofday() */
-#define _COMM_PAGE_FLUSH_DCACHE                (_COMM_PAGE_START_ADDRESS+0x4e0)        /* sys_dcache_flush() */
-#define _COMM_PAGE_FLUSH_ICACHE                (_COMM_PAGE_START_ADDRESS+0x520)        /* sys_icache_invalidate() */
-#define _COMM_PAGE_PTHREAD_SELF                (_COMM_PAGE_START_ADDRESS+0x580)        /* pthread_self() */
-
-#define _COMM_PAGE_UNUSED4             (_COMM_PAGE_START_ADDRESS+0x5a0)        /* 32 unused bytes */
-
-#define _COMM_PAGE_RELINQUISH          (_COMM_PAGE_START_ADDRESS+0x5c0)        /* used by spinlocks */ 
-#define _COMM_PAGE_BTS                 (_COMM_PAGE_START_ADDRESS+0x5e0)        /* bit test-and-set */
-#define _COMM_PAGE_BTC                 (_COMM_PAGE_START_ADDRESS+0x5f0)        /* bit test-and-clear */
- 
-#define _COMM_PAGE_BZERO               (_COMM_PAGE_START_ADDRESS+0x600)        /* bzero() */
-#define _COMM_PAGE_BCOPY               (_COMM_PAGE_START_ADDRESS+0x780)        /* bcopy() */
-#define        _COMM_PAGE_MEMCPY               (_COMM_PAGE_START_ADDRESS+0x7a0)        /* memcpy() */
-#define        _COMM_PAGE_MEMMOVE              (_COMM_PAGE_START_ADDRESS+0x7a0)        /* memmove() */
+ /* When new jump table entries are added, corresponding symbols should be added below        */
+ /* New slots should be allocated with at least 16-byte alignment. Some like bcopy require    */
+ /* 32-byte alignment, and should be aligned as such in the assembly source before they are relocated */
+#define _COMM_PAGE_TEXT_START          (_COMM_PAGE_START_ADDRESS+0x1000)
+#define _COMM_PAGE32_TEXT_START         (_COMM_PAGE32_BASE_ADDRESS+0x1000)    /* start of text section */
+#define _COMM_PAGE64_TEXT_START                (_COMM_PAGE64_BASE_ADDRESS+0x1000)
+#define _COMM_PAGE_TEXT_AREA_USED      ( 1 * 4096 )
+#define _COMM_PAGE_TEXT_AREA_LENGTH    ( 1 * 4096 )
+#define _PFZ32_SLIDE_RANGE             ( 14 ) /* pages between 0xfffff000 and _COMM_PAGE32_TEXT_START */
+#define _PFZ64_SLIDE_RANGE             ( 510 ) /* pages between 0x00007ffffffff000 and _COMM_PAGE64_TEXT_START */
+
+/* setup start offset in the commpage text region for each jump table entry 
+ * the Comm Page Offset is shortened to _COMM_TEXT_[label]_OFFSET
+ */
+
+#define _COMM_TEXT_PREEMPT_OFFSET              (0x5a0) /* called from withing pfz */
+#define _COMM_TEXT_BACKOFF_OFFSET              (0x600) /* called from PFZ */
+#define _COMM_TEXT_RET_OFFSET                  (0x680) /* called from PFZ */
+#define _COMM_TEXT_PFZ_START_OFFSET            (0xc00) /* offset for Preemption Free Zone */
+#define _COMM_TEXT_PFZ_ENQUEUE_OFFSET          (0xc00) /* internal FIFO enqueue */
+#define _COMM_TEXT_PFZ_DEQUEUE_OFFSET          (0xc80) /* internal FIFO dequeue */
+#define _COMM_TEXT_UNUSED_OFFSET               (0xd00) /* end of routines in text page */
+#define _COMM_TEXT_PFZ_END_OFFSET              (0xd00) /* offset for end of PFZ */
+

 
 

-#define        _COMM_PAGE_OLD_NANOTIME         (_COMM_PAGE_START_ADDRESS+0xf80)        /* old nanotime location (deprecated) */
-#define        _COMM_PAGE_MEMSET_PATTERN       (_COMM_PAGE_START_ADDRESS+0x1000)       /* used by nonzero memset() */
-#define        _COMM_PAGE_LONGCOPY             (_COMM_PAGE_START_ADDRESS+0x1200)       /* used by bcopy() for very long operands */
+#define _COMM_PAGE_PREEMPT             (_COMM_PAGE_TEXT_START+_COMM_TEXT_PREEMPT_OFFSET)
+#define _COMM_PAGE_BACKOFF             (_COMM_PAGE_TEXT_START+_COMM_TEXT_BACKOFF_OFFSET)       
+#define _COMM_PAGE_RET                 (_COMM_PAGE_TEXT_START+_COMM_TEXT_RET_OFFSET)   

 
 

-#define _COMM_PAGE_SYSTEM_INTEGRITY    (_COMM_PAGE_START_ADDRESS+0x1600)       /* system integrity data, 256 bytes */
+#define _COMM_PAGE_PFZ_START           (_COMM_PAGE_TEXT_START+_COMM_PAGE_PFZ_START_OFFSET)

 
 

-#define        _COMM_PAGE_NANOTIME             (_COMM_PAGE_START_ADDRESS+0x1700)       /* nanotime() */
+#define _COMM_PAGE_PFZ_ENQUEUE         (_COMM_PAGE_TEXT_START+_COMM_TEXT_PFZ_ENQUEUE_OFFSET)
+#define _COMM_PAGE_PFZ_DEQUEUE         (_COMM_PAGE_TEXT_START+_COMM_TEXT_PFZ_DEQUEUE_OFFSET)

 
 

-#define _COMM_PAGE_END                 (_COMM_PAGE_START_ADDRESS+0x1780)       /* end of common page - insert new stuff here */
+#define        _COMM_PAGE_UNUSED6              (_COMM_PAGE_TEXT_START+_COMM_TEXT_UNUSED_OFFSET)        
+#define _COMM_PAGE_PFZ_END             (_COMM_PAGE_TEXT_START+_COMM_TEXT_PFZ_END_OFFSET)
+#define _COMM_PAGE_TEXT_END            (_COMM_PAGE_TEXT_START+_COMM_TEXT_PFZ_END_OFFSET) /* end of common text page */

 
 /* _COMM_PAGE_COMPARE_AND_SWAP{32,64}B are not used on x86 and are
  * maintained here for source compatability.  These will be removed at
 
 /* _COMM_PAGE_COMPARE_AND_SWAP{32,64}B are not used on x86 and are
  * maintained here for source compatability.  These will be removed at


@@ -208,33 +277,10 @@ symbol_name: nop
 
        .text           /* Required to make a well behaved symbol file */
 
 
        .text           /* Required to make a well behaved symbol file */
 

-       CREATE_COMM_PAGE_SYMBOL(___compare_and_swap32, _COMM_PAGE_COMPARE_AND_SWAP32)
-       CREATE_COMM_PAGE_SYMBOL(___compare_and_swap64, _COMM_PAGE_COMPARE_AND_SWAP64)
-       CREATE_COMM_PAGE_SYMBOL(___atomic_enqueue, _COMM_PAGE_ENQUEUE)
-       CREATE_COMM_PAGE_SYMBOL(___atomic_dequeue, _COMM_PAGE_DEQUEUE)
-       CREATE_COMM_PAGE_SYMBOL(___memory_barrier, _COMM_PAGE_MEMORY_BARRIER)
-       CREATE_COMM_PAGE_SYMBOL(___atomic_add32, _COMM_PAGE_ATOMIC_ADD32)
-       CREATE_COMM_PAGE_SYMBOL(___atomic_add64, _COMM_PAGE_ATOMIC_ADD64)
-       CREATE_COMM_PAGE_SYMBOL(___mach_absolute_time, _COMM_PAGE_ABSOLUTE_TIME)
-       CREATE_COMM_PAGE_SYMBOL(___spin_lock_try, _COMM_PAGE_SPINLOCK_TRY)
-       CREATE_COMM_PAGE_SYMBOL(___spin_lock, _COMM_PAGE_SPINLOCK_LOCK)
-       CREATE_COMM_PAGE_SYMBOL(___spin_unlock, _COMM_PAGE_SPINLOCK_UNLOCK)
-       CREATE_COMM_PAGE_SYMBOL(___pthread_getspecific, _COMM_PAGE_PTHREAD_GETSPECIFIC)
-       CREATE_COMM_PAGE_SYMBOL(___gettimeofday, _COMM_PAGE_GETTIMEOFDAY)
-       CREATE_COMM_PAGE_SYMBOL(___sys_dcache_flush, _COMM_PAGE_FLUSH_DCACHE)
-       CREATE_COMM_PAGE_SYMBOL(___sys_icache_invalidate, _COMM_PAGE_FLUSH_ICACHE)
-       CREATE_COMM_PAGE_SYMBOL(___pthread_self, _COMM_PAGE_PTHREAD_SELF)
-       CREATE_COMM_PAGE_SYMBOL(___spin_lock_relinquish, _COMM_PAGE_RELINQUISH)
-       CREATE_COMM_PAGE_SYMBOL(___bit_test_and_set, _COMM_PAGE_BTS)
-       CREATE_COMM_PAGE_SYMBOL(___bit_test_and_clear, _COMM_PAGE_BTC)
-       CREATE_COMM_PAGE_SYMBOL(___bzero, _COMM_PAGE_BZERO)
-       CREATE_COMM_PAGE_SYMBOL(___bcopy, _COMM_PAGE_BCOPY)
-       CREATE_COMM_PAGE_SYMBOL(___memcpy, _COMM_PAGE_MEMCPY)
-/*     CREATE_COMM_PAGE_SYMBOL(___memmove, _COMM_PAGE_MEMMOVE) */
-       CREATE_COMM_PAGE_SYMBOL(___old_nanotime, _COMM_PAGE_OLD_NANOTIME)
-       CREATE_COMM_PAGE_SYMBOL(___memset_pattern, _COMM_PAGE_MEMSET_PATTERN)
-       CREATE_COMM_PAGE_SYMBOL(___longcopy, _COMM_PAGE_LONGCOPY)
-       CREATE_COMM_PAGE_SYMBOL(___nanotime, _COMM_PAGE_NANOTIME)
+       CREATE_COMM_PAGE_SYMBOL(___preempt, _COMM_PAGE_PREEMPT)
+       CREATE_COMM_PAGE_SYMBOL(___backoff, _COMM_PAGE_BACKOFF)
+       CREATE_COMM_PAGE_SYMBOL(___pfz_enqueue, _COMM_PAGE_PFZ_ENQUEUE)
+       CREATE_COMM_PAGE_SYMBOL(___pfz_dequeue, _COMM_PAGE_PFZ_DEQUEUE)

        CREATE_COMM_PAGE_SYMBOL(___end_comm_page, _COMM_PAGE_END)
 
        .data           /* Required to make a well behaved symbol file */
        CREATE_COMM_PAGE_SYMBOL(___end_comm_page, _COMM_PAGE_END)
 
        .data           /* Required to make a well behaved symbol file */