X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Falloc.c;h=0e0a438efa12e270c0b7ee35bcc0ae1710846f70;hb=1e4629723d19f96d752235ffde34fe58431431ae;hp=d11c82044c917b1a57a298d017bfb2b708269923;hpb=3358092524adbaecaa483d6510fb3d7031441ccb;p=sbcl.git

diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c
index d11c820..0e0a438 100644
--- a/src/runtime/alloc.c
+++ b/src/runtime/alloc.c
@@ -13,67 +13,58 @@
  * files for more information.
  */
 
-/*
- * $Header$
- */
-
 #include "runtime.h"
 #include "sbcl.h"
 #include "alloc.h"
 #include "globals.h"
 #include "gc.h"
+#include <stdio.h>
+#include <string.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))
+#define SET_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 *alloc(int bytes)
+static lispobj *
+alloc(int bytes)
 {
-    lispobj *result;
+    char *result;
 
     /* Round to dual word boundary. */
-    bytes = (bytes + lowtag_Mask) & ~lowtag_Mask;
+    bytes = (bytes + LOWTAG_MASK) & ~LOWTAG_MASK;
 
-    result = GET_FREE_POINTER();
-    SET_FREE_POINTER(result + (bytes / sizeof(lispobj)));
+    result = (char *)GET_FREE_POINTER();
+
+    SET_FREE_POINTER((lispobj *)(result + bytes));
 
     if (GET_GC_TRIGGER() && GET_FREE_POINTER() > GET_GC_TRIGGER()) {
 	SET_GC_TRIGGER((char *)GET_FREE_POINTER()
-		       - (char *)DYNAMIC_SPACE_START);
+		       - (char *)current_dynamic_space);
     }
-
-    return result;
+    return (lispobj *) result;
 }
 #endif
 
-static lispobj *alloc_unboxed(int type, int words)
+lispobj *
+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;
 }
 
-static lispobj alloc_vector(int type, int length, int size)
+static lispobj
+alloc_vector(int type, int length, int size)
 {
     struct vector *result;
 
@@ -83,39 +74,42 @@ static lispobj 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 alloc_cons(lispobj car, lispobj cdr)
+lispobj
+alloc_cons(lispobj car, lispobj cdr)
 {
     struct cons *ptr = (struct cons *)alloc(ALIGNED_SIZE(sizeof(struct cons)));
 
     ptr->car = car;
     ptr->cdr = cdr;
 
-    return (lispobj)ptr | type_ListPointer;
+    return (lispobj)ptr | LIST_POINTER_LOWTAG;
 }
 
-lispobj alloc_number(long n)
+lispobj
+alloc_number(long n)
 {
     struct bignum *ptr;
 
     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;
     }
 }
 
-lispobj alloc_string(char *str)
+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);
@@ -123,18 +117,12 @@ lispobj alloc_string(char *str)
     return result;
 }
 
-lispobj alloc_sap(void *ptr)
+lispobj
+alloc_sap(void *ptr)
 {
-    /* FIXME: It would probably be good to grep for "alpha" everywhere
-     * and replace this kind of weirdness with nicer parameterizations
-     * like N_WORDS_IN_POINTER. However, it might be hard to do this
-     * well enough to be useful without an Alpha to test on. What to do? */
-#ifndef alpha
-    struct sap *sap = (struct sap *)alloc_unboxed(type_Sap, 1);
-#else
-    struct sap *sap = (struct sap *)alloc_unboxed(type_Sap, 3);
-#endif
+    struct sap *sap;
+    sap=(struct sap *)
+	alloc_unboxed((int)SAP_WIDETAG, sizeof(struct sap)/sizeof(lispobj) -1);
     sap->pointer = ptr;
-
-    return (lispobj) sap | type_OtherPointer;
+    return (lispobj) sap | OTHER_POINTER_LOWTAG;
 }