X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Falloc.c;h=661cdf4e40b132efd7d13e4bb466ba1276fc366f;hb=90ca09b75fbc3b63b2f7d09c67b04b866dd783f6;hp=c909e2f8721b58d56c5ee2c202c0a561e48b8dd4;hpb=c8322df812da6eb4ef1ae51735b224b2ad0f1503;p=sbcl.git

diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c
index c909e2f..661cdf4 100644
--- a/src/runtime/alloc.c
+++ b/src/runtime/alloc.c
@@ -20,25 +20,16 @@
 #include "gc.h"
 #include <stdio.h>
 
-#ifdef ibmrt
-#define GET_FREE_POINTER() ((lispobj *)SymbolValue(ALLOCATION_POINTER))
-#define SET_FREE_POINTER(new_value) \
-    (SetSymbolValue(ALLOCATION_POINTER,(lispobj)(new_value)))
-#define GET_GC_TRIGGER() ((lispobj *)SymbolValue(INTERNAL_GC_TRIGGER))
-#define SET_GC_TRIGGER(new_value) \
-    (SetSymbolValue(INTERNAL_GC_TRIGGER,(lispobj)(new_value)))
-#else
 #define GET_FREE_POINTER() dynamic_space_free_pointer
 #define SET_FREE_POINTER(new_value) \
-  (dynamic_space_free_pointer = (new_value))
+    (dynamic_space_free_pointer = (new_value))
 #define GET_GC_TRIGGER() current_auto_gc_trigger
 #define SET_GC_TRIGGER(new_value) \
     clear_auto_gc_trigger(); set_auto_gc_trigger(new_value);
-#endif
 
-#define ALIGNED_SIZE(n) (n+lowtag_Mask) & ~lowtag_Mask
+#define ALIGNED_SIZE(n) (n+LOWTAG_MASK) & ~LOWTAG_MASK
 
-#if defined(WANT_CGC) || defined(GENCGC)
+#if defined GENCGC
 extern lispobj *alloc(int bytes);
 #else
 static lispobj *
@@ -47,7 +38,7 @@ alloc(int bytes)
     lispobj *result;
 
     /* Round to dual word boundary. */
-    bytes = (bytes + lowtag_Mask) & ~lowtag_Mask;
+    bytes = (bytes + LOWTAG_MASK) & ~LOWTAG_MASK;
 
     result = GET_FREE_POINTER();
 
@@ -67,7 +58,7 @@ alloc_unboxed(int type, int words)
     lispobj *result;
 
     result = alloc(ALIGNED_SIZE((1 + words) * sizeof(lispobj)));
-    *result = (lispobj) (words << type_Bits) | type;
+    *result = (lispobj) (words << N_WIDETAG_BITS) | type;
     return result;
 }
 
@@ -82,7 +73,7 @@ alloc_vector(int type, int length, int size)
     result->header = type;
     result->length = make_fixnum(length);
 
-    return ((lispobj)result)|type_OtherPointer;
+    return ((lispobj)result)|OTHER_POINTER_LOWTAG;
 }
 
 lispobj
@@ -93,7 +84,7 @@ alloc_cons(lispobj car, lispobj cdr)
     ptr->car = car;
     ptr->cdr = cdr;
 
-    return (lispobj)ptr | type_ListPointer;
+    return (lispobj)ptr | LIST_POINTER_LOWTAG;
 }
 
 lispobj
@@ -104,11 +95,11 @@ alloc_number(long n)
     if (-0x20000000 < n && n < 0x20000000)
         return make_fixnum(n);
     else {
-        ptr = (struct bignum *)alloc_unboxed(type_Bignum, 1);
+        ptr = (struct bignum *)alloc_unboxed(BIGNUM_WIDETAG, 1);
 
         ptr->digits[0] = n;
 
-	return (lispobj) ptr | type_OtherPointer;
+	return (lispobj) ptr | OTHER_POINTER_LOWTAG;
     }
 }
 
@@ -116,8 +107,8 @@ lispobj
 alloc_string(char *str)
 {
     int len = strlen(str);
-    lispobj result = alloc_vector(type_SimpleString, len+1, 8);
-    struct vector *vec = (struct vector *)PTR(result);
+    lispobj result = alloc_vector(SIMPLE_STRING_WIDETAG, len+1, 8);
+    struct vector *vec = (struct vector *)native_pointer(result);
 
     vec->length = make_fixnum(len);
     strcpy((char *)vec->data, str);
@@ -131,7 +122,7 @@ alloc_sap(void *ptr)
     int n_words_to_alloc =
 	(sizeof(struct sap) - sizeof(lispobj)) / sizeof(u32);
     struct sap *sap =
-	(struct sap *)alloc_unboxed((int)type_Sap, n_words_to_alloc);
+	(struct sap *)alloc_unboxed((int)SAP_WIDETAG, n_words_to_alloc);
     sap->pointer = ptr;
-    return (lispobj) sap | type_OtherPointer;
+    return (lispobj) sap | OTHER_POINTER_LOWTAG;
 }