X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.h;h=69560b8e2ada8f09c8c51d98dea22556abc17cef;hb=78fa16bf55be44cc16845be84d98023e83fb14bc;hp=105dbbbdfc9224772e41cd8d7c26c666b2fae32e;hpb=43b4fa80d2db2af986feafc08797917ab591806c;p=sbcl.git

diff --git a/src/runtime/runtime.h b/src/runtime/runtime.h
index 105dbbb..69560b8 100644
--- a/src/runtime/runtime.h
+++ b/src/runtime/runtime.h
@@ -37,33 +37,32 @@
  * problem.. */
 #define QSHOW_SIGNALS 0
 
-#define N_LOWTAG_BITS 3
-#define LOWTAG_MASK ((1<<N_LOWTAG_BITS)-1)
-#define N_WIDETAG_BITS 8
-#define WIDETAG_MASK ((1<<N_WIDETAG_BITS)-1)
-
-/* FIXME: Make HeaderValue, CONS, SYMBOL, and FDEFN into inline
- * functions instead of macros. */
-
-#define HeaderValue(obj) ((unsigned long) ((obj) >> N_WIDETAG_BITS))
-
-#define CONS(obj) ((struct cons *)((obj)-LIST_POINTER_LOWTAG))
-#define SYMBOL(obj) ((struct symbol *)((obj)-OTHER_POINTER_LOWTAG))
-#define FDEFN(obj) ((struct fdefn *)((obj)-OTHER_POINTER_LOWTAG))
-
 /* KLUDGE: These are in theory machine-dependent and OS-dependent, but
  * in practice the "foo int" definitions work for all the machines
  * 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. */
 /* even on alpha, int happens to be 4 bytes.  long is longer. */
+/* FIXME: these names really shouldn't reflect their length and this
+   is not quite right for some of the FFI stuff */
+typedef unsigned long u64;
+typedef signed long s64;
 typedef unsigned int u32;
 typedef signed int s32;
-#define LOW_WORD(c) ((long)(c) & 0xFFFFFFFFL)
+
 /* this is an integral type the same length as a machine pointer */
 typedef unsigned long pointer_sized_uint_t ;
 
-typedef u32 lispobj;
+/* FIXME: we do things this way because of the alpha32 port.  once
+   alpha64 has arrived, all this nastiness can go away */
+#if 64 == N_WORD_BITS
+#define LOW_WORD(c) ((pointer_sized_uint_t)c)
+typedef unsigned long lispobj;
+#else
+#define LOW_WORD(c) ((long)(c) & 0xFFFFFFFFL)
+/* fake it on alpha32 */
+typedef unsigned int lispobj;
+#endif
 
 static inline int
 lowtag_of(lispobj obj) {
@@ -75,6 +74,30 @@ widetag_of(lispobj obj) {
     return obj & WIDETAG_MASK;
 }
 
+static inline unsigned long
+HeaderValue(lispobj obj)
+{
+  return obj >> N_WIDETAG_BITS;
+}
+
+static inline struct cons *
+CONS(lispobj obj)
+{
+  return (struct cons *)(obj - LIST_POINTER_LOWTAG);
+}
+
+static inline struct symbol *
+SYMBOL(lispobj obj)
+{
+  return (struct symbol *)(obj - OTHER_POINTER_LOWTAG);
+}
+
+static inline struct fdefn *
+FDEFN(lispobj obj)
+{
+  return (struct fdefn *)(obj - OTHER_POINTER_LOWTAG);
+}
+
 /* Is the Lisp object obj something with pointer nature (as opposed to
  * e.g. a fixnum or character or unbound marker)? */
 static inline int
@@ -97,17 +120,12 @@ native_pointer(lispobj obj)
 
 /* 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))
-#define fixnum_value(n) (((long)n)>>2)
+#define make_fixnum(n) ((lispobj)((n)<<N_FIXNUM_TAG_BITS))
+#define fixnum_value(n) (((long)n)>>N_FIXNUM_TAG_BITS)
 
 /* Too bad ANSI C doesn't define "bool" as C++ does.. */
 typedef int boolean;
 
-/* FIXME: There seems to be no reason that SymbolFunction can't be
- * defined as (possibly inline) functions instead of macros. */
-
-static inline lispobj SymbolValue(u32 sym, void *thread);
-static inline void SetSymbolValue(u32 sym, lispobj val, void *thread);
 /* This only works for static symbols. */
 /* FIXME: should be called StaticSymbolFunction, right? */
 #define SymbolFunction(sym) \