1.0.25.23: more allocation checks

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

diff --git a/src/runtime/alloc.c b/src/runtime/alloc.c
index 896467c..4f3be56 100644 (file)
--- a/src/runtime/alloc.c
+++ b/src/runtime/alloc.c
@@ -28,24 +28,31 @@
 #include "genesis/cons.h"
 #include "genesis/bignum.h"
 #include "genesis/sap.h"
+#include "genesis/code.h"
 
 #define ALIGNED_SIZE(n) ((n) + LOWTAG_MASK) & ~LOWTAG_MASK
 
 #ifdef LISP_FEATURE_GENCGC
-extern lispobj *alloc(long bytes);
-#endif
-
 static lispobj *
-pa_alloc(int bytes)
+pa_alloc(int bytes, int page_type_flag)
 {
     lispobj *result;
-#ifdef LISP_FEATURE_GENCGC
     struct thread *th = arch_os_get_current_thread();
 
     /* FIXME: OOAO violation: see arch_pseudo_* */
     clear_pseudo_atomic_interrupted(th);
     set_pseudo_atomic_atomic(th);
-    result = alloc(bytes);
+    result = general_alloc(bytes, page_type_flag);
+#if 0
+    /* See how the runtime deals with GC being triggerred. */
+    if ((SymbolValue(GC_PENDING,th) == NIL) &&
+        (SymbolValue(GC_INHIBIT,th) == NIL) &&
+        (random() < RAND_MAX/100)) {
+        SetSymbolValue(GC_PENDING,T,th);
+        set_pseudo_atomic_interrupted(th);
+        maybe_save_gc_mask_and_block_deferrables(NULL);
+    }
+#endif
     clear_pseudo_atomic_atomic(th);
 
     if (get_pseudo_atomic_interrupted(th)) {
@@ -70,9 +77,19 @@ pa_alloc(int bytes)
         result = (lispobj *) *current_control_stack_pointer;
 #endif
     }
+    return result;
+}
 #else
-    /* FIXME: this is not pseudo atomic at all, but is called only from
-     * interrupt safe places like interrupt handlers. MG - 2005-08-09 */
+static lispobj *
+pa_alloc(int bytes, int page_type_flag)
+{
+    lispobj *result;
+
+    /* This is not pseudo atomic at all, but is called only from
+     * interrupt safe places like interrupt handlers. MG -
+     * 2005-08-09 */
+    check_deferrables_blocked_or_lose();
+
     result = dynamic_space_free_pointer;
 
     /* Align up to next dual word boundary. */
@@ -86,28 +103,29 @@ pa_alloc(int bytes)
         set_auto_gc_trigger((char *)dynamic_space_free_pointer
                             - (char *)current_dynamic_space);
     }
-#endif
     return result;
 }
+#endif
 
-
-lispobj *
+static lispobj *
 alloc_unboxed(int type, int words)
 {
     lispobj *result;
 
-    result = pa_alloc(ALIGNED_SIZE((1 + words) * sizeof(lispobj)));
+    result = pa_alloc(ALIGNED_SIZE((1 + words) * sizeof(lispobj)),
+                      UNBOXED_PAGE_FLAG);
     *result = (lispobj) (words << N_WIDETAG_BITS) | type;
     return result;
 }
 
 static lispobj
-alloc_vector(int type, int length, int size)
+alloc_vector(int type, int length, int size, int page_type_flag)
 {
     struct vector *result;
 
     result = (struct vector *)
-      pa_alloc(ALIGNED_SIZE((2 + (length*size + 31) / 32) * sizeof(lispobj)));
+        pa_alloc(ALIGNED_SIZE((2 + (length*size + 31) / 32) * sizeof(lispobj)),
+                 page_type_flag);
 
     result->header = type;
     result->length = make_fixnum(length);
@@ -119,7 +137,8 @@ lispobj
 alloc_cons(lispobj car, lispobj cdr)
 {
     struct cons *ptr =
-        (struct cons *)pa_alloc(ALIGNED_SIZE(sizeof(struct cons)));
+        (struct cons *)pa_alloc(ALIGNED_SIZE(sizeof(struct cons)),
+                                BOXED_PAGE_FLAG);
 
     ptr->car = car;
     ptr->cdr = cdr;
@@ -147,7 +166,8 @@ lispobj
 alloc_base_string(char *str)
 {
     int len = strlen(str);
-    lispobj result = alloc_vector(SIMPLE_BASE_STRING_WIDETAG, len+1, 8);
+    lispobj result = alloc_vector(SIMPLE_BASE_STRING_WIDETAG, len+1, 8,
+                                  UNBOXED_PAGE_FLAG);
     struct vector *vec = (struct vector *)native_pointer(result);
 
     vec->length = make_fixnum(len);
@@ -165,3 +185,25 @@ alloc_sap(void *ptr)
     sap->pointer = ptr;
     return make_lispobj(sap,OTHER_POINTER_LOWTAG);
 }
+
+lispobj
+alloc_code_object (unsigned boxed, unsigned unboxed) {
+    struct code * code;
+    /* 4 == trace_table_offset offset in words */
+    boxed = make_fixnum(boxed + 1 + 4);
+    boxed &= ~LOWTAG_MASK;
+
+    unboxed += LOWTAG_MASK;
+    unboxed &= ~LOWTAG_MASK;
+
+    code = (struct code *)pa_alloc(ALIGNED_SIZE((boxed + unboxed) *
+                                                sizeof(lispobj)),
+                                    CODE_PAGE_FLAG);
+
+    boxed = boxed << (N_WIDETAG_BITS - WORD_SHIFT);
+    code->header = boxed | CODE_HEADER_WIDETAG;
+    code->code_size = unboxed;
+    code->entry_points = NIL;
+    code->debug_info = NIL;
+    return make_lispobj(code, OTHER_POINTER_LOWTAG);
+}