X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.h;h=e99d86b22ee5cb5cc90d1f913bb36f828e80362e;hb=0285aa5ff8416027932daa001b84429be2ca559b;hp=9f38dab05ae83ca8aa129880cf79cd3cdbda9b98;hpb=ce027af4a3f623440d33e7be119fe46caaecee65;p=sbcl.git

diff --git a/src/runtime/runtime.h b/src/runtime/runtime.h
index 9f38dab..e99d86b 100644
--- a/src/runtime/runtime.h
+++ b/src/runtime/runtime.h
@@ -16,25 +16,46 @@
 #define _SBCL_RUNTIME_H_
 
 #if defined(LISP_FEATURE_SB_THREAD)
-#define thread_self pthread_self
+#define thread_self() pthread_self()
 #define thread_kill pthread_kill
 #define thread_sigmask pthread_sigmask
 #define thread_mutex_lock(l) pthread_mutex_lock(l)
 #define thread_mutex_unlock(l) pthread_mutex_unlock(l)
 #else
-#define thread_self getpid
-#define thread_kill kill
+#define thread_self() 0
+#define thread_kill kill_safely
 #define thread_sigmask sigprocmask
 #define thread_mutex_lock(l) 0
 #define thread_mutex_unlock(l) 0
 #endif
 
-/* #define QSHOW */ /* Enable low-level debugging output? */
-/* #define QSHOW_SAFE */ /* Enable blocking interrupts for each SHOW. */
+#if defined(LISP_FEATURE_SB_SAFEPOINT)
+void map_gc_page();
+void unmap_gc_page();
+int check_pending_interrupts();
+#endif
+
+/* Block blockable interrupts for each SHOW, if not 0. */
+#define QSHOW_SIGNAL_SAFE 1
+/* Enable extra-verbose low-level debugging output for signals? (You
+ * probably don't want this unless you're trying to debug very early
+ * cold boot on a new machine, or one where you've just messed up
+ * signal handling.)
+ *
+ * Note: It may be that doing this is fundamentally unsound, since it
+ * causes output from signal handlers, and the i/o libraries aren't
+ * necessarily reentrant. But it can still be very convenient for
+ * figuring out what's going on when you have a signal handling
+ * problem. */
+#define QSHOW_SIGNALS 0
+/* Enable low-level debugging output, if not zero. Defaults to enabled
+ * if QSHOW_SIGNALS, disabled otherwise. Change it to 1 if you want
+ * low-level debugging output but not the whole signal mess. */
+#define QSHOW QSHOW_SIGNALS
 
-#ifdef QSHOW
+#if QSHOW
 
-#ifdef QSHOW_SAFE
+#if QSHOW_SIGNAL_SAFE == 1 && !defined(LISP_FEATURE_WIN32)
 
 #include <signal.h>
 extern sigset_t blockable_sigset;
@@ -49,7 +70,7 @@ extern sigset_t blockable_sigset;
 #endif
 
 #ifdef LISP_FEATURE_SB_THREAD
-#define QSHOW_PREFIX fprintf(stderr, "%lu ", pthread_self());
+#define QSHOW_PREFIX fprintf(stderr, "%p ", pthread_self());
 #else
 #define QSHOW_PREFIX
 #endif
@@ -70,18 +91,6 @@ extern sigset_t blockable_sigset;
 
 #endif
 
-/* Enable extra-verbose low-level debugging output for signals? (You
- * probably don't want this unless you're trying to debug very early
- * cold boot on a new machine, or one where you've just messed up
- * signal handling.)
- *
- * Note: It may be that doing this is fundamentally unsound, since it
- * causes output from signal handlers, and the i/o libraries aren't
- * necessarily reentrant. But it can still be very convenient for
- * figuring out what's going on when you have a signal handling
- * problem.. */
-#define QSHOW_SIGNALS 0
-
 #if QSHOW_SIGNALS
 #define FSHOW_SIGNAL FSHOW
 #else
@@ -117,8 +126,10 @@ typedef pid_t os_thread_t;
    alpha64 has arrived, all this nastiness can go away */
 #if 64 == N_WORD_BITS
 #define LOW_WORD(c) ((pointer_sized_uint_t)c)
+#define OBJ_FMTX "lx"
 typedef unsigned long lispobj;
 #else
+#define OBJ_FMTX "x"
 #define LOW_WORD(c) ((long)(c) & 0xFFFFFFFFL)
 /* fake it on alpha32 */
 typedef unsigned int lispobj;
@@ -165,7 +176,11 @@ FDEFN(lispobj obj)
 static inline int
 is_lisp_pointer(lispobj obj)
 {
+#if N_WORD_BITS == 64
+    return (obj & 3) == 3;
+#else
     return obj & 1;
+#endif
 }
 
 #include "fixnump.h"
@@ -199,10 +214,11 @@ make_lispobj(void *o, int low_tag)
     return LOW_WORD(o) | low_tag;
 }
 
+#define MAKE_FIXNUM(n) (n << N_FIXNUM_TAG_BITS)
 static inline lispobj
 make_fixnum(long n)
 {
-    return n << N_FIXNUM_TAG_BITS;
+    return MAKE_FIXNUM(n);
 }
 
 static inline long
@@ -226,6 +242,13 @@ fixnum_value(lispobj n)
 #endif
 typedef int boolean;
 
+static inline boolean
+other_immediate_lowtag_p(lispobj header)
+{
+    /* These lowtags are spaced 4 apart throughout the lowtag space. */
+    return (lowtag_of(header) & 3) == OTHER_IMMEDIATE_0_LOWTAG;
+}
+
 /* KLUDGE: As far as I can tell there's no ANSI C way of saying
  * "this function never returns". This is the way that you do it
  * in GCC later than version 2.5 or so. */
@@ -242,13 +265,8 @@ typedef int boolean;
 extern void *successful_malloc (size_t size);
 extern char *copied_string (char *string);
 
-#define RUNTIME_OPTIONS_MAGIC 0x31EBF355
-/* 1 for magic, 1 for boolean, 2 for struct runtime_options fields */
-#define RUNTIME_OPTIONS_WORDS (1 + 1 + 2)
-
-struct runtime_options {
-    size_t dynamic_space_size;
-    size_t thread_control_stack_size;
-};
+#if defined(LISP_FEATURE_SB_THREAD) && !defined(LISP_FEATURE_SB_SAFEPOINT)
+# define THREADS_USING_GCSIGNAL 1
+#endif
 
 #endif /* _SBCL_RUNTIME_H_ */