xnu-1699.26.8.tar.gz

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

diff --git a/osfmk/i386/lock.h b/osfmk/i386/lock.h
index 9df7f13209b83b8325e625c288dddc50b23e0841..d353be3c70bbd498b15b2957c8d86f389509f69f 100644 (file)
--- a/osfmk/i386/lock.h
+++ b/osfmk/i386/lock.h
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @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


@@ -18,7 +23,7 @@
  * 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@

  */
 /*
  * Copyright (C) 1998 Apple Computer
  */
 /*
  * Copyright (C) 1998 Apple Computer


@@ -78,27 +83,10 @@
 #include <mach_rt.h>
 #include <mach_ldebug.h>
 
 #include <mach_rt.h>
 #include <mach_ldebug.h>
 

-typedef struct {
-       lck_mtx_t       lck_mtx;        /* inlined lck_mtx, need to be first */
-#if     MACH_LDEBUG     
-       int                             type;
-#define MUTEX_TAG       0x4d4d
-       vm_offset_t             pc;
-       vm_offset_t             thread;
-#endif  /* MACH_LDEBUG */
-} mutex_t;
-
-typedef struct {
-       decl_simple_lock_data(,interlock) /* "hardware" interlock field */
-       volatile unsigned int
-               read_count:16,  /* No. of accepted readers */
-               want_upgrade:1, /* Read-to-write upgrade waiting */
-               want_write:1,   /* Writer is waiting, or locked for write */ 
-               waiting:1,              /* Someone is sleeping on lock */
-       can_sleep:1;            /* Can attempts to lock go to sleep? */
-} lock_t;
-
-extern unsigned int LockTimeOut;                       /* Number of hardware ticks of a lock timeout */
+typedef lck_rw_t lock_t;
+
+extern unsigned int LockTimeOutTSC;    /* Lock timeout in TSC ticks */
+extern unsigned int LockTimeOut;       /* Lock timeout in absolute time */ 

 
 
 #if defined(__GNUC__)
 
 
 #if defined(__GNUC__)


@@ -142,32 +130,23 @@ extern unsigned int LockTimeOut;                  /* Number of hardware ticks of a lock timeout
                                                                :       \
                        "r" (bit), "m" (*(volatile int *)(l)));
 
                                                                :       \
                        "r" (bit), "m" (*(volatile int *)(l)));
 

-static inline unsigned long i_bit_isset(unsigned int test, volatile unsigned long *word)
-{
-       int     bit;
-
-       __asm__ volatile("btl %2,%1\n\tsbbl %0,%0" : "=r" (bit)
-               : "m" (word), "ir" (test));
-       return bit;
-}
-

 static inline char     xchgb(volatile char * cp, char new);
 
 static inline char     xchgb(volatile char * cp, char new);
 

-static inline void     atomic_incl(long * p, long delta);
-static inline void     atomic_incs(short * p, short delta);
-static inline void     atomic_incb(char * p, char delta);
+static inline void     atomic_incl(volatile long * p, long delta);
+static inline void     atomic_incs(volatile short * p, short delta);
+static inline void     atomic_incb(volatile char * p, char delta);

 
 

-static inline void     atomic_decl(long * p, long delta);
-static inline void     atomic_decs(short * p, short delta);
-static inline void     atomic_decb(char * p, char delta);
+static inline void     atomic_decl(volatile long * p, long delta);
+static inline void     atomic_decs(volatile short * p, short delta);
+static inline void     atomic_decb(volatile char * p, char delta);

 
 

-static inline long     atomic_getl(long * p);
-static inline short    atomic_gets(short * p);
-static inline char     atomic_getb(char * p);
+static inline long     atomic_getl(const volatile long * p);
+static inline short    atomic_gets(const volatile short * p);
+static inline char     atomic_getb(const volatile char * p);

 
 

-static inline void     atomic_setl(long * p, long value);
-static inline void     atomic_sets(short * p, short value);
-static inline void     atomic_setb(char * p, char value);
+static inline void     atomic_setl(volatile long * p, long value);
+static inline void     atomic_sets(volatile short * p, short value);
+static inline void     atomic_setb(volatile char * p, char value);

 
 static inline char     xchgb(volatile char * cp, char new)
 {
 
 static inline char     xchgb(volatile char * cp, char new)
 {


@@ -179,64 +158,15 @@ static inline char        xchgb(volatile char * cp, char new)
        return (old);
 }
 
        return (old);
 }
 

-/*
- * Compare and exchange:
- * - returns failure (0) if the location did not contain the old value,
- * - returns success (1) if the location was set to the new value.
- */
-static inline uint32_t
-atomic_cmpxchg(uint32_t *p, uint32_t old, uint32_t new)
-{
-       uint32_t res = old;
-
-       asm volatile(
-               "lock;  cmpxchgl        %1,%2;  \n\t"
-               "       setz            %%al;   \n\t"
-               "       movzbl          %%al,%0"
-               : "+a" (res)    /* %0: old value to compare, returns success */
-               : "r" (new),    /* %1: new value to set */
-                 "m" (*(p))    /* %2: memory address */
-               : "memory");
-       return (res);
-}
-
-static inline uint64_t
-atomic_load64(uint64_t *quadp)
-{
-       uint64_t ret;
-
-       asm volatile(
-               "       lock; cmpxchg8b %1"
-               : "=A" (ret)
-               : "m" (*quadp), "a" (0), "d" (0), "b" (0), "c" (0));
-       return (ret);
-}
-
-static inline uint64_t
-atomic_loadstore64(uint64_t *quadp, uint64_t new)
-{
-       uint64_t ret;
-
-       ret = *quadp;
-       asm volatile(
-               "1:                             \n\t"
-               "       lock; cmpxchg8b %1      \n\t"
-               "       jnz     1b"
-               : "+A" (ret)
-               : "m" (*quadp),
-                 "b" ((uint32_t)new), "c" ((uint32_t)(new >> 32)));
-       return (ret);
-}
-
-static inline void     atomic_incl(long * p, long delta)
+static inline void     atomic_incl(volatile long * p, long delta)

 {
        __asm__ volatile ("     lock            \n              \
 {
        __asm__ volatile ("     lock            \n              \

-                               addl    %0,%1"          :       \
+                               add    %0,%1"           :       \

                                                        :       \
                                "r" (delta), "m" (*(volatile long *)p));
 }
 
                                                        :       \
                                "r" (delta), "m" (*(volatile long *)p));
 }
 

-static inline void     atomic_incs(short * p, short delta)
+static inline void     atomic_incs(volatile short * p, short delta)

 {
        __asm__ volatile ("     lock            \n              \
                                addw    %0,%1"          :       \
 {
        __asm__ volatile ("     lock            \n              \
                                addw    %0,%1"          :       \


@@ -244,7 +174,7 @@ static inline void  atomic_incs(short * p, short delta)
                                "q" (delta), "m" (*(volatile short *)p));
 }
 
                                "q" (delta), "m" (*(volatile short *)p));
 }
 

-static inline void     atomic_incb(char * p, char delta)
+static inline void     atomic_incb(volatile char * p, char delta)

 {
        __asm__ volatile ("     lock            \n              \
                                addb    %0,%1"          :       \
 {
        __asm__ volatile ("     lock            \n              \
                                addb    %0,%1"          :       \


@@ -252,27 +182,27 @@ static inline void        atomic_incb(char * p, char delta)
                                "q" (delta), "m" (*(volatile char *)p));
 }
 
                                "q" (delta), "m" (*(volatile char *)p));
 }
 

-static inline void     atomic_decl(long * p, long delta)
+static inline void     atomic_decl(volatile long * p, long delta)

 {
        __asm__ volatile ("     lock            \n              \
 {
        __asm__ volatile ("     lock            \n              \

-                               subl    %0,%1"          :       \
+                               sub             %0,%1"          :       \

                                                        :       \
                                "r" (delta), "m" (*(volatile long *)p));
 }
 
                                                        :       \
                                "r" (delta), "m" (*(volatile long *)p));
 }
 

-static inline int      atomic_decl_and_test(long * p, long delta)
+static inline int      atomic_decl_and_test(volatile long * p, long delta)

 {
        uint8_t ret;
 {
        uint8_t ret;

-       asm volatile (
+       __asm__ volatile (

                "       lock            \n\t"
                "       lock            \n\t"

-               "       subl    %1,%2   \n\t"
+               "       sub             %1,%2   \n\t"

                "       sete    %0"
                : "=qm" (ret)
                : "r" (delta), "m" (*(volatile long *)p));
        return ret;
 }
 
                "       sete    %0"
                : "=qm" (ret)
                : "r" (delta), "m" (*(volatile long *)p));
        return ret;
 }
 

-static inline void     atomic_decs(short * p, short delta)
+static inline void     atomic_decs(volatile short * p, short delta)

 {
        __asm__ volatile ("     lock            \n              \
                                subw    %0,%1"          :       \
 {
        __asm__ volatile ("     lock            \n              \
                                subw    %0,%1"          :       \


@@ -280,7 +210,7 @@ static inline void  atomic_decs(short * p, short delta)
                                "q" (delta), "m" (*(volatile short *)p));
 }
 
                                "q" (delta), "m" (*(volatile short *)p));
 }
 

-static inline void     atomic_decb(char * p, char delta)
+static inline void     atomic_decb(volatile char * p, char delta)

 {
        __asm__ volatile ("     lock            \n              \
                                subb    %0,%1"          :       \
 {
        __asm__ volatile ("     lock            \n              \
                                subb    %0,%1"          :       \


@@ -288,32 +218,32 @@ static inline void        atomic_decb(char * p, char delta)
                                "q" (delta), "m" (*(volatile char *)p));
 }
 
                                "q" (delta), "m" (*(volatile char *)p));
 }
 

-static inline long     atomic_getl(long * p)
+static inline long     atomic_getl(const volatile long * p)

 {
        return (*p);
 }
 
 {
        return (*p);
 }
 

-static inline short    atomic_gets(short * p)
+static inline short    atomic_gets(const volatile short * p)

 {
        return (*p);
 }
 
 {
        return (*p);
 }
 

-static inline char     atomic_getb(char * p)
+static inline char     atomic_getb(const volatile char * p)

 {
        return (*p);
 }
 
 {
        return (*p);
 }
 

-static inline void     atomic_setl(long * p, long value)
+static inline void     atomic_setl(volatile long * p, long value)

 {
        *p = value;
 }
 
 {
        *p = value;
 }
 

-static inline void     atomic_sets(short * p, short value)
+static inline void     atomic_sets(volatile short * p, short value)

 {
        *p = value;
 }
 
 {
        *p = value;
 }
 

-static inline void     atomic_setb(char * p, char value)
+static inline void     atomic_setb(volatile char * p, char value)

 {
        *p = value;
 }
 {
        *p = value;
 }