projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reduce random casting in looks_like_valid_lisp_pointer_p().
[sbcl.git]
/
src
/
runtime
/
x86-arch.h
diff --git
a/src/runtime/x86-arch.h
b/src/runtime/x86-arch.h
index
f8174c2
..
1200ef1
100644
(file)
--- a/
src/runtime/x86-arch.h
+++ b/
src/runtime/x86-arch.h
@@
-9,6
+9,8
@@
#error genesis/config.h (or sbcl.h) must be included before this file
#endif
#error genesis/config.h (or sbcl.h) must be included before this file
#endif
+#include "interr.h" /* for declaration of lose() */
+
#define ARCH_HAS_STACK_POINTER
/* FIXME: Do we also want
#define ARCH_HAS_STACK_POINTER
/* FIXME: Do we also want
@@
-16,21
+18,31
@@
* here? (The answer wasn't obvious to me when merging the
* architecture-abstracting patches for CSR's SPARC port. -- WHN 2002-02-15) */
* here? (The answer wasn't obvious to me when merging the
* architecture-abstracting patches for CSR's SPARC port. -- WHN 2002-02-15) */
-#include "interr.h"
+#define COMPILER_BARRIER \
+ do { __asm__ __volatile__ ( "" : : : "memory"); } while (0)
static inline void
static inline void
-get_spinlock(volatile lispobj *word,long value)
+get_spinlock(volatile lispobj *word, unsigned long value)
{
#ifdef LISP_FEATURE_SB_THREAD
u32 eax=0;
if(*word==value)
lose("recursive get_spinlock: 0x%x,%ld\n",word,value);
do {
{
#ifdef LISP_FEATURE_SB_THREAD
u32 eax=0;
if(*word==value)
lose("recursive get_spinlock: 0x%x,%ld\n",word,value);
do {
- asm ("xor %0,%0\n\
+#if defined(LISP_FEATURE_DARWIN)
+ asm volatile ("xor %0,%0;\n\
+ lock/cmpxchg %1,%2"
+ : "=a" (eax)
+ : "r" (value), "m" (*word)
+ : "memory", "cc");
+#else
+ asm volatile ("xor %0,%0\n\
lock cmpxchg %1,%2"
: "=a" (eax)
: "r" (value), "m" (*word)
: "memory", "cc");
lock cmpxchg %1,%2"
: "=a" (eax)
: "r" (value), "m" (*word)
: "memory", "cc");
+#endif
+
} while(eax!=0);
#else
*word=value;
} while(eax!=0);
#else
*word=value;
@@
-40,20
+52,31
@@
get_spinlock(volatile lispobj *word,long value)
static inline void
release_spinlock(volatile lispobj *word)
{
static inline void
release_spinlock(volatile lispobj *word)
{
+ /* See comment in RELEASE-SPINLOCK in target-thread.lisp. */
+ COMPILER_BARRIER;
*word=0;
*word=0;
+ COMPILER_BARRIER;
}
}
-#include <stdio.h>
-
static inline lispobj
swap_lispobjs(volatile lispobj *dest, lispobj value)
{
lispobj old_value;
static inline lispobj
swap_lispobjs(volatile lispobj *dest, lispobj value)
{
lispobj old_value;
- asm ("lock xchg %0,(%1)"
+#if defined(LISP_FEATURE_DARWIN)
+ asm volatile ("lock/xchg %0,(%1)"
: "=r" (old_value)
: "r" (dest), "0" (value)
: "memory");
: "=r" (old_value)
: "r" (dest), "0" (value)
: "memory");
+#else
+ asm volatile ("lock xchg %0,(%1)"
+ : "=r" (old_value)
+ : "r" (dest), "0" (value)
+ : "memory");
+#endif
return old_value;
}
return old_value;
}
+extern void fast_bzero_detect(void *, size_t);
+extern void (*fast_bzero_pointer)(void *, size_t);
+
#endif /* _X86_ARCH_H */
#endif /* _X86_ARCH_H */