X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Falloc.c;h=82969472de94b2b9377e1c25b263744f618a98d7;hb=e4542bc034db18cf98f005b2dac53a6d7d5c7260;hp=78904a9d6708d5c43a07f87dd9b31cd9c15769ab;hpb=3c65762b927af861c9c8bc416e4cbac9a14ec0c3;p=sbcl.git

diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c
index 78904a9..8296947 100644
--- a/src/runtime/alloc.c
+++ b/src/runtime/alloc.c
@@ -1,5 +1,6 @@
 /*
- * allocation routines
+ * allocation routines for C code.  For allocation done by Lisp look
+ * instead at src/compiler/target/alloc.lisp and .../macros.lisp
  */
 
 /*
@@ -13,51 +14,71 @@
  * files for more information.
  */
 
-#include "runtime.h"
+#include <stdio.h>
+#include <string.h>
+
 #include "sbcl.h"
+#include "runtime.h"
+#include "os.h"
 #include "alloc.h"
 #include "globals.h"
 #include "gc.h"
-#include <stdio.h>
-
-#define GET_FREE_POINTER() dynamic_space_free_pointer
-#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);
+#include "thread.h"
+#include "genesis/vector.h"
+#include "genesis/cons.h"
+#include "genesis/bignum.h"
+#include "genesis/sap.h"
 
-#define ALIGNED_SIZE(n) (n+LOWTAG_MASK) & ~LOWTAG_MASK
+#define ALIGNED_SIZE(n) ((n) + LOWTAG_MASK) & ~LOWTAG_MASK
 
-#if defined GENCGC
+#ifdef LISP_FEATURE_GENCGC
 extern lispobj *alloc(int bytes);
-#else
+#endif
+
 static lispobj *
-alloc(int bytes)
+pa_alloc(int bytes)
 {
     lispobj *result;
+#ifdef LISP_FEATURE_GENCGC
+    struct thread *th = arch_os_get_current_thread();
+
+    /* FIXME: OOAO violation: see arch_pseudo_* */
+    SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(0),th);
+    SetSymbolValue(PSEUDO_ATOMIC_ATOMIC, make_fixnum(1),th);
+    result = alloc(bytes);
+    SetSymbolValue(PSEUDO_ATOMIC_ATOMIC, make_fixnum(0),th);
+    if (fixnum_value(SymbolValue(PSEUDO_ATOMIC_INTERRUPTED,th)))
+        /* Even if we gc at this point, the new allocation will be
+         * protected from being moved, because result is on the c stack
+         * and points to it. */
+        do_pending_interrupt();
+#else
+    /* FIXME: this is not pseudo atomic at all, but is called only from
+     * interrupt safe places like interrupt handlers. MG - 2005-08-09 */
+    result = dynamic_space_free_pointer;
 
-    /* Round to dual word boundary. */
-    bytes = (bytes + LOWTAG_MASK) & ~LOWTAG_MASK;
-
-    result = GET_FREE_POINTER();
+    /* Align up to next dual word boundary. */
+    bytes = ALIGNED_SIZE(bytes);
 
-    SET_FREE_POINTER(result + (bytes / sizeof(lispobj)));
+    dynamic_space_free_pointer = (lispobj *)((char *)result + bytes);
 
-    if (GET_GC_TRIGGER() && GET_FREE_POINTER() > GET_GC_TRIGGER()) {
-	SET_GC_TRIGGER((char *)GET_FREE_POINTER()
-		       - (char *)current_dynamic_space);
+    if (current_auto_gc_trigger
+        && dynamic_space_free_pointer > current_auto_gc_trigger) {
+        clear_auto_gc_trigger();
+        set_auto_gc_trigger((char *)dynamic_space_free_pointer
+                            - (char *)current_dynamic_space);
     }
+#endif
     return result;
 }
-#endif
 
-static lispobj *
+
+lispobj *
 alloc_unboxed(int type, int words)
 {
     lispobj *result;
 
-    result = alloc(ALIGNED_SIZE((1 + words) * sizeof(lispobj)));
+    result = pa_alloc(ALIGNED_SIZE((1 + words) * sizeof(lispobj)));
     *result = (lispobj) (words << N_WIDETAG_BITS) | type;
     return result;
 }
@@ -68,23 +89,23 @@ alloc_vector(int type, int length, int size)
     struct vector *result;
 
     result = (struct vector *)
-      alloc(ALIGNED_SIZE((2 + (length*size + 31) / 32) * sizeof(lispobj)));
+      pa_alloc(ALIGNED_SIZE((2 + (length*size + 31) / 32) * sizeof(lispobj)));
 
     result->header = type;
     result->length = make_fixnum(length);
 
-    return ((lispobj)result)|OTHER_POINTER_LOWTAG;
+    return make_lispobj(result,OTHER_POINTER_LOWTAG);
 }
 
 lispobj
 alloc_cons(lispobj car, lispobj cdr)
 {
-    struct cons *ptr = (struct cons *)alloc(ALIGNED_SIZE(sizeof(struct cons)));
+    struct cons *ptr = (struct cons *)pa_alloc(ALIGNED_SIZE(sizeof(struct cons)));
 
     ptr->car = car;
     ptr->cdr = cdr;
 
-    return (lispobj)ptr | LIST_POINTER_LOWTAG;
+    return make_lispobj(ptr, LIST_POINTER_LOWTAG);
 }
 
 lispobj
@@ -99,15 +120,15 @@ alloc_number(long n)
 
         ptr->digits[0] = n;
 
-	return (lispobj) ptr | OTHER_POINTER_LOWTAG;
+        return make_lispobj(ptr, OTHER_POINTER_LOWTAG);
     }
 }
 
 lispobj
-alloc_string(char *str)
+alloc_base_string(char *str)
 {
     int len = strlen(str);
-    lispobj result = alloc_vector(SIMPLE_STRING_WIDETAG, len+1, 8);
+    lispobj result = alloc_vector(SIMPLE_BASE_STRING_WIDETAG, len+1, 8);
     struct vector *vec = (struct vector *)native_pointer(result);
 
     vec->length = make_fixnum(len);
@@ -119,10 +140,9 @@ alloc_string(char *str)
 lispobj
 alloc_sap(void *ptr)
 {
-    int n_words_to_alloc =
-	(sizeof(struct sap) - sizeof(lispobj)) / sizeof(u32);
-    struct sap *sap =
-	(struct sap *)alloc_unboxed((int)SAP_WIDETAG, n_words_to_alloc);
+    struct sap *sap;
+    sap=(struct sap *)
+        alloc_unboxed((int)SAP_WIDETAG, sizeof(struct sap)/sizeof(lispobj) -1);
     sap->pointer = ptr;
-    return (lispobj) sap | OTHER_POINTER_LOWTAG;
+    return make_lispobj(sap,OTHER_POINTER_LOWTAG);
 }