projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.9.4.23:
[sbcl.git]
/
src
/
runtime
/
x86-arch.h
diff --git
a/src/runtime/x86-arch.h
b/src/runtime/x86-arch.h
index
439f508
..
b4ce701
100644
(file)
--- a/
src/runtime/x86-arch.h
+++ b/
src/runtime/x86-arch.h
@@
-4,9
+4,6
@@
* namespace that we control. */
#ifndef _X86_ARCH_H
#define _X86_ARCH_H
* namespace that we control. */
#ifndef _X86_ARCH_H
#define _X86_ARCH_H
-#ifndef SBCL_GENESIS_CONFIG
-#error genesis/config.h (or sbcl.h) must be included before this file
-#endif
#ifndef SBCL_GENESIS_CONFIG
#error genesis/config.h (or sbcl.h) must be included before this file
#ifndef SBCL_GENESIS_CONFIG
#error genesis/config.h (or sbcl.h) must be included before this file
@@
-17,26
+14,27
@@
/* FIXME: Do we also want
* #define ARCH_HAS_FLOAT_REGISTERS
* here? (The answer wasn't obvious to me when merging the
/* FIXME: Do we also want
* #define ARCH_HAS_FLOAT_REGISTERS
* here? (The answer wasn't obvious to me when merging the
- * architecture-abstracting patches for CSR's SPARC port. -- WHN
- * 2002-02-15) */
-
-#ifdef LISP_FEATURE_SB_THREAD
+ * architecture-abstracting patches for CSR's SPARC port. -- WHN 2002-02-15) */
-extern never_returns lose(char *fmt, ...);
+#include "interr.h"
-static inline void
+static inline void
get_spinlock(volatile lispobj *word,long value)
{
get_spinlock(volatile lispobj *word,long value)
{
+#ifdef LISP_FEATURE_SB_THREAD
u32 eax=0;
u32 eax=0;
- if(*word==value)
- lose("recursive get_spinlock: 0x%x,%d\n",word,value);
+ if(*word==value)
+ lose("recursive get_spinlock: 0x%x,%ld\n",word,value);
do {
do {
- asm ("xor %0,%0\n\
- lock cmpxchg %1,%2"
- : "=a" (eax)
- : "r" (value), "m" (*word)
- : "memory", "cc");
+ asm ("xor %0,%0\n\
+ lock cmpxchg %1,%2"
+ : "=a" (eax)
+ : "r" (value), "m" (*word)
+ : "memory", "cc");
} while(eax!=0);
} while(eax!=0);
+#else
+ *word=value;
+#endif
}
static inline void
}
static inline void
@@
-45,18
+43,4
@@
release_spinlock(volatile lispobj *word)
*word=0;
}
*word=0;
}
-#else
-
-static inline void
-get_spinlock(lispobj *word, int value)
-{
- *word = value;
-}
-
-static inline void
-release_spinlock(lispobj *word) {
- *word = 0;
-}
-
-#endif /* LISP_FEATURE_SB_THREAD */
#endif /* _X86_ARCH_H */
#endif /* _X86_ARCH_H */