xnu-792.25.20.tar.gz

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

diff --git a/osfmk/i386/lock.h b/osfmk/i386/lock.h
index 8f31c69bb03f1720fbd59c59016c88912c9ab688..1f11129e74b1514c2e8651b6794fa87b7cb51384 100644 (file)
--- a/osfmk/i386/lock.h
+++ b/osfmk/i386/lock.h
@@ -87,15 +87,7 @@ typedef struct {
 #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;
+typedef lck_rw_t lock_t;
 
 extern unsigned int LockTimeOut;                       /* Number of hardware ticks of a lock timeout */
 
@@ -152,21 +144,21 @@ static inline unsigned long i_bit_isset(unsigned int test, volatile unsigned lon
 
 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)
 {
@@ -199,35 +191,7 @@ atomic_cmpxchg(uint32_t *p, uint32_t old, uint32_t new)
        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              \
                                addl    %0,%1"          :       \
@@ -235,7 +199,7 @@ static inline void  atomic_incl(long * p, long delta)
                                "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"          :       \
@@ -243,7 +207,7 @@ static inline void  atomic_incs(short * p, short delta)
                                "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"          :       \
@@ -251,7 +215,7 @@ static inline void  atomic_incb(char * p, char delta)
                                "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              \
                                subl    %0,%1"          :       \
@@ -259,7 +223,7 @@ static inline void  atomic_decl(long * p, long delta)
                                "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;
        asm volatile (
@@ -271,7 +235,7 @@ static inline int   atomic_decl_and_test(long * p, long delta)
        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"          :       \
@@ -279,7 +243,7 @@ static inline void  atomic_decs(short * p, short delta)
                                "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"          :       \
@@ -287,32 +251,32 @@ static inline void        atomic_decb(char * p, char delta)
                                "q" (delta), "m" (*(volatile char *)p));
 }
 
-static inline long     atomic_getl(long * p)
+static inline long     atomic_getl(const volatile long * p)
 {
        return (*p);
 }
 
-static inline short    atomic_gets(short * p)
+static inline short    atomic_gets(const volatile short * p)
 {
        return (*p);
 }
 
-static inline char     atomic_getb(char * p)
+static inline char     atomic_getb(const volatile char * p)
 {
        return (*p);
 }
 
-static inline void     atomic_setl(long * p, long value)
+static inline void     atomic_setl(volatile long * p, long value)
 {
        *p = value;
 }
 
-static inline void     atomic_sets(short * p, short value)
+static inline void     atomic_sets(volatile short * p, short value)
 {
        *p = value;
 }
 
-static inline void     atomic_setb(char * p, char value)
+static inline void     atomic_setb(volatile char * p, char value)
 {
        *p = value;
 }