projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.21.48:
[sbcl.git]
/
src
/
runtime
/
thread.h
diff --git
a/src/runtime/thread.h
b/src/runtime/thread.h
index
9fb3ab3
..
2ff59e6
100644
(file)
--- a/
src/runtime/thread.h
+++ b/
src/runtime/thread.h
@@
-5,8
+5,8
@@
#include <sys/types.h>
#include <unistd.h>
#include <stddef.h>
#include <sys/types.h>
#include <unistd.h>
#include <stddef.h>
-#include "runtime.h"
#include "sbcl.h"
#include "sbcl.h"
+#include "runtime.h"
#include "os.h"
#include "interrupt.h"
#ifdef LISP_FEATURE_GENCGC
#include "os.h"
#include "interrupt.h"
#ifdef LISP_FEATURE_GENCGC
@@
-18,6
+18,11
@@
struct alloc_region { };
#include "genesis/static-symbols.h"
#include "genesis/thread.h"
#include "genesis/static-symbols.h"
#include "genesis/thread.h"
+#define STATE_RUNNING (make_fixnum(0))
+#define STATE_STOPPING (make_fixnum(1))
+#define STATE_STOPPED (make_fixnum(2))
+#define STATE_DEAD (make_fixnum(3))
+
#define THREAD_SLOT_OFFSET_WORDS(c) \
(offsetof(struct thread,c)/(sizeof (struct thread *)))
#define THREAD_SLOT_OFFSET_WORDS(c) \
(offsetof(struct thread,c)/(sizeof (struct thread *)))
@@
-38,7
+43,7
@@
extern struct thread *find_thread_by_pid(pid_t pid);
#define for_each_thread(th) for(th=all_threads;th;th=0)
#endif
#define for_each_thread(th) for(th=all_threads;th;th=0)
#endif
-static inline lispobj SymbolValue(u32 tagged_symbol_pointer, void *thread) {
+static inline lispobj SymbolValue(u64 tagged_symbol_pointer, void *thread) {
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
@@
-51,7
+56,7
@@
static inline lispobj SymbolValue(u32 tagged_symbol_pointer, void *thread) {
#endif
return sym->value;
}
#endif
return sym->value;
}
-static inline lispobj SymbolTlValue(u32 tagged_symbol_pointer, void *thread) {
+static inline lispobj SymbolTlValue(u64 tagged_symbol_pointer, void *thread) {
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
@@
-62,7
+67,7
@@
static inline lispobj SymbolTlValue(u32 tagged_symbol_pointer, void *thread) {
#endif
}
#endif
}
-static inline void SetSymbolValue(u32 tagged_symbol_pointer,lispobj val, void *thread) {
+static inline void SetSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread) {
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
@@
-77,7
+82,7
@@
static inline void SetSymbolValue(u32 tagged_symbol_pointer,lispobj val, void *t
#endif
sym->value = val;
}
#endif
sym->value = val;
}
-static inline void SetTlSymbolValue(u32 tagged_symbol_pointer,lispobj val, void *thread) {
+static inline void SetTlSymbolValue(u64 tagged_symbol_pointer,lispobj val, void *thread) {
#ifdef LISP_FEATURE_SB_THREAD
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
#ifdef LISP_FEATURE_SB_THREAD
struct symbol *sym= (struct symbol *)
(pointer_sized_uint_t)(tagged_symbol_pointer-OTHER_POINTER_LOWTAG);
@@
-100,7
+105,7
@@
static inline os_context_t *get_interrupt_context_for_thread(struct thread *th)
* much stuff like struct thread and all_threads to be defined, which
* usually aren't by that time. So, it's here instead. Sorry */
* much stuff like struct thread and all_threads to be defined, which
* usually aren't by that time. So, it's here instead. Sorry */
-inline static struct thread *arch_os_get_current_thread() {
+static inline struct thread *arch_os_get_current_thread() {
#if defined(LISP_FEATURE_SB_THREAD) && defined (LISP_FEATURE_X86)
register struct thread *me=0;
if(all_threads)
#if defined(LISP_FEATURE_SB_THREAD) && defined (LISP_FEATURE_X86)
register struct thread *me=0;
if(all_threads)
@@
-114,6
+119,6
@@
inline static struct thread *arch_os_get_current_thread() {
int arch_os_thread_init(struct thread *thread);
int arch_os_thread_init(struct thread *thread);
-extern struct thread *arch_os_get_current_thread();
+extern void create_initial_thread(lispobj);
#endif /* _INCLUDE_THREAD_H_ */
#endif /* _INCLUDE_THREAD_H_ */