X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.h;h=3c29b270b8b8d5de26925e38cd4a3fbca6c965e6;hb=578362575fc2112b828597cc1025e3ead43d43ba;hp=bda2896d91e5af9b56b165135220e1e1884c35cf;hpb=4bf2de6a2adff75459cf218c8bff67f6cdb91211;p=sbcl.git

diff --git a/src/runtime/runtime.h b/src/runtime/runtime.h
index bda2896..3c29b27 100644
--- a/src/runtime/runtime.h
+++ b/src/runtime/runtime.h
@@ -49,7 +49,7 @@
 
 #if QSHOW
 
-#if QSHOW_SIGNAL_SAFE
+#if QSHOW_SIGNAL_SAFE == 1 && !defined(LISP_FEATURE_WIN32)
 
 #include <signal.h>
 extern sigset_t blockable_sigset;
@@ -64,7 +64,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
@@ -120,8 +120,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;
@@ -168,7 +170,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"
@@ -202,10 +208,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
@@ -229,6 +236,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. */
@@ -245,13 +259,4 @@ 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;
-};
-
 #endif /* _SBCL_RUNTIME_H_ */