X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.h;h=7ee424848779d9ff193be0cff766bd028b744008;hb=f7faed97898dd0e94a18b0d1fca03aaa0fe24ab0;hp=860243260acfd7f2f37583e4c87b7268af400551;hpb=09d3e0862347c08634268d49dc2f72c2375b9d8c;p=sbcl.git

diff --git a/src/runtime/runtime.h b/src/runtime/runtime.h
index 8602432..7ee4248 100644
--- a/src/runtime/runtime.h
+++ b/src/runtime/runtime.h
@@ -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
@@ -232,19 +239,8 @@ typedef int boolean;
 static inline boolean
 other_immediate_lowtag_p(lispobj header)
 {
-    switch (lowtag_of(header)) {
-    case OTHER_IMMEDIATE_0_LOWTAG:
-    case OTHER_IMMEDIATE_1_LOWTAG:
-#ifdef OTHER_IMMEDIATE_2_LOWTAG
-    case OTHER_IMMEDIATE_2_LOWTAG:
-#endif
-#ifdef OTHER_IMMEDIATE_3_LOWTAG
-    case OTHER_IMMEDIATE_3_LOWTAG:
-#endif
-        return 1;
-    default:
-        return 0;
-    }
+    /* 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
@@ -263,13 +259,4 @@ other_immediate_lowtag_p(lispobj header)
 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_ */