Overview
Comment: | Fix x86(_64) asm for of_atomic_{or,and,xor}_32. Improve x86(_64) asm for of_atomic_cmpswap_{32,ptr}. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
7334aa1c81764b2c5b171491d636fc6c |
User & Date: | js on 2010-10-06 09:21:49 |
Other Links: | manifest | tags |
Context
2010-10-06
| ||
19:37 | Add missing #ifdef OF_HAVE_BLOCKS. check-in: 2bf66ace60 user: js tags: trunk | |
09:21 |
Fix x86(_64) asm for of_atomic_{or,and,xor}_32. Improve x86(_64) asm for of_atomic_cmpswap_{32,ptr}. check-in: 7334aa1c81 user: js tags: trunk | |
2010-10-05
| ||
20:01 | Remove -[autorelease] from OFBlock. check-in: f78e4e4714 user: js tags: trunk | |
Changes
Modified src/OFBlock.m from [995214f475] to [ec9c649489].
︙ | ︙ | |||
12 13 14 15 16 17 18 | #include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #import "OFBlock.h" | < | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | #include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #import "OFBlock.h" #if defined(OF_GNU_RUNTIME) || defined(OF_OBJFW_RUNTIME) struct objc_abi_class { struct objc_abi_metaclass *metaclass; const char *superclass, *name; unsigned long version, info, instance_size; void *ivars, *methodlist, *dtable, *subclass_list, *sibling_class; |
︙ | ︙ |
Modified src/atomic.h from [842f2e4fa9] to [4d9142af8f].
︙ | ︙ | |||
119 120 121 122 123 124 125 | static OF_INLINE uint32_t of_atomic_or_32(volatile uint32_t *p, uint32_t i) { #if !defined(OF_THREADS) return (*p |= i); #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM) | < | > > > > | > | | > > | < | > > > > | > | | > > | < | > > > > | > | | > > | > > | | > > > | | > | 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 | static OF_INLINE uint32_t of_atomic_or_32(volatile uint32_t *p, uint32_t i) { #if !defined(OF_THREADS) return (*p |= i); #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM) __asm__ ( "0:\n\t" "movl %2, %0\n\t" "movl %2, %%eax\n\t" "orl %1, %0\n\t" "lock\n\t" "cmpxchg %0, %2\n\t" "jne 0\n\t" : "=&r"(i) : "r"(i), "m"(*p) : "eax" ); return i; #elif defined(OF_HAVE_GCC_ATOMIC_OPS) return __sync_or_and_fetch(p, i); #elif defined(OF_HAVE_LIBKERN_OSATOMIC_H) return OSAtomicOr32Barrier(i, p); #endif } static OF_INLINE uint32_t of_atomic_and_32(volatile uint32_t *p, uint32_t i) { #if !defined(OF_THREADS) return (*p &= i); #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM) __asm__ ( "0:\n\t" "movl %2, %0\n\t" "movl %2, %%eax\n\t" "andl %1, %0\n\t" "lock\n\t" "cmpxchg %0, %2\n\t" "jne 0\n\t" : "=&r"(i) : "r"(i), "m"(*p) : "eax" ); return i; #elif defined(OF_HAVE_GCC_ATOMIC_OPS) return __sync_and_and_fetch(p, i); #elif defined(OF_HAVE_LIBKERN_OSATOMIC_H) return OSAtomicAnd32Barrier(i, p); #endif } static OF_INLINE uint32_t of_atomic_xor_32(volatile uint32_t *p, uint32_t i) { #if !defined(OF_THREADS) return (*p ^= i); #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM) __asm__ ( "0:\n\t" "movl %2, %0\n\t" "movl %2, %%eax\n\t" "xorl %1, %0\n\t" "lock\n\t" "cmpxchgl %0, %2\n\t" "jne 0\n\t" : "=&r"(i) : "r"(i), "m"(*p) : "eax" ); return i; #elif defined(OF_HAVE_GCC_ATOMIC_OPS) return __sync_xor_and_fetch(p, i); #elif defined(OF_HAVE_LIBKERN_OSATOMIC_H) return OSAtomicXor32Barrier(i, p); #endif } static OF_INLINE BOOL of_atomic_cmpswap_32(volatile int32_t *p, int32_t o, int32_t n) { #if !defined(OF_THREADS) if (*p == o) { *p = n; return YES; } return NO; #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM) uint32_t r; __asm__ ( "lock\n\t" "cmpxchg %2, %3\n\t" "lahf\n\t" "andb $64, %%ah\n\t" "shrb $6, %%ah\n\t" "movzx %%ah, %0\n\t" : "=a"(r) : "a"(o), "r"(n), "m"(*p) ); return r; #elif defined(OF_HAVE_GCC_ATOMIC_OPS) return __sync_bool_compare_and_swap(p, o, n); #elif defined(OF_HAVE_LIBKERN_OSATOMIC_H) return OSAtomicCompareAndSwap32Barrier(o, n, p); #endif } static OF_INLINE BOOL of_atomic_cmpswap_ptr(void* volatile *p, void *o, void *n) { #if !defined(OF_THREADS) if (*p == o) { *p = n; return YES; } return NO; #elif defined(OF_X86_ASM) || defined(OF_AMD64_ASM) uint32_t r; __asm__ ( "lock\n\t" "cmpxchg %2, %3\n\t" "lahf\n\t" "andb $64, %%ah\n\t" "shrb $6, %%ah\n\t" "movzx %%ah, %0\n\t" : "=a"(r) : "a"(o), "q"(n), "m"(*p) ); return r; #elif defined(OF_HAVE_GCC_ATOMIC_OPS) return __sync_bool_compare_and_swap(p, o, n); #elif defined(OF_HAVE_LIBKERN_OSATOMIC_H) return OSAtomicCompareAndSwapPtrBarrier(o, n, p); #endif } |