0.pre7.29:

[sbcl.git] / src / runtime / runtime.h

diff --git a/src/runtime/runtime.h b/src/runtime/runtime.h
index d041a2c..8315ea1 100644 (file)
--- a/src/runtime/runtime.h
+++ b/src/runtime/runtime.h
@@ -30,7 +30,7 @@
  * signal handling.)
  *
  * Note: It may be that doing this is fundamentally unsound, since it
- * causes output from signal handlers, the i/o libraries aren't
+ * 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.. */
@@ -46,16 +46,13 @@
 #define type_Bits 8
 #define type_Mask ((1<<type_Bits)-1)
 
-/* FIXME: There seems to be no reason that TypeOf, HeaderValue,
- * Pointerp, PTR, CONS, SYMBOL, and FDEFN can't be defined
- * as (possibly inline) functions instead of macros. */
+/* FIXME: There seems to be no reason that TypeOf, HeaderValue, CONS,
+ * SYMBOL, and FDEFN can't be defined as (possibly inline) functions
+ * instead of macros. */
 
 #define TypeOf(obj) ((obj)&type_Mask)
 #define HeaderValue(obj) ((unsigned long) ((obj)>>type_Bits))
 
-#define Pointerp(obj) ((obj) & 0x01)
-#define PTR(obj) ((unsigned long)((obj)&~lowtag_Mask))
-
 #define CONS(obj) ((struct cons *)((obj)-type_ListPointer))
 #define SYMBOL(obj) ((struct symbol *)((obj)-type_OtherPointer))
 #define FDEFN(obj) ((struct fdefn *)((obj)-type_OtherPointer))
@@ -65,7 +62,7 @@
  * that SBCL runs on as of 0.6.7. If we port to the Alpha or some
  * other non-32-bit machine we'll probably need real machine-dependent
  * and OS-dependent definitions again. */
-#if ((defined alpha) && !(defined linux))
+#if ((defined alpha) && !(defined __linux__))
 #error No u32,s32 definitions for this platform.  Write some.
 #else
 /* int happens to be 4 bytes on linux/alpha.  long is longer. */
@@ -76,6 +73,22 @@ typedef signed int s32;
 
 typedef u32 lispobj;
 
+/* Is the Lisp object obj something with pointer nature (as opposed to
+ * e.g. a fixnum or character or unbound marker)? */
+static inline int
+is_lisp_pointer(lispobj obj)
+{
+    return obj & 1;
+}
+
+/* Convert from a lispobj with type bits to a native (ordinary
+ * C/assembly) pointer to the beginning of the object. */
+static inline lispobj
+native_pointer(lispobj obj)
+{
+    return obj & ~lowtag_Mask;
+}
+
 /* FIXME: There seems to be no reason that make_fixnum and fixnum_value
  * can't be implemented as (possibly inline) functions. */
 #define make_fixnum(n) ((lispobj)((n)<<2))
@@ -103,7 +116,7 @@ typedef int boolean;
  * in GCC later than version 2.7 or so. If you are using some 
  * compiler that doesn't understand this, you could could just
  * change it to "typedef void never_returns" and nothing would
- * break, you might just get a few more bytes of compiled code or
+ * break, though you might get a few more bytes of compiled code or
  * a few more compiler warnings. -- WHN 2000-10-21 */
 typedef volatile void never_returns;