0.pre7.14.flaky4.5:

[sbcl.git] / src / runtime / alloc.c

diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c
index 0a88829..d40c272 100644 (file)
--- a/src/runtime/alloc.c
+++ b/src/runtime/alloc.c
@@ -18,28 +18,22 @@
 #include "alloc.h"
 #include "globals.h"
 #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))
+#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
 
-#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;
 
@@ -47,29 +41,29 @@ static lispobj *alloc(int bytes)
     bytes = (bytes + lowtag_Mask) & ~lowtag_Mask;
 
     result = GET_FREE_POINTER();
+
     SET_FREE_POINTER(result + (bytes / sizeof(lispobj)));
 
     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;
 }
 #endif
 
-static lispobj *alloc_unboxed(int type, int words)
+static lispobj *
+alloc_unboxed(int type, int words)
 {
     lispobj *result;
 
     result = alloc(ALIGNED_SIZE((1 + words) * sizeof(lispobj)));
-
     *result = (lispobj) (words << type_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;
 
@@ -82,7 +76,8 @@ static lispobj alloc_vector(int type, int length, int size)
     return ((lispobj)result)|type_OtherPointer;
 }
 
-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)));
 
@@ -92,7 +87,8 @@ lispobj alloc_cons(lispobj car, lispobj cdr)
     return (lispobj)ptr | type_ListPointer;
 }
 
-lispobj alloc_number(long n)
+lispobj
+alloc_number(long n)
 {
     struct bignum *ptr;
 
@@ -107,11 +103,12 @@ lispobj alloc_number(long n)
     }
 }
 
-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);
+    struct vector *vec = (struct vector *)native_pointer(result);
 
     vec->length = make_fixnum(len);
     strcpy((char *)vec->data, str);
@@ -119,18 +116,13 @@ 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
+    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);
     sap->pointer = ptr;
-
     return (lispobj) sap | type_OtherPointer;
 }